41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
--- configure.in
|
||
|
|
+++ configure.in
|
||
|
|
@@ -1272,7 +1272,11 @@ if test x"$glib_native_win32" = xyes; th
|
||
|
|
G_MODULE_LDFLAGS=
|
||
|
|
else
|
||
|
|
export SED
|
||
|
|
+ if test -x libtool; then
|
||
|
|
G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||
|
|
+ else
|
||
|
|
+ G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||
|
|
+ fi
|
||
|
|
fi
|
||
|
|
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
|
||
|
|
G_MODULE_NEED_USCORE=0
|
||
|
|
@@ -1337,8 +1341,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||
|
|
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
|
||
|
|
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
|
||
|
|
echo "void glib_plugin_test(void) { }" > plugin.c
|
||
|
|
+ if test -x libtool; then
|
||
|
|
${SHELL} ./libtool --mode=compile ${CC} -shared \
|
||
|
|
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
|
||
|
|
+ else
|
||
|
|
+ libtool --mode=compile ${CC} -shared \
|
||
|
|
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
|
||
|
|
+ fi
|
||
|
|
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
|
||
|
|
glib_cv_rtldglobal_broken,[
|
||
|
|
AC_TRY_RUN([
|
||
|
|
@@ -1411,7 +1420,11 @@ fi
|
||
|
|
|
||
|
|
AC_MSG_CHECKING(for the suffix of shared libraries)
|
||
|
|
export SED
|
||
|
|
+if test -x libtool; then
|
||
|
|
shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
|
||
|
|
+else
|
||
|
|
+shrext_cmds=`libtool --config | grep '^shrext_cmds='`
|
||
|
|
+fi
|
||
|
|
eval $shrext_cmds
|
||
|
|
module=yes eval std_shrext=$shrext_cmds
|
||
|
|
# chop the initial dot
|