require automake 1.6, 1.5 chokes on AM_LDFLAGS, which 1.7 wants instead of

* autogen.sh: require automake 1.6, 1.5 chokes on AM_LDFLAGS, which 1.7 wants
	instead of LDFLAGS(!).  Require autoconf 2.52 or newer, because older
	versions bail on configure.in.
* configure.in: Check if ft_render_mode_mono, FT_RENDER_MODE_NORMAL,
	FT_PIXEL_MODE_MONO, ft_pixel_mode_mono, FT_PIXEL_MODE_GRAY2,
	FT_PIXEL_MODE_GRAY4, FT_PIXEL_MODE_GRAY, ft_pixel_mode_grays,
	FT_PIXEL_MODE_LCD are declared.
* src/vte.c, src/vteapp.c, src/vtefc.c, src/vtepango.c: handle being built with
	GTK+ 2.0 or 2.2.
* src/vtegl.c: disable for GTK+ < 2.2.0.
* src/vtepangox.c: use a PangoX context instead of a Pango context when
	determining font metrics.
* src/vteglyph.c: handle the twisty maze of load and render options and pixel
	modes which various versions of freetype support.

1 files changed, 26 insertions, 10 deletions

diff --git a/autogen.sh b/autogen.sh
index 34666c16..ae4eecb1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,13 +29,29 @@ if $have_libtool ; then : ; else
 	DIE=1
 fi
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+for autoconf in autoconf autoconf-2.57 autoconf-2.56 autoconf-2.55 autoconf-2.54 autoconf-2.53 autoconf-2.52 ; do
+	if "$autoconf" --version < /dev/null > /dev/null 2>&1 ; then
+		version=`"$autoconf" --version | head -1 | awk '{print $NF}'`
+		acmajor=`echo "$version" | cut -f1 -d.`
+		acminor=`echo "$version" | cut -f2 -d.`
+		if test "$acmajor" -gt 3 ; then
+			break
+		fi
+		if test "$acmajor" -ge 2 ; then
+			if test "$acminor" -ge 50 ; then
+				break
+			fi
+		fi
+	fi
+done
+if ! "$autoconf" --version < /dev/null > /dev/null 2>&1 ; then
 	echo
-	echo "You must have autoconf installed to compile $PROJECT."
+	echo "You must have autoconf 2.52 installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
-}
+fi
+autoheader=`echo "$autoconf" | sed s,autoconf,autoheader,g`
 
 (freetype-config --version) < /dev/null > /dev/null 2>&1 || {
 	echo
@@ -46,7 +62,7 @@ fi
 }
 
 have_automake=false
-for automakev in 1.7 1.6 1.5 ; do
+for automakev in 1.7 1.6 ; do
 	if automake-$automakev --version < /dev/null > /dev/null 2>&1 ; then
 		have_automake=true
 		break;
@@ -54,8 +70,8 @@ for automakev in 1.7 1.6 1.5 ; do
 done
 if $have_automake ; then : ; else
 	echo
-	echo "You must have automake 1.5 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.5.tar.gz"
+	echo "You must have automake 1.6 installed to compile $PROJECT."
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.6.tar.gz"
 	echo "(or a newer version if it is available)"
 	DIE=1
 fi
@@ -81,16 +97,16 @@ touch config.h.in
 aclocal-$automakev $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+$autoheader
 automake-$automakev -a -c $am_opt
-autoconf
+$autoconf
 
 cd gnome-pty-helper
 touch config.h.in
 aclocal-$automakev $ACLOCAL_FLAGS
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+$autoheader
 automake-$automakev -a -c $am_opt
-autoconf
+$autoconf
 
 cd $ORIGDIR