[Pkg-php-commits] r1130 - in php5/trunk/debian: . patches

[Adam Conrad]

Author: adconrad
Date: 2008-08-12 17:12:44 +0000 (Tue, 12 Aug 2008)
New Revision: 1130

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/033-we_WANT_libtool.patch
Log:
Update libtool support for newer and shinier libtools with (IMO) broken options


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-08-09 04:41:17 UTC (rev 1129)
+++ php5/trunk/debian/changelog	2008-08-12 17:12:44 UTC (rev 1130)
@@ -5,7 +5,12 @@
   [ Thijs Kinkhorst ]
   * Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.
   * Add documentation about the timezonedb change (Closes: #492025).
-  
+
+  [ Adam Conrad ]
+  * Modify 033-we_WANT_libtool.patch to cope with newer versions of
+    libtool that only copy auxilliary files when --install is used,
+    while still working with older versions that DTRT without.
+
   [ Raphael Geissert ]
   * debian/rules:
     + Avoid installing useless test suites in php-pear (Closes: #478995)

Modified: php5/trunk/debian/patches/033-we_WANT_libtool.patch
===================================================================
--- php5/trunk/debian/patches/033-we_WANT_libtool.patch	2008-08-09 04:41:17 UTC (rev 1129)
+++ php5/trunk/debian/patches/033-we_WANT_libtool.patch	2008-08-12 17:12:44 UTC (rev 1130)
@@ -2,12 +2,16 @@
 ===================================================================
 --- php5-5.2.6.orig/build/build2.mk
 +++ php5-5.2.6/build/build2.mk
-@@ -52,6 +52,11 @@ $(TOUCH_FILES):
+@@ -52,6 +52,15 @@ $(TOUCH_FILES):
  
  aclocal.m4: configure.in acinclude.m4
  	@echo rebuilding $@
 +	@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-+	$$libtoolize --copy --automake --force; \
++	if $$libtoolize --help | grep -q -- --install; then \
++	  $$libtoolize --copy --install --automake --force; \
++	else \
++	  $$libtoolize --copy --automake --force; \
++	fi; \
 +	ltpath=`dirname $$libtoolize`; \
 +	ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
 +	cp $$ltfile ./build/libtool.m4