Possible improved autotools handling in CVS
[email protected] (Jonas Smedegaard)
| Newsgroups | php.gd.devel |
|---|---|
| Message-ID | <[email protected]> |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I checked out the CVS today, to compare the 2.0.33 release with current work in CVS. I noticed that your bootstrap command does not handle the files added automatically by libtools. Is that on purpose? If I am right in assuming that the libtools-applied files was not in some odd way hand-edited for special libgd purposes, than I suggest stripping them from CVS and adding relibtoolize to the bootstrap script. The attached patch does that - and also supports optional local options passed to all autotools scripts, not only automake than you need to pass options. Kind regards, Jonas Official package maintainer of libgd for Debian GNU systems - -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ - Enden er nær: http://www.shibumi.org/eoti.htm -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFlpYbn7DbMsAkQLgRAq7dAJ4ydNbk9WXK2jbLDhVFwSbEWOrkggCgj/m5 9wlBZ6+Gr1uuWLOrN0ffWmo= =2vQe -----END PGP SIGNATURE-----
libgd.diff
(text/x-patch, 2.1 KB)
diff -ruN libgd.orig/bootstrap.sh libgd/bootstrap.sh
--- libgd.orig/bootstrap.sh 2006-12-30 17:22:11.000000000 +0100
+++ libgd/bootstrap.sh 2006-12-30 16:12:52.000000000 +0100
@@ -4,13 +4,18 @@
# allow importing from the environment, e.g.
# "AUTOCONF=autoconf259 ... ./bootstrap.sh"
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
ACLOCAL=${ACLOCAL:-aclocal}
AUTOCONF=${AUTOCONF:-autoconf}
AUTOHEADER=${AUTOHEADER:-autoheader}
AUTOMAKE=${AUTOMAKE:-automake}
# might handle this differently
-AUTOMAKE_FLAGS="--add-missing --copy"
+LIBTOOLIZE_FLAGS="${LIBTOOLIZE_FLAGS:--c -f}"
+ACLOCAL_FLAGS="${ACLOCAL_FLAGS}"
+AUTOHEADER_FLAGS="${AUTOHEADER_FLAGS}"
+AUTOMAKE_FLAGS="${AUTOMAKE_FLAGS:---add-missing --copy}"
+AUTOCONF_FLAGS="${AUTOCONF_FLAGS}"
#
CLEANFILES="Makefile Makefile.in aclocal.m4 autom4te.cache config.h config.log \
@@ -21,10 +26,12 @@
rm -rf ${CLEANFILES}
#
-if ${ACLOCAL} \
- && ${AUTOHEADER} \
+if ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS} \
+ && ${ACLOCAL} ${ACLOCA_FLAGS} \
+ && ${AUTOHEADER} ${AUTOHEADER_FLAGS} \
&& ${AUTOMAKE} ${AUTOMAKE_FLAGS} \
- && ${AUTOCONF} && [ -f configure ]
+ && ${AUTOCONF} ${AUTOCONF_FLAGS} \
+ && [ -f configure ]
then
echo Now run configure and make
else
diff -ruN libgd.orig/config/CVS/Entries libgd/config/CVS/Entries
--- libgd.orig/config/CVS/Entries 2006-12-30 17:21:20.000000000 +0100
+++ libgd/config/CVS/Entries 2006-12-30 15:18:42.000000000 +0100
@@ -1,3 +1,4 @@
+/.cvsignore/1.2/Thu Oct 12 11:30:32 2006//
/Makefile.am/1.1/Wed Apr 5 15:56:57 2006//
/config.guess/1.2/Mon Oct 9 14:22:22 2006//
/config.rpath/1.1/Wed Apr 5 15:56:57 2006//
@@ -8,5 +9,4 @@
/ltmain.sh/1.2/Mon Oct 9 14:22:22 2006//
/missing/1.1/Wed Apr 5 15:56:57 2006//
/mkinstalldirs/1.1/Wed Apr 5 15:56:57 2006//
-/.cvsignore/1.2/Sat Dec 30 16:21:20 2006//
D
diff -ruN libgd.orig/config/.cvsignore libgd/config/.cvsignore
--- libgd.orig/config/.cvsignore 2006-12-30 17:21:20.000000000 +0100
+++ libgd/config/.cvsignore 2006-12-30 16:06:15.000000000 +0100
@@ -1,3 +1,11 @@
Makefile
Makefile.in
gdlib-config
+config.guess
+config.rpath
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+installdirs