--- gl-117-1.3.2.orig/aclocal.m4
+++ gl-117-1.3.2/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.3])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -266,9 +266,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi
@@ -603,6 +608,46 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	-*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--- gl-117-1.3.2.orig/configure
+++ gl-117-1.3.2/configure
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -857,6 +857,8 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
 
@@ -970,7 +972,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1735,6 +1737,30 @@
 
           ac_config_headers="$ac_config_headers config.h"
 
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
 
 LIBS="$LIBS -L/usr/X11R6/lib"
 
@@ -2371,8 +2397,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2430,8 +2455,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2547,8 +2571,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2602,8 +2625,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2648,8 +2670,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2693,8 +2714,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2804,9 +2824,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -3076,6 +3101,247 @@
 echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
+ac_path_x_has_been_run=yes
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
+
+fi;
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    if test "${ac_cv_have_x+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+rm -fr conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat >Imakefile <<'_ACEOF'
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
+	ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
+    case $ac_im_incroot in
+	/usr/include) ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+    esac
+    case $ac_im_usrlibdir in
+	/usr/lib | /lib) ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+    esac
+  fi
+  cd ..
+  rm -fr conftest.dir
+fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+  # Guess where to find include files, by looking for a specified header file.
+  # First, try using that file with no special directory specified.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  for ac_dir in $ac_x_header_dirs; do
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
+    ac_x_includes=$ac_dir
+    break
+  fi
+done
+fi
+rm -f conftest.err conftest.$ac_ext
+fi # $ac_x_includes = no
+
+if test "$ac_x_libraries" = no; then
+  # Check for the libraries.
+  # See if we find them without any special options.
+  # Don't add to $LIBS permanently.
+  ac_save_LIBS=$LIBS
+  LIBS="-lXt $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+int
+main ()
+{
+XtMalloc (0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+  # Don't even attempt the hair of trying to link an X program!
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/libXt.$ac_extension; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
+
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
+  no_x=yes
+else
+  # If each of the values was on the command line, it overrides each guess.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  # It might be that x_includes is empty (headers are found in the
+  # standard search path. Then output the corresponding message
+  ac_out_x_includes=$x_includes
+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+fi
+
+
+if test "x$ac_path_x_has_been_run" != xyes; then
+  echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ac_path_x_has_been_run=yes
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -3168,7 +3434,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for a specified header file.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3242,8 +3508,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3303,10 +3568,15 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  # It might be that x_includes is empty (headers are found in the
+  # standard search path. Then output the corresponding message
+  ac_out_x_includes=$x_includes
+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
 fi
 
+fi
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
@@ -3354,8 +3624,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3406,8 +3675,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3483,8 +3751,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3539,8 +3806,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3608,8 +3874,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3717,8 +3982,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3782,8 +4046,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3851,8 +4114,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3956,8 +4218,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4021,8 +4282,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4119,8 +4379,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4184,8 +4443,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4282,8 +4540,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4347,8 +4604,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4427,8 +4683,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4634,8 +4889,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4693,8 +4947,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4765,8 +5018,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4810,8 +5062,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4915,9 +5166,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CXX_dependencies_compiler_type=$depmode
         break
       fi
@@ -5315,8 +5571,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5374,8 +5629,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5491,8 +5745,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5546,8 +5799,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5592,8 +5844,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5637,8 +5888,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5748,9 +5998,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -5931,8 +6186,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5974,8 +6228,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6032,8 +6285,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6218,8 +6470,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6389,8 +6640,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6453,8 +6703,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6602,8 +6851,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6751,8 +6999,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6900,8 +7147,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7048,8 +7294,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7205,8 +7450,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7276,8 +7520,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7347,8 +7590,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7418,8 +7660,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7489,8 +7730,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7619,6 +7859,13 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -8200,6 +8447,9 @@
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@am__leading_dot@,$am__leading_dot,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -8396,11 +8646,6 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -8439,6 +8684,12 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
--- gl-117-1.3.2.orig/Makefile.in
+++ gl-117-1.3.2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,7 +38,8 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	depcomp install-sh missing mkinstalldirs
+	config.guess config.sub depcomp install-sh missing \
+	mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -112,6 +113,9 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -177,7 +181,7 @@
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -204,9 +208,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
@@ -218,7 +222,7 @@
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -368,14 +372,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -385,9 +391,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -495,7 +503,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- gl-117-1.3.2.orig/configure.in
+++ gl-117-1.3.2/configure.in
@@ -1,6 +1,7 @@
 AC_INIT(src/main.cpp)
 AM_INIT_AUTOMAKE(gl-117,1.0,200308190000)
 AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
 
 LIBS="$LIBS -L/usr/X11R6/lib"
 
--- gl-117-1.3.2.orig/debian/gl-117-data.install
+++ gl-117-1.3.2/debian/gl-117-data.install
@@ -0,0 +1,2 @@
+usr/share/games/gl-117
+
--- gl-117-1.3.2.orig/debian/changelog
+++ gl-117-1.3.2/debian/changelog
@@ -0,0 +1,193 @@
+gl-117 (1.3.2-2.1ubuntu1) maverick; urgency=low
+
+  * debian/gl-117.desktop
+    -  Removed '3DGraphics' category, it has 3D Graphics, but it is
+       not what the package is for (LP: #532061)
+
+ -- Andrew Higginson <rugby471@gmail.com>  Tue, 24 Aug 2010 10:52:26 +0200
+
+gl-117 (1.3.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add desktop and icon file. (Closes: #523340, #420075).
+  * Build-depend on freeglut3-dev not glut3-dev. (Closes: #394494).
+  * Make binary binNMU safe. (Closes: #435942).
+
+ -- Barry deFreese <bdefreese@debian.org>  Tue, 20 Oct 2009 12:22:23 -0400
+
+gl-117 (1.3.2-2) unstable; urgency=low
+
+  * No more depends on xlibs-static-dev (Closes: #421563, #484184)
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed, 16 Jul 2008 22:13:08 +0200
+
+gl-117 (1.3.2-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Replace unsatisfiable build-dependency on xlibmesa-glu-dev with
+    libglu1-mesa-dev; fixes FTBFS. (Closes: #374596)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue, 27 Jun 2006 23:51:40 +0200
+
+gl-117 (1.3.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cédric Delfosse <cedric@debian.org>  Sat, 16 Jul 2005 18:23:37 +0200
+
+gl-117 (1.3.0-2) unstable; urgency=low
+
+  * FTBFS with gcc-3.4: extra `;' (Closes: Bug#266936)
+
+ -- Cédric Delfosse <cedric@debian.org>  Thu, 16 Sep 2004 21:32:17 +0200
+
+gl-117 (1.3.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cédric Delfosse <cedric@debian.org>  Fri, 18 Jun 2004 20:08:25 +0200
+
+gl-117 (1.2.0-4) unstable; urgency=low
+
+  * Make gl-117-data replaces gl-117 << 1.2.0-3 (Closes: Bug#250648)
+  * Fix missing 'for' in gl-117-data description
+  
+ -- Cédric Delfosse <cedric@debian.org>  Mon, 24 May 2004 22:10:16 +0200
+
+gl-117 (1.2.0-3) unstable; urgency=low
+
+  * Split the package in two (Closes: Bug#233360)
+  * Add xlibs-static-dev to Build-Depends, and link with Xxf86vm
+
+ -- Cédric Delfosse <cedric@debian.org>  Mon,  3 May 2004 22:15:01 +0200
+
+gl-117 (1.2.0-2) unstable; urgency=low
+
+  * Build against new XFree86 OpenGL libs
+  * Now built with debhelper compat level 4
+
+ -- Cédric Delfosse <cedric@debian.org>  Mon, 23 Feb 2004 18:20:54 +0100
+
+gl-117 (1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Use libglut3-dev instead of glutg3-dev in Build-Depends
+  * Fix mission with GL-22 HAWK segfault (Closes: Bug#227764)
+  * Bumped Standards-Version to 3.6.1
+
+ -- Cédric Delfosse <cedric@debian.org>  Sat,  7 Feb 2004 20:37:49 +0100
+
+gl-117 (1.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Update debian/rules to use config.guess and config.sub from autotools-dev
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed, 17 Dec 2003 21:40:30 +0100
+
+gl-117 (1.0.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cédric Delfosse <cedric@debian.org>  Thu, 28 Aug 2003 22:45:31 +0200
+
+gl-117 (0.9.0-2) unstable; urgency=low
+
+  * Rebuilt against xlibmesa3-gl, because xlibmesa3 is now in oldlibs
+  * Bumped Standards-Version to 3.6.0
+  * Put xlibmesa-gl-dev and xlibmesa-glu-dev in Build-Depends
+
+ -- Cédric Delfosse <cedric@debian.org>  Thu, 17 Jul 2003 13:59:10 +0200
+
+gl-117 (0.9.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Bumped Standards-Version to 3.5.10
+
+ -- Cédric Delfosse <cedric@debian.org>  Thu, 19 Jun 2003 22:20:02 +0200
+
+gl-117 (0.8.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cédric Delfosse <cedric@debian.org>  Mon,  5 May 2003 22:18:26 +0200
+
+gl-117 (0.8.5-1) unstable; urgency=low
+
+  * New upstream release (closes: Bug#185777)
+  * Converted configure.in from DOS to unix file format to fix AC_CONFIG_FILES
+    bug
+  * Now use upstream man page
+
+ -- Cédric Delfosse <cedric@debian.org>  Sat, 22 Mar 2003 19:03:17 +0100
+
+gl-117 (0.8.2-2) unstable; urgency=low
+
+  * Use AM_MAINTAINER_MODE in configure.in
+  * Better description
+  * Upgrade Standards-Version to 3.5.9
+
+ -- Cédric Delfosse <cedric@debian.org>  Sun, 16 Mar 2003 17:13:32 +0100
+
+gl-117 (0.8.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Added LDFLAGS in ./configure line from debian/rules
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed, 19 Feb 2003 22:23:19 +0100
+
+gl-117 (0.8.0-2) unstable; urgency=low
+
+  * Fix command path in debian/menu (thanks to gernot_galli@onlinehome.de for
+    reporting)
+  * Upgrade Standards-Version to 3.5.8
+
+ -- Cédric Delfosse <cedric@debian.org>  Tue,  7 Jan 2003 21:09:35 +0100
+
+gl-117 (0.8.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Added a manpage
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed,  4 Dec 2002 21:23:43 +0100
+
+gl-117 (0.7.5-1) unstable; urgency=low
+
+  * New upstream release
+  * gl-117 binary is now installed in /usr/games
+  * gl-117 datadir is now /usr/share/games/gl-117
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed, 16 Oct 2002 21:18:55 +0200
+
+gl-117 (0.7.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Upgrade to Debian Policy 3.5.7
+  * use CXXFLAGS instead of CFLAGS in debian/rules
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed, 18 Sep 2002 20:38:10 +0200
+
+gl-117 (0.6.8-2) unstable; urgency=low
+
+  * Add stdlib.h include to src/gl.h to fix build with g++ 3.0.4
+    (closes: Bug#160720)
+
+ -- Cédric Delfosse <cedric@debian.org>  Tue, 17 Sep 2002 21:59:08 +0200
+
+gl-117 (0.6.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cédric Delfosse <cedric@debian.org>  Wed,  4 Sep 2002 20:51:01 +0200
+
+gl-117 (0.6.0-2) unstable; urgency=low
+
+  * Fix build dependencies (closes Bug#155367)
+
+ -- Cédric Delfosse <cedric@debian.org>  Sun,  4 Aug 2002 12:48:38 +0200
+
+gl-117 (0.6.0-1) unstable; urgency=low
+
+  * Initial Release (closes: Bug#150956)
+
+ -- Cédric Delfosse <cedric@debian.org>  Tue, 26 Jul 2002 20:42:50 +0200
+
--- gl-117-1.3.2.orig/debian/control
+++ gl-117-1.3.2/debian/control
@@ -0,0 +1,26 @@
+Source: gl-117
+Section: games
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cédric Delfosse <cedric@debian.org>
+Build-Depends: debhelper (>= 4), freeglut3-dev (>= 2.4), libsdl-mixer1.2-dev (>= 1.2.1), libgl1-mesa-dev, libglu1-mesa-dev, libsdl1.2-dev (>= 1.2.4), autotools-dev 
+Standards-Version: 3.8.0
+Homepage: http://www.heptargon.de/gl-117/gl-117.html
+
+Package: gl-117
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gl-117-data (= ${source:Version})
+Description: An action flight simulator
+ gl-117 is a 3D action flight simulator featuring 20 missions, different
+ fighters, a random terrain generator, lighting effects, sound effects, music,
+ and joystick support.
+
+Package: gl-117-data
+Architecture: all
+Replaces: gl-117 (<< 1.2.0-3)
+Description: Data files for gl-117
+ gl-117 is a 3D action flight simulator featuring 20 missions, different
+ fighters, a random terrain generator, lighting effects, sound effects, music,
+ and joystick support.
+ .
+ This packages contains musics, sounds, models and textures for gl-117.
--- gl-117-1.3.2.orig/debian/gl-117.install
+++ gl-117-1.3.2/debian/gl-117.install
@@ -0,0 +1,2 @@
+usr/games/gl-117
+
--- gl-117-1.3.2.orig/debian/menu
+++ gl-117-1.3.2/debian/menu
@@ -0,0 +1,2 @@
+?package(gl-117):needs="X11" section="Games/Simulation"\
+  title="gl-117" command="/usr/games/gl-117"
--- gl-117-1.3.2.orig/debian/copyright
+++ gl-117-1.3.2/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Cedric Delfosse <cedric@debian.org> on
+Tue, 25 Jun 2002 21:53:50 +0200.
+
+It was downloaded from http://www.heptargon.de/gl-117/gl-117.html
+
+Upstream Author: Copyright 2001-2008 Thomas Drexl <tom.drexl@gmx.de>
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- gl-117-1.3.2.orig/debian/rules
+++ gl-117-1.3.2/debian/rules
@@ -0,0 +1,119 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CXXFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
+
+	# Add here commands to configure the package.
+	CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games
+	touch configure-stamp
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-arch-stamp
+
+build-indep: build-arch-stamp build-indep-stamp
+build-indep-stamp: configure-stamp config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# build-arch-stamp build what we need
+
+	touch build-indep-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean config.sub config.guess
+	dh_clean
+
+install: install-arch install-indep
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+	#install desktop file
+	install -D -m 644 $(CURDIR)/debian/gl-117.desktop $(CURDIR)/debian/gl-117/usr/share/applications/gl-117.desktop
+
+	#install icon file
+	install -D -m 644 $(CURDIR)/debian/gl-117.xpm $(CURDIR)/debian/gl-117/usr/share/pixmaps/gl-117.xpm
+
+	dh_install -a --sourcedir=debian/tmp
+
+install-indep: install-arch
+	dh_testdir
+	dh_testroot
+	dh_install -i --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build-indep install-indep
+# We have nothing to do by default.
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installchangelogs -i ChangeLog
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build-arch install-arch
+	dh_testdir -a
+	dh_testroot -a 
+	dh_installdocs -a
+	dh_installmenu -a
+	dh_installman -a doc/gl-117.6
+	dh_installchangelogs -a ChangeLog
+	dh_strip -a 
+	dh_compress -a 
+	dh_fixperms -a 
+	dh_installdeb -a 
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- gl-117-1.3.2.orig/debian/gl-117.desktop
+++ gl-117-1.3.2/debian/gl-117.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=0.9.4
+Name=gl-117
+Type=Application
+GenericName=Game
+Comment=Play a flight simulator
+Exec=gl-117
+Terminal=false
+Hidden=false
+Categories=Game;ActionGame;Simulation;
+Icon=gl-117
--- gl-117-1.3.2.orig/debian/docs
+++ gl-117-1.3.2/debian/docs
@@ -0,0 +1,5 @@
+README
+NEWS
+AUTHORS
+doc/gl-117.pdf
+FAQ
--- gl-117-1.3.2.orig/debian/compat
+++ gl-117-1.3.2/debian/compat
@@ -0,0 +1 @@
+4
--- gl-117-1.3.2.orig/debian/gl-117.xpm
+++ gl-117-1.3.2/debian/gl-117.xpm
@@ -0,0 +1,543 @@
+/* XPM */
+static char * gl_117_xpm[] = {
+"48 48 492 2",
+"  	c None",
+". 	c #505529",
+"+ 	c #6B7332",
+"@ 	c #4C5124",
+"# 	c #666937",
+"$ 	c #565A2E",
+"% 	c #686C34",
+"& 	c #606330",
+"* 	c #3C3E25",
+"= 	c #636632",
+"- 	c #6C702C",
+"; 	c #383920",
+"> 	c #6D7234",
+", 	c #5E622A",
+"' 	c #30301D",
+") 	c #39393C",
+"! 	c #545541",
+"~ 	c #62633B",
+"{ 	c #4E5029",
+"] 	c #6E7330",
+"^ 	c #575A29",
+"/ 	c #383821",
+"( 	c #343529",
+"_ 	c #6B6D44",
+": 	c #727543",
+"< 	c #75783E",
+"[ 	c #787D37",
+"} 	c #5C5E2B",
+"| 	c #64672E",
+"1 	c #404227",
+"2 	c #40431E",
+"3 	c #5D6138",
+"4 	c #676A3D",
+"5 	c #5B5D38",
+"6 	c #595D35",
+"7 	c #676A36",
+"8 	c #5D5E30",
+"9 	c #55562C",
+"0 	c #474929",
+"a 	c #464922",
+"b 	c #4C512E",
+"c 	c #5C5F33",
+"d 	c #58592E",
+"e 	c #55572C",
+"f 	c #55592A",
+"g 	c #4E5128",
+"h 	c #4C4F27",
+"i 	c #4A4D28",
+"j 	c #3F4125",
+"k 	c #3B3D27",
+"l 	c #44452A",
+"m 	c #4D4E2E",
+"n 	c #555731",
+"o 	c #636733",
+"p 	c #6C7134",
+"q 	c #6F7438",
+"r 	c #666A37",
+"s 	c #555A32",
+"t 	c #4F5231",
+"u 	c #545634",
+"v 	c #616236",
+"w 	c #5C5D2F",
+"x 	c #65692E",
+"y 	c #5C602D",
+"z 	c #51542B",
+"A 	c #535924",
+"B 	c #424520",
+"C 	c #3B3D1D",
+"D 	c #474C1F",
+"E 	c #3F431D",
+"F 	c #484A28",
+"G 	c #4F5224",
+"H 	c #515522",
+"I 	c #505323",
+"J 	c #454724",
+"K 	c #393A23",
+"L 	c #393924",
+"M 	c #414126",
+"N 	c #4A4C26",
+"O 	c #4F5228",
+"P 	c #4D4E2B",
+"Q 	c #4C4D2E",
+"R 	c #5A5D31",
+"S 	c #787E33",
+"T 	c #868C35",
+"U 	c #848B37",
+"V 	c #737838",
+"W 	c #7A7F39",
+"X 	c #7E8141",
+"Y 	c #797C40",
+"Z 	c #757834",
+"` 	c #51522B",
+" .	c #616436",
+"..	c #5C5F34",
+"+.	c #535526",
+"@.	c #494D21",
+"#.	c #33341D",
+"$.	c #35371C",
+"%.	c #373A1D",
+"&.	c #3F411D",
+"*.	c #474A1F",
+"=.	c #4A4E1F",
+"-.	c #43451F",
+";.	c #363620",
+">.	c #3E3F25",
+",.	c #53572A",
+"'.	c #656929",
+").	c #60642C",
+"!.	c #4F512E",
+"~.	c #4C4D2F",
+"{.	c #606234",
+"].	c #747736",
+"^.	c #828935",
+"/.	c #8E9738",
+"(.	c #949E3B",
+"_.	c #91993E",
+":.	c #868A45",
+"<.	c #808347",
+"[.	c #797B3F",
+"}.	c #50512C",
+"|.	c #525531",
+"1.	c #5C5E34",
+"2.	c #5E622D",
+"3.	c #505328",
+"4.	c #474725",
+"5.	c #3A3D21",
+"6.	c #35391F",
+"7.	c #2F301B",
+"8.	c #28291B",
+"9.	c #2E301B",
+"0.	c #383A1E",
+"a.	c #43461E",
+"b.	c #474920",
+"c.	c #3C3F21",
+"d.	c #393C23",
+"e.	c #4B4F26",
+"f.	c #5F6328",
+"g.	c #666A2A",
+"h.	c #5D602E",
+"i.	c #5C5C33",
+"j.	c #696B35",
+"k.	c #727534",
+"l.	c #6C7034",
+"m.	c #707438",
+"n.	c #7F843E",
+"o.	c #7E8241",
+"p.	c #747542",
+"q.	c #787B40",
+"r.	c #898F3E",
+"s.	c #737831",
+"t.	c #575A2A",
+"u.	c #5C5D31",
+"v.	c #5B5F2C",
+"w.	c #5A6028",
+"x.	c #595D25",
+"y.	c #474923",
+"z.	c #3E4222",
+"A.	c #434621",
+"B.	c #3E421B",
+"C.	c #232618",
+"D.	c #282918",
+"E.	c #2D2E1C",
+"F.	c #32331D",
+"G.	c #353720",
+"H.	c #535825",
+"I.	c #5D6326",
+"J.	c #606426",
+"K.	c #5B5F2A",
+"L.	c #585B30",
+"M.	c #696C32",
+"N.	c #787F2F",
+"O.	c #777D32",
+"P.	c #656835",
+"Q.	c #646639",
+"R.	c #6C6D3B",
+"S.	c #7B7F3B",
+"T.	c #8D943A",
+"U.	c #939D3A",
+"V.	c #8A923A",
+"W.	c #737735",
+"X.	c #60622E",
+"Y.	c #6A6E2B",
+"Z.	c #585A28",
+"`.	c #424324",
+" +	c #515425",
+".+	c #474922",
+"++	c #383924",
+"@+	c #373721",
+"#+	c #33341C",
+"$+	c #252618",
+"%+	c #2A2A19",
+"&+	c #2A2B1A",
+"*+	c #282919",
+"=+	c #2A2C1B",
+"-+	c #333520",
+";+	c #404421",
+">+	c #414221",
+",+	c #3C3D23",
+"'+	c #404328",
+")+	c #51532C",
+"!+	c #6B702E",
+"~+	c #7B8131",
+"{+	c #757933",
+"]+	c #676936",
+"^+	c #6B6E39",
+"/+	c #858B3B",
+"(+	c #898F3B",
+"_+	c #848A3A",
+":+	c #868C3D",
+"<+	c #828839",
+"[+	c #6A6C37",
+"}+	c #55572B",
+"|+	c #61642B",
+"1+	c #575C26",
+"2+	c #484A23",
+"3+	c #4E5125",
+"4+	c #424522",
+"5+	c #414222",
+"6+	c #3D3F20",
+"7+	c #36381C",
+"8+	c #383B19",
+"9+	c #3C3F1B",
+"0+	c #363819",
+"a+	c #2C2E19",
+"b+	c #292A1B",
+"c+	c #2C2E1C",
+"d+	c #2E2E1D",
+"e+	c #30301E",
+"f+	c #3B3D20",
+"g+	c #494B26",
+"h+	c #4B4B27",
+"i+	c #58582C",
+"j+	c #72772E",
+"k+	c #7B8132",
+"l+	c #6F7235",
+"m+	c #666938",
+"n+	c #72763B",
+"o+	c #83893B",
+"p+	c #90983B",
+"q+	c #98A139",
+"r+	c #9AA23A",
+"s+	c #8B913B",
+"t+	c #606334",
+"u+	c #434526",
+"v+	c #525526",
+"w+	c #5E6528",
+"x+	c #4C4D26",
+"y+	c #434427",
+"z+	c #454524",
+"A+	c #40421E",
+"B+	c #3A3E17",
+"C+	c #3E411B",
+"D+	c #43461D",
+"E+	c #37391B",
+"F+	c #28291A",
+"G+	c #222218",
+"H+	c #27271B",
+"I+	c #3C3E20",
+"J+	c #5B5F25",
+"K+	c #5F6127",
+"L+	c #4B4C27",
+"M+	c #595C28",
+"N+	c #71772E",
+"O+	c #6E7034",
+"P+	c #686B39",
+"Q+	c #74773D",
+"R+	c #878D3E",
+"S+	c #949D3E",
+"T+	c #959E3C",
+"U+	c #98A03C",
+"V+	c #98A23C",
+"W+	c #84893C",
+"X+	c #575932",
+"Y+	c #3B3B25",
+"Z+	c #474A24",
+"`+	c #545827",
+" @	c #4A4B29",
+".@	c #4A4A25",
+"+@	c #444622",
+"@@	c #3D3F1C",
+"#@	c #393C1B",
+"$@	c #2B2E19",
+"%@	c #252519",
+"&@	c #2F2F1D",
+"*@	c #494C22",
+"=@	c #636728",
+"-@	c #555927",
+";@	c #444627",
+">@	c #4E512C",
+",@	c #5A5D32",
+"'@	c #636537",
+")@	c #70723E",
+"!@	c #7A7E40",
+"~@	c #868A42",
+"{@	c #898F40",
+"]@	c #8D963B",
+"^@	c #969E3A",
+"/@	c #959B3C",
+"(@	c #757937",
+"_@	c #4F512D",
+":@	c #484929",
+"<@	c #4F5129",
+"[@	c #555926",
+"}@	c #4D5121",
+"|@	c #27291B",
+"1@	c #292A1C",
+"2@	c #383A20",
+"3@	c #595C25",
+"4@	c #616628",
+"5@	c #50532A",
+"6@	c #4B4E2E",
+"7@	c #585933",
+"8@	c #636638",
+"9@	c #6D723B",
+"0@	c #6F743E",
+"a@	c #747540",
+"b@	c #787B3D",
+"c@	c #818739",
+"d@	c #8D9739",
+"e@	c #99A13B",
+"f@	c #939B39",
+"g@	c #7D8335",
+"h@	c #61632C",
+"i@	c #61642A",
+"j@	c #5E6129",
+"k@	c #484B25",
+"l@	c #424621",
+"m@	c #515724",
+"n@	c #5D612D",
+"o@	c #5C5F31",
+"p@	c #656935",
+"q@	c #707535",
+"r@	c #7A8035",
+"s@	c #7E8436",
+"t@	c #7A7F38",
+"u@	c #757A39",
+"v@	c #7A803B",
+"w@	c #868D3A",
+"x@	c #8F953A",
+"y@	c #878F38",
+"z@	c #707633",
+"A@	c #676B2F",
+"B@	c #616629",
+"C@	c #696D2B",
+"D@	c #515427",
+"E@	c #4F522C",
+"F@	c #5F6432",
+"G@	c #6E7432",
+"H@	c #787D32",
+"I@	c #7D8433",
+"J@	c #838B35",
+"K@	c #858C36",
+"L@	c #808539",
+"M@	c #7C813A",
+"N@	c #737737",
+"O@	c #5B5E32",
+"P@	c #494C2E",
+"Q@	c #595D2D",
+"R@	c #6F752E",
+"S@	c #656A2B",
+"T@	c #3D401E",
+"U@	c #4E5028",
+"V@	c #5C602E",
+"W@	c #707531",
+"X@	c #828932",
+"Y@	c #848937",
+"Z@	c #717737",
+"`@	c #5B5E33",
+" #	c #4A4D30",
+".#	c #4F522D",
+"+#	c #797E33",
+"@#	c #8B943A",
+"##	c #4A477D",
+"$#	c #1E1C45",
+"%#	c #575A27",
+"&#	c #6B712E",
+"*#	c #6B7033",
+"=#	c #545531",
+"-#	c #53552D",
+";#	c #6E7332",
+">#	c #8E9538",
+",#	c #8E9839",
+"'#	c #3C309F",
+")#	c #1C0DC2",
+"!#	c #434527",
+"~#	c #4A4B2C",
+"{#	c #63662F",
+"]#	c #848C35",
+"^#	c #888F35",
+"/#	c #6E732E",
+"(#	c #312A7A",
+"_#	c #1B0DC2",
+":#	c #1A0FBB",
+"<#	c #140979",
+"[#	c #34361F",
+"}#	c #5F622B",
+"|#	c #7E8534",
+"1#	c #666A2E",
+"2#	c #3A3C22",
+"3#	c #272351",
+"4#	c #190CB5",
+"5#	c #190CB7",
+"6#	c #190EB3",
+"7#	c #140A7D",
+"8#	c #37381F",
+"9#	c #444623",
+"0#	c #363822",
+"a#	c #373823",
+"b#	c #535632",
+"c#	c #1D129C",
+"d#	c #180DAA",
+"e#	c #190CAD",
+"f#	c #180BA5",
+"g#	c #34351E",
+"h#	c #363721",
+"i#	c #585C2A",
+"j#	c #7C8332",
+"k#	c #535460",
+"l#	c #180F99",
+"m#	c #170C9F",
+"n#	c #180CA1",
+"o#	c #140B85",
+"p#	c #484D21",
+"q#	c #4A4B26",
+"r#	c #6B6F31",
+"s#	c #858B3A",
+"t#	c #3D3B6E",
+"u#	c #160C93",
+"v#	c #170D94",
+"w#	c #140A80",
+"x#	c #0F0956",
+"y#	c #4F5126",
+"z#	c #55562B",
+"A#	c #7A8036",
+"B#	c #7B803D",
+"C#	c #6F7242",
+"D#	c #2A2175",
+"E#	c #110A71",
+"F#	c #0E0950",
+"G#	c #5C602F",
+"H#	c #6F733E",
+"I#	c #6E723C",
+"J#	c #626444",
+"K#	c #282365",
+"L#	c #11095E",
+"M#	c #0D084C",
+"N#	c #555A2F",
+"O#	c #676A39",
+"P#	c #6F7239",
+"Q#	c #7B8039",
+"R#	c #545642",
+"S#	c #33333F",
+"T#	c #4F532B",
+"U#	c #707436",
+"V#	c #858B35",
+"W#	c #8B9635",
+"X#	c #808833",
+"Y#	c #55552A",
+"Z#	c #62662C",
+"`#	c #828830",
+" $	c #889134",
+".$	c #7D8336",
+"+$	c #5C6132",
+"@$	c #3D4027",
+"#$	c #6B722A",
+"$$	c #7D8332",
+"%$	c #707338",
+"&$	c #5A5D37",
+"*$	c #4A4E32",
+"=$	c #42471C",
+"-$	c #61652A",
+";$	c #5D5D32",
+">$	c #555435",
+",$	c #4D4F35",
+"'$	c #38392B",
+")$	c #3B3E21",
+"!$	c #474A2C",
+"~$	c #424332",
+"{$	c #343430",
+"]$	c #2C2C2C",
+"^$	c #2D3023",
+"/$	c #2D2C2C",
+"($	c #2F2F2F",
+"_$	c #2E2E2E",
+":$	c #282828",
+"<$	c #252525",
+"[$	c #2B2B2B",
+"}$	c #2D2D2D",
+"|$	c #242424",
+"1$	c #262626",
+"2$	c #292929",
+"3$	c #272727",
+"                                                                                                ",
+"                                                                                                ",
+"                                          .                                                     ",
+"                                          + @                                                   ",
+"                                          # $                                                   ",
+"                                          % & *                                                 ",
+"                                          = - ;                                                 ",
+"                                          > , '                                                 ",
+"                                  ) ! ~ { ] ^ /                                                 ",
+"                                ( _ : < [ } | 1 2                                               ",
+"                                3 4 5 6 7 8 9 0 a                                               ",
+"  b c d e f g h i j k l m n o p q r s t u v w x h y z A B C D E                                 ",
+"    F G H I J K L M N O P Q R S T U V V W X Y Z `  ...` +.@.#.$.                                ",
+"      %.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.                              ",
+"      8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.                            ",
+"        C.D.E.F.G.z.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+                          ",
+"        $+%+&+*+=+-+;+y.>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+                        ",
+"          8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+.+A+                        ",
+"            B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@                          ",
+"                  @@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@h+[@}@                          ",
+"                        |@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@                            ",
+"                              l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@                            ",
+"                                    E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@                            ",
+"                                          U@V@W@X@Y@Z@`@ #.#+#@###$#                            ",
+"                                                %#&#*#=#-#;#>#,#'#)#                            ",
+"                                                    !#~#{#]#^#/#(#_#:#<#                        ",
+"                                                      [#}#|#1#2#3#4#5#6#7#                      ",
+"                                                        8#9#0#a#b#c#d#e#f#                      ",
+"                                                          g#h#i#j#k#l#m#n#o#                    ",
+"                                                          p#q#r#K@s#t#u#v#w#x#                  ",
+"                                                            y#z#A#B#C#D#o#E#F#                  ",
+"                                                                G#H#I#J#K#L#M#                  ",
+"                                                                  N#O#P#Q#R#S#                  ",
+"                                                                    T#U#V#W#X#Y#                ",
+"                                                                      Z#`# $.$+$@$              ",
+"                                                                        #$$$%$&$*$              ",
+"                                                                        =$-$;$>$,$'$            ",
+"                                                                          )$!$~${$]$            ",
+"                                                                            ^$/$($_$:$          ",
+"                                                                              <$[$_$}$|$        ",
+"                                                                                1$[$}$2$        ",
+"                                                                                  <$[$[$        ",
+"                                                                                      3$1$      ",
+"                                                                                        |$      ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
--- gl-117-1.3.2.orig/src/Makefile.in
+++ gl-117-1.3.2/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -119,6 +119,9 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -173,7 +176,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -198,9 +201,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -297,9 +300,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)