From 3b267779856fd2ac9b799525c57203f1a457af1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 16 Nov 2010 00:53:44 +0900
Subject: [PATCH] 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.
---
 bootstrap    | 26 +++++++++++++-------------
 configure.ac |  5 +++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/bootstrap b/bootstrap
index 6178ee1c0..c1942cf5f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -49,15 +49,15 @@ if test -n "$lt" ; then
 		LTIZE_VER_MAJOR=`echo $LTIZE_VER | cut -f1 -d'.'`
 		LTIZE_VER_MINOR=`echo $LTIZE_VER | cut -f2 -d'.' | sed -e 's/[^0-9]//g'`
 
-		if test "$LTIZE_VER_MAJOR" -lt "2"; then
-			errors="Libtool 1.4 or greater needed to build configure.\n$errors"
+		if test "$LTIZE_VER_MAJOR" -lt "1"; then
+			errors="Libtool 1.5 or greater needed to build configure.\n$errors"
 		fi
-		if test "$LTIZE_VER_MAJOR" -eq "2" -a "$LTIZE_VER_MINOR" -lt "2" ; then
-			errors="Libtool 1.4 or greater needed to build configure.\n$errors"
+		if test "$LTIZE_VER_MAJOR" -eq "1" -a "$LTIZE_VER_MINOR" -lt "5" ; then
+			errors="Libtool 1.5 or greater needed to build configure.\n$errors"
 		fi
 	fi
 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
 
 # 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]*$//'`
 
 		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
 
-		if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "65" ; then
-			errors="Autoconf 2.65 or greater needed to build configure.\n$errors"
+		if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "61" ; then
+			errors="Autoconf 2.61 or greater needed to build configure.\n$errors"
 		fi
 	fi
 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
 
 am=`which automake`
@@ -87,14 +87,14 @@ if test -n "$am" ; then
 		AM_VER_MAJOR=`echo $AM_VER | cut -f1 -d.`
 		AM_VER_MINOR=`echo $AM_VER | cut -f2 -d.`
 		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
-		if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "11"; then
-			errors="Automake 1.11 or greater needed to build makefiles.\n$errors"
+		if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "10"; then
+			errors="Automake 1.10 or greater needed to build makefiles.\n$errors"
 		fi
 	fi
 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
 
 if test -n "$errors" ; then
diff --git a/configure.ac b/configure.ac
index 643aee1a8..194e526e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 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
 AC_INIT([QuakeForge], [git-master])
@@ -10,7 +10,8 @@ if test "x${CFLAGS-unset}" = xunset; then
 	CFLAGS=""
 fi
 saved_CFLAGS="$CFLAGS"
-LT_INIT([win32-dll])
+dnl LT_INIT([win32-dll])
+AM_PROG_LIBTOOL
 CFLAGS="$saved_CFLAGS"
 
 AC_REVISION([$Revision$]) dnl