diff -Naur ORBit2-2.4.4.old/configure ORBit2-2.4.4.new/configure --- ORBit2-2.4.4.old/configure Mon Nov 11 19:38:08 2002 +++ ORBit2-2.4.4.new/configure Sat Jan 18 03:52:17 2003 @@ -4429,7 +4429,7 @@ darwin* | rhapsody*) case "$host_os" in rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-undefined suppress -flat_namespace' ;; *) # Darwin 1.3 on allow_undefined_flag='-flat_namespace -undefined suppress' @@ -4438,7 +4438,7 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes diff -Naur ORBit2-2.4.4.old/ltmain.sh ORBit2-2.4.4.new/ltmain.sh --- ORBit2-2.4.4.old/ltmain.sh Mon Nov 11 19:37:50 2002 +++ ORBit2-2.4.4.new/ltmain.sh Sat Jan 18 03:52:17 2003 @@ -1750,7 +1750,7 @@ if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes + need_relink=no fi if test -n "$old_archive_from_expsyms_cmds"; then @@ -2924,7 +2924,17 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + if test "x$verstring" = "x0.0"; then + tmp_verstring= + else + tmp_verstring="$verstring" + fi + save_deplibs="$deplibs" + for conv in $convenience; do + deplibs="${deplibs%$conv*} ${deplibs#*$conv}" + done eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do @@ -3978,10 +3988,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 +# if test "$installed" = no && test $need_relink = yes; then +# $echo >> $output "\ +#relink_command=\"$relink_command\"" +# fi done fi diff -Naur ORBit2-2.4.4.old/test/everything/Makefile.in ORBit2-2.4.4.new/test/everything/Makefile.in --- ORBit2-2.4.4.old/test/everything/Makefile.in Mon Nov 11 19:37:59 2002 +++ ORBit2-2.4.4.new/test/everything/Makefile.in Sat Jan 18 03:52:17 2003 @@ -134,7 +134,7 @@ client_SOURCES = ${EVERYTHING_BUILT} client.c everything.idl constants.h client_DEPENDENCIES = ${EVERYTHING_BUILT} $(included_src) client_LDADD = $(LDADD) -client_LDFLAGS = -static -module +client_LDFLAGS = -module -avoid_version included_src = \ anyServer.c \ @@ -152,7 +152,7 @@ orbittypelib_LTLIBRARIES = Everything_module.la Everything_module_la_LDFLAGS = \ - -export-dynamic -module + -export-dynamic -module -avoid_version Everything_module_la_SOURCES = \ everything-imodule.c @@ -161,7 +161,7 @@ $(top_builddir)/src/orb/libORBit-2.la server_SOURCES = server.c ${EVERYTHING_BUILT} everything.idl constants.h -server_LDFLAGS = -static -module +server_LDFLAGS = -module -avoid_version server_DEPENDENCIES = ${EVERYTHING_BUILT} $(included_src) IDL_FLAGS = --showcpperrors --add-imodule