diff options
| -rwxr-xr-x | autogen.sh | 18 | ||||
| -rwxr-xr-x | file/autogen.sh | 17 |
2 files changed, 12 insertions, 23 deletions
diff --git a/autogen.sh b/autogen.sh index 8549642e4..27d4118b6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,14 +3,14 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.5.18" -ACV="autoconf (GNU Autoconf) 2.59" -AMV="automake (GNU automake) 1.9.5" +LTV="libtoolize (GNU libtool) 1.5.22" +ACV="autoconf (GNU Autoconf) 2.61" +AMV="automake (GNU automake) 1.10" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.5.18 - autoconf-2.59 - automake-1.9.5 + 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. @@ -36,6 +36,12 @@ if [ X"$@" = X -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then export CPPFLAGS="-I${myprefix}/include" fi +# XXX add missing config.rpath, kludgery around what's apparently +# gettext related stuff... +for d in . popt file; do + touch $d/config.rpath +done + if [ -d popt ]; then (echo "--- popt"; cd popt; ./autogen.sh --noconfigure "$@") fi diff --git a/file/autogen.sh b/file/autogen.sh index 8ca4f5ab2..c3cbccc04 100755 --- a/file/autogen.sh +++ b/file/autogen.sh @@ -3,19 +3,6 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.5.18" -ACV="autoconf (GNU Autoconf) 2.59" -AMV="automake (GNU automake) 1.9.5" -USAGE=" -This script documents the versions of the tools I'm using to build rpm: - libtool-1.5.18 - autoconf-2.59 - automake-1.9.5 -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. -" - libtoolize=`which glibtoolize 2>/dev/null` case $libtoolize in /*) ;; @@ -26,10 +13,6 @@ case $libtoolize in esac esac -[ "`$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 aclocal autoheader |