39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
--- configure.in
|
||
|
|
+++ configure.in
|
||
|
|
@@ -377,7 +377,11 @@ AC_MSG_CHECKING([Whether to write depend
|
||
|
|
case $enable_explicit_deps in
|
||
|
|
auto)
|
||
|
|
export SED
|
||
|
|
+ if test -x libtool; then
|
||
|
|
deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
|
||
|
|
+ else
|
||
|
|
+ deplibs_check_method=`(libtool --config; echo 'eval echo $deplibs_check_method') | sh`
|
||
|
|
+ fi
|
||
|
|
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
|
||
|
|
enable_explicit_deps=yes
|
||
|
|
else
|
||
|
|
@@ -726,7 +730,11 @@ else
|
||
|
|
dnl Now we check to see if our libtool supports shared lib deps
|
||
|
|
dnl (in a rather ugly way even)
|
||
|
|
if $dynworks; then
|
||
|
|
+ if test -x libtool; then
|
||
|
|
pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
||
|
|
+ else
|
||
|
|
+ pixbuf_libtool_config="libtool --config"
|
||
|
|
+ fi
|
||
|
|
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||
|
|
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||
|
|
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||
|
|
@@ -1636,7 +1644,11 @@ AM_CONDITIONAL(TEST_PRINT_BACKEND, test
|
||
|
|
# We are using gmodule-no-export now, but I'm leaving the stripping
|
||
|
|
# code in place for now, since pango and atk still require gmodule.
|
||
|
|
export SED
|
||
|
|
+if test -x libtool; then
|
||
|
|
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||
|
|
+else
|
||
|
|
+export_dynamic=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||
|
|
+fi
|
||
|
|
if test -n "$export_dynamic"; then
|
||
|
|
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||
|
|
GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
|