diff -ru oaf-0.6.7.orig/liboaf/Makefile.am oaf-0.6.7-xlc/liboaf/Makefile.am
--- oaf-0.6.7.orig/liboaf/Makefile.am	Wed Apr 18 16:39:52 2001
+++ oaf-0.6.7-xlc/liboaf/Makefile.am	Fri Oct  5 12:33:15 2001
@@ -60,6 +60,9 @@
 	oaf-fork-server.c			\
 	$(NULL)
 
+liboaf_la_LIBADD=	\
+	@INTLLIBS@
+
 BUILT_SOURCES=					\
 	oaf-stubs.c				\
 	oaf-skels.c				\
diff -ru oaf-0.6.7.orig/liboaf/oaf-mainloop.c oaf-0.6.7-xlc/liboaf/oaf-mainloop.c
--- oaf-0.6.7.orig/liboaf/oaf-mainloop.c	Tue Aug 21 00:40:45 2001
+++ oaf-0.6.7-xlc/liboaf/oaf-mainloop.c	Fri Oct  5 11:37:12 2001
@@ -173,7 +173,7 @@
 oaf_internal_activation_context_get_extended (gboolean           existing_only,
                                                CORBA_Environment *ev)
 {
-	OAFBaseService base_service = {};
+	OAFBaseService base_service = {0};
 
 	base_service.name = "IDL:OAF/ActivationContext:1.0";
 	base_service.session_name = oaf_session_name_get ();
@@ -186,7 +186,7 @@
 CORBA_Object
 oaf_activation_context_get (void)
 {
-	OAFBaseService base_service = {};
+	OAFBaseService base_service = {0};
 
 	base_service.name = "IDL:OAF/ActivationContext:1.0";
 	base_service.session_name = oaf_session_name_get ();
@@ -200,7 +200,7 @@
                           const char *hostname,
                           const char *domain)
 {
-        OAFBaseService base_service = {};
+        OAFBaseService base_service = {0};
 
         base_service.name = "IDL:OAF/ObjectDirectory:1.0";
         base_service.session_name = oaf_session_name_get ();
diff -ru oaf-0.6.7/oafd/qsort_ex.c.orig oaf-0.6.7/oafd/qsort_ex.c
--- oaf-0.6.7/oafd/qsort_ex.c.orig	Wed Nov  7 13:47:59 2001
+++ oaf-0.6.7/oafd/qsort_ex.c	Wed Nov  7 13:52:06 2001
@@ -26,7 +26,7 @@
 #include <string.h>
 #include "qsort_ex.h"
 
-#if HAVE_ALLOCA
+#if HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
diff -ru oaf-0.6.7/oafd/Makefile.am.orig oaf-0.6.7/oafd/Makefile.am 
--- oaf-0.6.7/oafd/Makefile.am.orig	Wed Nov  7 14:52:45 2001
+++ oaf-0.6.7/oafd/Makefile.am	Wed Nov  7 14:53:00 2001
@@ -75,7 +75,7 @@
 CLEANFILES=stamp-parser stamp-idl
 
 oaf-skels.c: $(top_srcdir)/idl/oaf.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) --noheaders $(top_srcdir)/idl/oaf.idl
+	$(ORBIT_IDL) -I $(top_srcdir)/idl --noheaders $(top_srcdir)/idl/oaf.idl
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)