summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-10-10 23:59:29 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-10-10 23:59:29 +0000
commit08a4b2dab8ab5b5b16974b5c6604c976dab9f81e (patch)
tree325201918570790e7d4f333484ef276f507017a9
parent5bfa087f541367ee61439d85aa1166993e0fd8c7 (diff)
downloadpango-08a4b2dab8ab5b5b16974b5c6604c976dab9f81e.tar.gz
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
-rw-r--r--ChangeLog7
-rw-r--r--configure.in4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e2010a1..4f57cf25 100644
--- 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 88203180..45011367 100644
--- 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