diff options
-rwxr-xr-x | autogen.sh | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -25,15 +25,15 @@ run_versioned() { local V V=$(echo "$2" | sed -e 's,\.,,g') - - if [ -e "`which $1$V`" ] ; then - P="$1$V" + + if [ -e "`which $1$V 2> /dev/null`" ] ; then + P="$1$V" else - if [ -e "`which $1-$2`" ] ; then - P="$1-$2" - else - P="$1" - fi + if [ -e "`which $1-$2 2> /dev/null`" ] ; then + P="$1-$2" + else + P="$1" + fi fi shift 2 @@ -45,21 +45,23 @@ set -ex if [ "x$1" = "xam" ] ; then run_versioned automake "$VERSION" -a -c --foreign ./config.status -else +else rm -rf autom4te.cache rm -f config.cache mkdir -p common + touch config.rpath + test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize - run_versioned "$LIBTOOLIZE" 1.5 -c --force + "$LIBTOOLIZE" -c --force run_versioned aclocal "$VERSION" -I common run_versioned autoconf 2.59 -Wall run_versioned autoheader 2.59 run_versioned automake "$VERSION" -a -c --foreign if test "x$NOCONFIGURE" = "x"; then - ./configure "$@" + CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" make clean fi fi |