diff -Nurd ORBit2-2.14.7/include/orbit/GIOP/giop-endian.h ORBit2-2.14.7.orig/include/orbit/GIOP/giop-endian.h
--- ORBit2-2.14.7/include/orbit/GIOP/giop-endian.h	2007-11-11 09:28:42.000000000 -0800
+++ ORBit2-2.14.7.orig/include/orbit/GIOP/giop-endian.h	2007-01-01 15:01:32.000000000 -0800
@@ -7,6 +7,11 @@
 
 #ifdef ORBIT2_INTERNAL_API
 
+/* This is also defined in IIOP-types.c */
+void giop_byteswap(guchar *outdata,
+		   const guchar *data,
+		   gulong datalen);
+
 #if defined(G_CAN_INLINE) && !defined(GIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
 G_INLINE_FUNC void giop_byteswap(guchar *outdata,
 				 const guchar *data,
@@ -19,11 +24,6 @@
 }
 #endif
 
-/* This is also defined in IIOP-types.c */
-void giop_byteswap(guchar *outdata,
-                   const guchar *data,
-                   gulong datalen);
-
 #endif /* ORBIT2_INTERNAL_API */
 
 G_END_DECLS
diff -Nurd ORBit2-2.14.7/ltmain.sh ORBit2-2.14.7.orig/ltmain.sh
--- ORBit2-2.14.7/ltmain.sh	2007-11-11 09:28:00.000000000 -0800
+++ ORBit2-2.14.7.orig/ltmain.sh	2007-02-21 07:12:53.000000000 -0800
@@ -5739,6 +5739,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
 	done
       fi