diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2007-06-06 14:40:54 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2007-06-06 14:40:54 +0300 |
commit | 802add035e4afbc5909af2517e7a347dae8e715b (patch) | |
tree | 021ea03516e3557f4ce0a9f14954364be4a2c07e /autogen.sh | |
parent | 1371af04f4162dd25d58c4e984b0bbd1efc82917 (diff) | |
download | rpm-802add035e4afbc5909af2517e7a347dae8e715b.tar.gz |
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
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 18 |
1 files changed, 12 insertions, 6 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 |