Create reloadable object files with non-pic objects too.

* libltdl/config/ltmain.m4sh: When not building a shared
library, use the non-pic objects to create a reloadable
object, because pic objects do not exist.

diff --git a/ChangeLog b/ChangeLog
index c94b0c7718ce8e893c7b08a59277217ad6d41b3e..92ef0ce1690f1efa550240d448b07e3c6dbed8a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-10  Peter O'Gorman  <peter@pogma.com>
+
+       Create reloadable object files with non-pic objects too.
+       * libltdl/config/ltmain.m4sh: When not building a shared
+       library, use the non-pic objects to create a reloadable
+       object, because pic objects do not exist.
+
 2010-06-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Ensure libltdl is up to date for check-local.

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 9e6646fadbf9f3b8acb74ab772b719237b8eedaf..5906552a9136b3a5a834f668224ec73a22cffa88 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7180,6 +7180,9 @@ EOF
        fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test