qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get qf debian stable compatible again. 

Had to backtrack on the libtool version, (and the init line), but I might be
able to make it a little nicer later.
This commit is contained in:
Bill Currie 2010-11-16 00:53:44 +09:00
parent f8f54fa910
commit 3b26777985
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bootstrap
View File

@ -49,15 +49,15 @@ if test -n "$lt" ; then
LTIZE_VER_MAJOR=`echo $LTIZE_VER | cut -f1 -d'.'` LTIZE_VER_MAJOR=`echo $LTIZE_VER | cut -f1 -d'.'`
LTIZE_VER_MINOR=`echo $LTIZE_VER | cut -f2 -d'.' | sed -e 's/[^0-9]//g'` LTIZE_VER_MINOR=`echo $LTIZE_VER | cut -f2 -d'.' | sed -e 's/[^0-9]//g'`
if test "$LTIZE_VER_MAJOR" -lt "2"; then if test "$LTIZE_VER_MAJOR" -lt "1"; then
errors="Libtool 1.4 or greater needed to build configure.\n$errors" errors="Libtool 1.5 or greater needed to build configure.\n$errors"
fi fi
if test "$LTIZE_VER_MAJOR" -eq "2" -a "$LTIZE_VER_MINOR" -lt "2" ; then if test "$LTIZE_VER_MAJOR" -eq "1" -a "$LTIZE_VER_MINOR" -lt "5" ; then
errors="Libtool 1.4 or greater needed to build configure.\n$errors" errors="Libtool 1.5 or greater needed to build configure.\n$errors"
fi fi
fi fi
else else
errors="Libtool not found. QuakeForge CVS requires libtool to bootstrap itself.\n$errors" errors="Libtool not found. QuakeForge git requires libtool to bootstrap itself.\n$errors"
fi fi
# Check Autoconf version # Check Autoconf version
@ -69,15 +69,15 @@ if test -n "$ac" ; then
AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'` AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'`
if test "$AC_VER_MAJOR" -lt "2" ; then if test "$AC_VER_MAJOR" -lt "2" ; then
errors="Autoconf 2.67 or greater needed to build configure.\n$errors" errors="Autoconf 2.61 or greater needed to build configure.\n$errors"
fi fi
if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "65" ; then if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "61" ; then
errors="Autoconf 2.65 or greater needed to build configure.\n$errors" errors="Autoconf 2.61 or greater needed to build configure.\n$errors"
fi fi
fi fi
else else
errors="Autoconf not found. QuakeForge CVS requires autoconf to bootstrap itself.\n$errors" errors="Autoconf not found. QuakeForge git requires autoconf to bootstrap itself.\n$errors"
fi fi
am=`which automake` am=`which automake`
@ -87,14 +87,14 @@ if test -n "$am" ; then
AM_VER_MAJOR=`echo $AM_VER | cut -f1 -d.` AM_VER_MAJOR=`echo $AM_VER | cut -f1 -d.`
AM_VER_MINOR=`echo $AM_VER | cut -f2 -d.` AM_VER_MINOR=`echo $AM_VER | cut -f2 -d.`
if test "$AM_VER_MAJOR" -lt "1"; then if test "$AM_VER_MAJOR" -lt "1"; then
errors="Automake 1.6 or greater needed to build makefiles.\n$errors" errors="Automake 1.10 or greater needed to build makefiles.\n$errors"
fi fi
if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "11"; then if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "10"; then
errors="Automake 1.11 or greater needed to build makefiles.\n$errors" errors="Automake 1.10 or greater needed to build makefiles.\n$errors"
fi fi
fi fi
else else
errors="Automake not found. QuakeForge CVS requires automake to bootstrap itself.\n$errors" errors="Automake not found. QuakeForge git requires automake to bootstrap itself.\n$errors"
fi fi
if test -n "$errors" ; then if test -n "$errors" ; then

5
configure.ac
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.65) AC_PREREQ(2.61)
dnl This is the only place where the package name and version appear dnl This is the only place where the package name and version appear
AC_INIT([QuakeForge], [git-master]) AC_INIT([QuakeForge], [git-master])
@ -10,7 +10,8 @@ if test "x${CFLAGS-unset}" = xunset; then
CFLAGS="" CFLAGS=""
fi fi
saved_CFLAGS="$CFLAGS" saved_CFLAGS="$CFLAGS"
LT_INIT([win32-dll]) dnl LT_INIT([win32-dll])
AM_PROG_LIBTOOL
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
AC_REVISION([$Revision$]) dnl AC_REVISION([$Revision$]) dnl