Bug 552107 – Small libtool fixes

2008-10-10  Behdad Esfahbod  <behdad@gnome.org>

        Bug 552107 – Small libtool fixes

        * configure.in: Regenerate libtool early, quote $deplibs_check_method.
        Patch by Patryk Zawadzki

svn path=/trunk/; revision=2729

diff --git a/ChangeLog b/ChangeLog
index 9e2010a..4f57cf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-10  Behdad Esfahbod  <behdad@gnome.org>
+
+       Bug 552107 – Small libtool fixes
+
+       * configure.in: Regenerate libtool early, quote $deplibs_check_method.
+       Patch by Patryk Zawadzki
+
 2008-10-10  Kjartan Maraas  <kmaraas@gnome.org>
 
        * pango/pangox.c: (get_context_info): Fix a gcc warning.

diff --git a/configure.in b/configure.in
index 8820318..4501136 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -135,6 +135,8 @@ if test "$pango_os_win32" = "yes"; then
 fi
 
 AM_PROG_LIBTOOL
+dnl when using libtool 2.x create libtool early, because it's used in configure
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 
 AC_MSG_CHECKING([for some Win32 platform])
 case "$host" in
@@ -685,7 +687,7 @@ AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
   auto)
     export SED
-    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
+    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes  
     else