From 802add035e4afbc5909af2517e7a347dae8e715b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 6 Jun 2007 14:40:54 +0300 Subject: autogen.sh tweaking: - generate config.rpath from autogen for now (kludge...) - update autogen "documented versions" to F7 level, remove double versions checks (and complaints) from file/autogen --- autogen.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'autogen.sh') 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 -- cgit v1.2.3