folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Panu Matilainen 2007-06-06 14:40:54 +03:00
parent 1371af04f4
commit 802add035e
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autogen.sh
View File

@ -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

17
file/autogen.sh
View File

@ -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