RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: file zlib Date: 03-Jul-2007 18:20:15
Branch: HEAD Handle: 2007070317201400
Modified files:
file autogen.sh
zlib autogen.sh
Log:
synchronize the ZLib and File autogen.sh scripts with the one from RPM
Summary:
Revision Changes Path
1.32 +35 -42 file/autogen.sh
1.11 +39 -19 zlib/autogen.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/autogen.sh
============================================================================
$ cvs diff -u -r1.31 -r1.32 autogen.sh
--- file/autogen.sh 30 May 2007 02:49:33 -0000 1.31
+++ file/autogen.sh 3 Jul 2007 16:20:14 -0000 1.32
@@ -1,54 +1,47 @@
#!/bin/sh
-export CFLAGS
-export LDFLAGS
-
-LTV="libtoolize (GNU libtool) 1.5.22"
-ACV="autoconf (GNU Autoconf) 2.61"
+# configure the requirements
AMV="automake (GNU automake) 1.10"
+ACV="autoconf (GNU Autoconf) 2.61"
+LTV="libtoolize (GNU libtool) 1.5.24"
+GTT="gettextize (GNU gettext-tools) 0.16.1"
USAGE="
-This script documents the versions of the tools I'm using to build rpm:
- libtool-1.5.22
- autoconf-2.61
- automake-1.10
-Simply edit this script to change the libtool/autoconf/automake versions
-checked if you need to, as rpm should build (and has built) with all
-recent versions of libtool/autoconf/automake.
+To build RPM from plain CVS sources the following
+installed developer tools are mandatory:
+ GNU automake 1.10
+ GNU autoconf 2.61
+ GNU libtool 1.5.24
+ GNU gettext 0.16.1
"
-libtoolize=`which glibtoolize 2>/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=`which libtoolize 2>/dev/null`
- case $libtoolize in
- /*) ;;
- *) libtoolize=libtoolize
+# wrapper for running GNU libtool's libtoolize(1)
+libtoolize () {
+ _libtoolize=`which glibtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize=`which libtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize="libtoolize" ;;
+ esac
+ ;;
esac
-esac
+ $_libtoolize ${1+"$@"}
+}
-[ "`$libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
-[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
-[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" # && exit 1
-
-$libtoolize --copy --force
+# requirements sanity check
+[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
+[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
+[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
+[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
+
+echo "---> generate files via GNU libtool (libtoolize)"
+libtoolize --copy --force
+echo "---> generate files via GNU autoconf (aclocal, autoheader)"
aclocal
autoheader
-automake -a -c
+echo "---> generate files via GNU automake (automake)"
+automake -Wall -Wno-override -a -c
+echo "---> generate files via GNU autoconf (autoconf)"
autoconf
-if [ "$1" = "--noconfigure" ]; then
- exit 0;
-fi
-
-if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
- if [ -d /usr/share/man ]; then
- mandir=/usr/share/man
- infodir=/usr/share/info
- else
- mandir=/usr/man
- infodir=/usr/info
- fi
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} --enable-static "$@"
-else
- ./configure "$@"
-fi
@@ .
patch -p0 <<'@@ .'
Index: zlib/autogen.sh
============================================================================
$ cvs diff -u -r1.10 -r1.11 autogen.sh
--- zlib/autogen.sh 16 Jul 2005 15:37:48 -0000 1.10
+++ zlib/autogen.sh 3 Jul 2007 16:20:14 -0000 1.11
@@ -1,27 +1,47 @@
#!/bin/sh
-libtoolize=`which glibtoolize 2>/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=`which libtoolize 2>/dev/null`
- case $libtoolize in
- /*) ;;
- *) libtoolize=libtoolize
+# configure the requirements
+AMV="automake (GNU automake) 1.10"
+ACV="autoconf (GNU Autoconf) 2.61"
+LTV="libtoolize (GNU libtool) 1.5.24"
+GTT="gettextize (GNU gettext-tools) 0.16.1"
+USAGE="
+To build RPM from plain CVS sources the following
+installed developer tools are mandatory:
+ GNU automake 1.10
+ GNU autoconf 2.61
+ GNU libtool 1.5.24
+ GNU gettext 0.16.1
+"
+
+# wrapper for running GNU libtool's libtoolize(1)
+libtoolize () {
+ _libtoolize=`which glibtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize=`which libtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize="libtoolize" ;;
+ esac
+ ;;
esac
-esac
+ $_libtoolize ${1+"$@"}
+}
+
+# requirements sanity check
+[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
+[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
+[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
+[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
-$libtoolize --copy --force
+echo "---> generate files via GNU libtool (libtoolize)"
+libtoolize --copy --force
+echo "---> generate files via GNU autoconf (aclocal, autoheader)"
aclocal
autoheader
-automake -a -c
+echo "---> generate files via GNU automake (automake)"
+automake -Wall -Wno-override -a -c
+echo "---> generate files via GNU autoconf (autoconf)"
autoconf
-if [ "$1" = "--noconfigure" ]; then
- exit 0;
-fi
-
-if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
- ./configure --prefix=/usr "$@"
-else
- ./configure "$@"
-fi
@@ .
Received on Tue Jul 3 18:20:15 2007