From 27d302f9c9a330d0d52657236dad6a1f6e65444b Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 1 Oct 2001 20:49:38 +0000 Subject: [PATCH] bootstrap: make it so bootstrap can be run out of dir (like configure) configure.ac: evil hack to get $AR working with older libtool (1.3) --- bootstrap | 1 + configure.ac | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/bootstrap b/bootstrap index fb288f556..7cb6fd85c 100755 --- a/bootstrap +++ b/bootstrap @@ -1,4 +1,5 @@ #! /bin/sh +cd `dirname $0` # Check Autoconf version if [ -x `which autoconf` ]; then AC_VER=`autoconf --version | head -1 | sed 's/^[^0-9]*//'` diff --git a/configure.ac b/configure.ac index 2db295022..64b4bfa7c 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,12 @@ AC_SUBST(ISODATE) AC_LANG_C +if test ${AR-unset} = unset; then +echo boo + AR="ar" +fi +export AR + endian="" case "$host_os" in mingw32*) @@ -1541,6 +1547,16 @@ AC_OUTPUT( RPM/quakeforge.spec, chmod +x quakeforge-config RPM/build_rpm + if test "$AR" != "ar"; then + sed -e 's/^AR="ar"$/AR="'$AR'"/' libtool > libtool.qf + if cmp -s libtool.qf libtool; then + echo libtool is unchanged + rm -f libtool.qf + else + rm -f libtool + mv libtool.qf libtool + fi + fi ) if test "x$CCVER" = "x"; then