Upgrade to 3.0.18:

October 21, 2000, Version 3.0.18
- Fixed file upload bugs (Sascha)

October 11, 2000, Version 3.0.17
- Fixed output functions (Sascha)
- Added odbc_tables() (Frank)
- Fixed htmlspecialchars/htmlentities inconsistencies (Rasmus)
- Added is_uploaded_file() (Zeev)
- Clean up htmlspecialchars/htmlentities inconsistencies (Rasmus)
- Add optional charset parameter to sybase_[p]connect (alf@alpha.ulatina.ac.cr)
- Fixed incorrect handling of 0-precision strings (e.g., %4.0s)
  in printf (Ken Coar)
- You can now call Ora_Error() without prameters to get the reason
  for a failed connection attempt. (Kirill Maximov)
- Fixed crash in OCIFetchStatement() when trying to read after
  all data has already been read. (Thies)
- Added --enable-sigchild. Use this option if you encounter
  <defunc> processes when using Oracle 8i. (Thies)
- Uncommitted outstanding OCI8 transactions are now rolled back
  before the connection is closed. (Thies)
- Improved configure checks for Oracle 8i. (Thies)
- Added imap_mime_header_decode() function (Skalski)

3 files changed, 3097 insertions, 21 deletions

diff --git a/www/php3/files/md5 b/www/php3/files/md5
index 0d780252827..a90135480d1 100644
--- a/www/php3/files/md5
+++ b/www/php3/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/04/12 17:51:58 jdolecek Exp $
+$NetBSD: md5,v 1.5 2001/01/06 08:32:44 explorer Exp $
 
-MD5 (php-3.0.16.tar.gz) = 0dc379181f625c30f635c2cf3080acb1
+MD5 (php-3.0.18.tar.gz) = b4b8f7f1151ce66d5f3910a066651133
diff --git a/www/php3/files/patch-sum b/www/php3/files/patch-sum
index 90371175d63..3821accdbc2 100644
--- a/www/php3/files/patch-sum
+++ b/www/php3/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/05/26 13:40:22 veego Exp $
+$NetBSD: patch-sum,v 1.9 2001/01/06 08:32:44 explorer Exp $
 
 MD5 (patch-aa) = e849aae28292122164993913671ed861
 MD5 (patch-ab) = 2ee86872739cacc964f53d3798859531
@@ -7,4 +7,4 @@ MD5 (patch-ad) = 07146ee00a03beb73025daa07c533059
 MD5 (patch-af) = 30bb3522e86d1178d0dda36913301ba1
 MD5 (patch-ag) = 31f5c4a4aea7e216e43af958775feeba
 MD5 (patch-ah) = 79fb39546a7c42e15cf833507fadf488
-MD5 (patch-ai) = f77042eeb21b0822732eb1a0d057f557
+MD5 (patch-ai) = 0cd3523e862d79da6ed8fbf3910b6641
diff --git a/www/php3/patches/patch-ai b/www/php3/patches/patch-ai
index 897722142f9..f528355a0b1 100644
--- a/www/php3/patches/patch-ai
+++ b/www/php3/patches/patch-ai
@@ -1,7 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
---- configure	Wed Apr  5 01:32:58 2000
-+++ configure	Fri May 26 15:26:58 2000
-@@ -1624,7 +1624,7 @@
+--- configure.old	Fri Oct 20 19:05:17 2000
++++ configure	Sat Jan  6 08:16:31 2001
+@@ -1626,7 +1626,7 @@
    ;;
    *)
    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
@@ -10,7 +9,7 @@ $NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
    for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -1651,9 +1651,9 @@
+@@ -1653,9 +1653,9 @@
  
  fi
  
@@ -23,15 +22,19 @@ $NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
  fi
  
  echo $ac_n "checking for gethostent""... $ac_c" 1>&6
-@@ -4373,6 +4373,7 @@
- fi
+@@ -4392,8 +4392,10 @@
  
  
-+LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
  
++LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
++
  echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6
- echo "configure:4379: checking for Apache module support via DSO through APXS" >&5
-@@ -4395,7 +4396,7 @@
+-echo "configure:4397: checking for Apache module support via DSO through APXS" >&5
++echo "configure:4399: checking for Apache module support via DSO through APXS" >&5
+ # Check whether --with-apxs or --without-apxs was given.
+ if test "${with_apxs+set}" = set; then
+   withval="$with_apxs"
+@@ -4413,7 +4415,7 @@
  	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
  		PHP_APXS_BROKEN=yes
  	fi
@@ -40,30 +43,564 @@ $NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
      STRONGHOLD=
      cat >> confdefs.h <<\EOF
  #define APACHE 1
-@@ -5005,17 +5006,17 @@
+@@ -4449,7 +4451,7 @@
+ abs_srcdir="`(cd $srcdir && pwd)`"
+ versioning="no"
+ echo $ac_n "checking whether to enable versioning""... $ac_c" 1>&6
+-echo "configure:4453: checking whether to enable versioning" >&5
++echo "configure:4455: checking whether to enable versioning" >&5
+ # Check whether --enable-versioning or --disable-versioning was given.
+ if test "${enable_versioning+set}" = set; then
+   enableval="$enable_versioning"
+@@ -4478,7 +4480,7 @@
+ if test "$BINNAME" != "libmodphp3-so.a"; then
+ if test "$BINNAME" != "libphp3.so"; then
+ echo $ac_n "checking for Apache module support""... $ac_c" 1>&6
+-echo "configure:4482: checking for Apache module support" >&5
++echo "configure:4484: checking for Apache module support" >&5
+ # Check whether --with-apache or --without-apache was given.
+ if test "${with_apache+set}" = set; then
+   withval="$with_apache"
+@@ -4648,7 +4650,7 @@
+ fi
+ 
+ echo $ac_n "checking whether to use bundled regex library""... $ac_c" 1>&6
+-echo "configure:4652: checking whether to use bundled regex library" >&5
++echo "configure:4654: checking whether to use bundled regex library" >&5
+ # Check whether --with-system-regex or --without-system-regex was given.
+ if test "${with_system_regex+set}" = set; then
+   withval="$with_system_regex"
+@@ -4740,7 +4742,7 @@
+ 
+ 
+   echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
+-echo "configure:4744: checking for gdbm_open in -lgdbm" >&5
++echo "configure:4746: checking for gdbm_open in -lgdbm" >&5
+ ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4748,7 +4750,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgdbm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4752 "configure"
++#line 4754 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4759,7 +4761,7 @@
+ gdbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4781,7 +4783,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6
+-echo "configure:4785: checking for dbm_open in -ldb" >&5
++echo "configure:4787: checking for dbm_open in -ldb" >&5
+ ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4789,7 +4791,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4793 "configure"
++#line 4795 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4800,7 +4802,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4822,7 +4824,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for dbm_open in -lc""... $ac_c" 1>&6
+-echo "configure:4826: checking for dbm_open in -lc" >&5
++echo "configure:4828: checking for dbm_open in -lc" >&5
+ ac_lib_var=`echo c'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4830,7 +4832,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4834 "configure"
++#line 4836 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4841,7 +4843,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4863,7 +4865,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
+-echo "configure:4867: checking for dbm_open in -ldbm" >&5
++echo "configure:4869: checking for dbm_open in -ldbm" >&5
+ ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4871,7 +4873,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldbm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4875 "configure"
++#line 4877 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4882,7 +4884,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4913,7 +4915,7 @@
+ fi
+ 
+   echo $ac_n "checking preferred dbm library""... $ac_c" 1>&6
+-echo "configure:4917: checking preferred dbm library" >&5
++echo "configure:4919: checking preferred dbm library" >&5
+   if test "a$DBM_TYPE" = a; then
+     echo "$ac_t""none found" 1>&6
+     echo "configure: warning: No dbm library found - using built-in flatfile support" 1>&2
+@@ -4927,17 +4929,17 @@
+ if test "$DBM_LIB" = "-lgdbm"; then
+ 	ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
+-echo "configure:4931: checking for gdbm.h" >&5
++echo "configure:4933: checking for gdbm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4936 "configure"
++#line 4938 "configure"
+ #include "confdefs.h"
+ #include <gdbm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4960,17 +4962,17 @@
+ 		echo "$ac_t"""Try /usr/local/include/gdbm.h"" 1>&6; 
+ 		ac_safe=`echo "/usr/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for /usr/local/include/gdbm.h""... $ac_c" 1>&6
+-echo "configure:4964: checking for /usr/local/include/gdbm.h" >&5
++echo "configure:4966: checking for /usr/local/include/gdbm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4969 "configure"
++#line 4971 "configure"
+ #include "confdefs.h"
+ #include </usr/local/include/gdbm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4993,17 +4995,17 @@
+ 			echo "$ac_t"""Try /opt/local/include/gdbm.h"" 1>&6;
+ 			ac_safe=`echo "/opt/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for /opt/local/include/gdbm.h""... $ac_c" 1>&6
+-echo "configure:4997: checking for /opt/local/include/gdbm.h" >&5
++echo "configure:4999: checking for /opt/local/include/gdbm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5002 "configure"
++#line 5004 "configure"
+ #include "confdefs.h"
+ #include </opt/local/include/gdbm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5023,20 +5025,20 @@
  else
    echo "$ac_t""no" 1>&6
  
 -								echo "$ac_t"""Try /usr/pkg/include/gdbm.h"" 1>&6;
 -				ac_safe=`echo "/usr/pkg/include/gdbm.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for /usr/pkg/include/gdbm.h""... $ac_c" 1>&6
--echo "configure:5012: checking for /usr/pkg/include/gdbm.h" >&5
+-echo "configure:5030: checking for /usr/pkg/include/gdbm.h" >&5
 +								echo "$ac_t"""Try ${PREFIX}/include/gdbm.h"" 1>&6;
 +				ac_safe=`echo "${PREFIX}/include/gdbm.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for ${PREFIX}/include/gdbm.h""... $ac_c" 1>&6
-+echo "configure:5012: checking for ${PREFIX}/include/gdbm.h" >&5
++echo "configure:5032: checking for ${PREFIX}/include/gdbm.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 5017 "configure"
+-#line 5035 "configure"
++#line 5037 "configure"
  #include "confdefs.h"
 -#include </usr/pkg/include/gdbm.h>
 +#include <${PREFIX}/include/gdbm.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6108,14 +6109,14 @@
+-{ (eval echo configure:5040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5078,7 +5080,7 @@
+ fi
+ 
+ echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6
+-echo "configure:5082: checking for mod_charset compatibility option" >&5
++echo "configure:5084: checking for mod_charset compatibility option" >&5
+ # Check whether --with-mod_charset or --without-mod_charset was given.
+ if test "${with_mod_charset+set}" = set; then
+   withval="$with_mod_charset"
+@@ -5101,7 +5103,7 @@
+ 
+ 
+ echo $ac_n "checking for fhttpd module support""... $ac_c" 1>&6
+-echo "configure:5105: checking for fhttpd module support" >&5
++echo "configure:5107: checking for fhttpd module support" >&5
+ # Check whether --with-fhttpd or --without-fhttpd was given.
+ if test "${with_fhttpd+set}" = set; then
+   withval="$with_fhttpd"
+@@ -5141,7 +5143,7 @@
+ 
+ 
+ echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
+-echo "configure:5145: checking for IMAP support" >&5
++echo "configure:5147: checking for IMAP support" >&5
+ # Check whether --with-imap or --without-imap was given.
+ if test "${with_imap+set}" = set; then
+   withval="$with_imap"
+@@ -5346,7 +5348,7 @@
+ 
+ 
+ echo $ac_n "checking for IMSP support""... $ac_c" 1>&6
+-echo "configure:5350: checking for IMSP support" >&5
++echo "configure:5352: checking for IMSP support" >&5
+ # Check whether --with-imsp or --without-imsp was given.
+ if test "${with_imsp+set}" = set; then
+   withval="$with_imsp"
+@@ -5463,7 +5465,7 @@
+ 
+ 
+ echo $ac_n "checking for ASPELL support""... $ac_c" 1>&6
+-echo "configure:5467: checking for ASPELL support" >&5
++echo "configure:5469: checking for ASPELL support" >&5
+ # Check whether --with-aspell or --without-aspell was given.
+ if test "${with_aspell+set}" = set; then
+   withval="$with_aspell"
+@@ -5557,7 +5559,7 @@
+ 
+ 
+ echo $ac_n "checking for MCAL support""... $ac_c" 1>&6
+-echo "configure:5561: checking for MCAL support" >&5
++echo "configure:5563: checking for MCAL support" >&5
+ # Check whether --with-mcal or --without-mcal was given.
+ if test "${with_mcal+set}" = set; then
+   withval="$with_mcal"
+@@ -5647,7 +5649,7 @@
+ 
+ 
+ echo $ac_n "checking for ftp support""... $ac_c" 1>&6
+-echo "configure:5651: checking for ftp support" >&5
++echo "configure:5653: checking for ftp support" >&5
+ # Check whether --with-ftp or --without-ftp was given.
+ if test "${with_ftp+set}" = set; then
+   withval="$with_ftp"
+@@ -5676,13 +5678,13 @@
+   case "$withval" in
+     no)
+       echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:5680: checking whether to include GD support" >&5
++echo "configure:5682: checking whether to include GD support" >&5
+       echo "$ac_t""no" 1>&6
+       ;;
+     yes)
+             old_LIBS=$LIBS
+       echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
+-echo "configure:5686: checking for compress in -lz" >&5
++echo "configure:5688: checking for compress in -lz" >&5
+ ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5690,7 +5692,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5694 "configure"
++#line 5696 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5701,7 +5703,7 @@
+ compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5722,7 +5724,7 @@
+ fi
+ 
+       echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+-echo "configure:5726: checking for png_info_init in -lpng" >&5
++echo "configure:5728: checking for png_info_init in -lpng" >&5
+ ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5730,7 +5732,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5734 "configure"
++#line 5736 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5741,7 +5743,7 @@
+ png_info_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5762,7 +5764,7 @@
+ fi
+ 
+       echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
+-echo "configure:5766: checking for gdImageCreateFromPng in -lgd" >&5
++echo "configure:5768: checking for gdImageCreateFromPng in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5770,7 +5772,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5774 "configure"
++#line 5776 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5781,7 +5783,7 @@
+ gdImageCreateFromPng()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5834,7 +5836,7 @@
+ 
+       old_LIBS=$LIBS
+       echo $ac_n "checking for libjpeg (needed by gd-1.8+)""... $ac_c" 1>&6
+-echo "configure:5838: checking for libjpeg (needed by gd-1.8+)" >&5
++echo "configure:5840: checking for libjpeg (needed by gd-1.8+)" >&5
+       # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
+ if test "${with_jpeg_dir+set}" = set; then
+   withval="$with_jpeg_dir"
+@@ -5845,7 +5847,7 @@
+         fi
+         LIBS="$LIBS -L$withval/lib -ljpeg"
+         echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+-echo "configure:5849: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:5851: checking for jpeg_read_header in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5853,7 +5855,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5857 "configure"
++#line 5859 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5864,7 +5866,7 @@
+ jpeg_read_header()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5894,7 +5896,7 @@
+  
+       withval=$old_withval
+       echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
+-echo "configure:5898: checking for gdImageCreateFromJpeg in -lgd" >&5
++echo "configure:5900: checking for gdImageCreateFromJpeg in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5902,7 +5904,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5906 "configure"
++#line 5908 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5913,7 +5915,7 @@
+ gdImageCreateFromJpeg()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5953,7 +5955,7 @@
+       fi
+       
+       echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
+-echo "configure:5957: checking for gdImageCreateFromGif in -lgd" >&5
++echo "configure:5959: checking for gdImageCreateFromGif in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5961,7 +5963,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5965 "configure"
++#line 5967 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5972,7 +5974,7 @@
+ gdImageCreateFromGif()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5996,7 +5998,7 @@
+ fi
+ 
+       echo $ac_n "checking for gdImageLzw in -lgd""... $ac_c" 1>&6
+-echo "configure:6000: checking for gdImageLzw in -lgd" >&5
++echo "configure:6002: checking for gdImageLzw in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageLzw | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6004,7 +6006,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6008 "configure"
++#line 6010 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6015,7 +6017,7 @@
+ gdImageLzw()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6039,7 +6041,7 @@
+ fi
+ 
+       echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
+-echo "configure:6043: checking for gdImageColorResolve in -lgd" >&5
++echo "configure:6045: checking for gdImageColorResolve in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6047,7 +6049,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6051 "configure"
++#line 6053 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6058,7 +6060,7 @@
+ gdImageColorResolve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6082,7 +6084,7 @@
+ fi
+ 
+       echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
+-echo "configure:6086: checking for gdImageString16 in -lgd" >&5
++echo "configure:6088: checking for gdImageString16 in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6090,7 +6092,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6094 "configure"
++#line 6096 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6101,7 +6103,7 @@
+ gdImageString16()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6126,14 +6128,14 @@
  fi
  
        
@@ -83,7 +620,493 @@ $NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
    fi
  
      
-@@ -7076,14 +7077,14 @@
+@@ -6151,7 +6153,7 @@
+       fi
+ 
+       echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:6155: checking whether to include GD support" >&5
++echo "configure:6157: checking whether to include GD support" >&5
+       if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" && 
+          test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
+         echo "$ac_t""no" 1>&6
+@@ -6274,7 +6276,7 @@
+         
+                 old_LIBS=$LIBS
+         echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
+-echo "configure:6278: checking for compress in -lz" >&5
++echo "configure:6280: checking for compress in -lz" >&5
+ ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6282,7 +6284,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6286 "configure"
++#line 6288 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6293,7 +6295,7 @@
+ compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6314,7 +6316,7 @@
+ fi
+ 
+         echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+-echo "configure:6318: checking for png_info_init in -lpng" >&5
++echo "configure:6320: checking for png_info_init in -lpng" >&5
+ ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6322,7 +6324,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6326 "configure"
++#line 6328 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6333,7 +6335,7 @@
+ png_info_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6354,7 +6356,7 @@
+ fi
+ 
+         echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
+-echo "configure:6358: checking for gdImageCreateFromPng in -lgd" >&5
++echo "configure:6360: checking for gdImageCreateFromPng in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6362,7 +6364,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6366 "configure"
++#line 6368 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6373,7 +6375,7 @@
+ gdImageCreateFromPng()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6397,7 +6399,7 @@
+ fi
+ 
+         echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
+-echo "configure:6401: checking for gdImageCreateFromJpeg in -lgd" >&5
++echo "configure:6403: checking for gdImageCreateFromJpeg in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6405,7 +6407,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6409 "configure"
++#line 6411 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6416,7 +6418,7 @@
+ gdImageCreateFromJpeg()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6468,7 +6470,7 @@
+         fi
+         
+         echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
+-echo "configure:6472: checking for gdImageCreateFromGif in -lgd" >&5
++echo "configure:6474: checking for gdImageCreateFromGif in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6476,7 +6478,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6480 "configure"
++#line 6482 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6487,7 +6489,7 @@
+ gdImageCreateFromGif()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6511,7 +6513,7 @@
+ fi
+ 
+         echo $ac_n "checking for gdImageLzw in -lgd""... $ac_c" 1>&6
+-echo "configure:6515: checking for gdImageLzw in -lgd" >&5
++echo "configure:6517: checking for gdImageLzw in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageLzw | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6519,7 +6521,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6523 "configure"
++#line 6525 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6530,7 +6532,7 @@
+ gdImageLzw()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6554,7 +6556,7 @@
+ fi
+ 
+         echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
+-echo "configure:6558: checking for gdImageColorResolve in -lgd" >&5
++echo "configure:6560: checking for gdImageColorResolve in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6562,7 +6564,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6566 "configure"
++#line 6568 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6573,7 +6575,7 @@
+ gdImageColorResolve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6597,7 +6599,7 @@
+ fi
+ 
+         echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
+-echo "configure:6601: checking for gdImageString16 in -lgd" >&5
++echo "configure:6603: checking for gdImageString16 in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6605,7 +6607,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6609 "configure"
++#line 6611 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6616,7 +6618,7 @@
+ gdImageString16()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6644,7 +6646,7 @@
+         LDFLAGS=$old_LDFLAGS;
+ 
+         echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:6648: checking whether to include GD support" >&5
++echo "configure:6650: checking whether to include GD support" >&5
+         if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" &&
+            test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
+           echo "$ac_t""no" 1>&6
+@@ -6658,7 +6660,7 @@
+         fi
+       else
+         echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:6662: checking whether to include GD support" >&5
++echo "configure:6664: checking whether to include GD support" >&5
+         echo "$ac_t""no" 1>&6
+       fi
+       ;;
+@@ -6667,7 +6669,7 @@
+ else
+   
+   echo $ac_n "checking for gdImageLine in -lgd""... $ac_c" 1>&6
+-echo "configure:6671: checking for gdImageLine in -lgd" >&5
++echo "configure:6673: checking for gdImageLine in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageLine | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6675,7 +6677,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6679 "configure"
++#line 6681 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6686,7 +6688,7 @@
+ gdImageLine()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6727,7 +6729,7 @@
+   if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
+         old_LIBS=$LIBS
+     echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
+-echo "configure:6731: checking for compress in -lz" >&5
++echo "configure:6733: checking for compress in -lz" >&5
+ ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6735,7 +6737,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6739 "configure"
++#line 6741 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6746,7 +6748,7 @@
+ compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6767,7 +6769,7 @@
+ fi
+ 
+     echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+-echo "configure:6771: checking for png_info_init in -lpng" >&5
++echo "configure:6773: checking for png_info_init in -lpng" >&5
+ ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6775,7 +6777,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6779 "configure"
++#line 6781 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6786,7 +6788,7 @@
+ png_info_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6807,7 +6809,7 @@
+ fi
+ 
+     echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
+-echo "configure:6811: checking for gdImageCreateFromPng in -lgd" >&5
++echo "configure:6813: checking for gdImageCreateFromPng in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6815,7 +6817,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6819 "configure"
++#line 6821 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6826,7 +6828,7 @@
+ gdImageCreateFromPng()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6850,7 +6852,7 @@
+ fi
+ 
+     echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
+-echo "configure:6854: checking for gdImageCreateFromJpeg in -lgd" >&5
++echo "configure:6856: checking for gdImageCreateFromJpeg in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6858,7 +6860,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6862 "configure"
++#line 6864 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6869,7 +6871,7 @@
+ gdImageCreateFromJpeg()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6921,7 +6923,7 @@
+     fi
+       
+     echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
+-echo "configure:6925: checking for gdImageCreateFromGif in -lgd" >&5
++echo "configure:6927: checking for gdImageCreateFromGif in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6929,7 +6931,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6933 "configure"
++#line 6935 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6940,7 +6942,7 @@
+ gdImageCreateFromGif()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6964,7 +6966,7 @@
+ fi
+ 
+     echo $ac_n "checking for gdImageLzw in -lgd""... $ac_c" 1>&6
+-echo "configure:6968: checking for gdImageLzw in -lgd" >&5
++echo "configure:6970: checking for gdImageLzw in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageLzw | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6972,7 +6974,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6976 "configure"
++#line 6978 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6983,7 +6985,7 @@
+ gdImageLzw()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7007,7 +7009,7 @@
+ fi
+ 
+     echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
+-echo "configure:7011: checking for gdImageColorResolve in -lgd" >&5
++echo "configure:7013: checking for gdImageColorResolve in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7015,7 +7017,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7019 "configure"
++#line 7021 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7026,7 +7028,7 @@
+ gdImageColorResolve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7050,7 +7052,7 @@
+ fi
+ 
+     echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
+-echo "configure:7054: checking for gdImageString16 in -lgd" >&5
++echo "configure:7056: checking for gdImageString16 in -lgd" >&5
+ ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7058,7 +7060,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7062 "configure"
++#line 7064 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7069,7 +7071,7 @@
+ gdImageString16()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7094,14 +7096,14 @@
  fi
  
      
@@ -103,3 +1126,2056 @@ $NetBSD: patch-ai,v 1.2 2000/09/03 13:41:08 wiz Exp $
    fi
  
      
+@@ -7119,7 +7121,7 @@
+     fi
+ 
+     echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:7123: checking whether to include GD support" >&5
++echo "configure:7125: checking whether to include GD support" >&5
+     if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" &&
+        test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
+       echo "$ac_t""no" 1>&6
+@@ -7133,7 +7135,7 @@
+     fi
+   else
+     echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6
+-echo "configure:7137: checking whether to include GD support" >&5
++echo "configure:7139: checking whether to include GD support" >&5
+     echo "$ac_t""no" 1>&6
+   fi
+ 
+@@ -7141,7 +7143,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include FreeType support""... $ac_c" 1>&6
+-echo "configure:7145: checking whether to include FreeType support" >&5
++echo "configure:7147: checking whether to include FreeType support" >&5
+ # Check whether --with-ttf or --without-ttf was given.
+ if test "${with_ttf+set}" = set; then
+   withval="$with_ttf"
+@@ -7197,7 +7199,7 @@
+       LDFLAGS="$LDFLAGS -L$FREETYPE_PREFIX/$i"
+       unset ac_cv_lib_freetype_TT_Init_FreeType
+       echo $ac_n "checking for TT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
+-echo "configure:7201: checking for TT_Init_FreeType in -lfreetype" >&5
++echo "configure:7203: checking for TT_Init_FreeType in -lfreetype" >&5
+ ac_lib_var=`echo freetype'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7205,7 +7207,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lfreetype  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7209 "configure"
++#line 7211 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7216,7 +7218,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7317,7 +7319,7 @@
+       LDFLAGS="$LDFLAGS -L$TTF_PREFIX/$i"
+       unset ac_cv_lib_ttf_TT_Init_FreeType
+       echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:7321: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:7323: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7325,7 +7327,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lttf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7329 "configure"
++#line 7331 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7336,7 +7338,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7438,7 +7440,7 @@
+   
+   if test "$enableval" = "yes"; then
+     echo $ac_n "checking for T1_SetDefaultEncoding in -lt1""... $ac_c" 1>&6
+-echo "configure:7442: checking for T1_SetDefaultEncoding in -lt1" >&5
++echo "configure:7444: checking for T1_SetDefaultEncoding in -lt1" >&5
+ ac_lib_var=`echo t1'_'T1_SetDefaultEncoding | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7446,7 +7448,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lt1  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7450 "configure"
++#line 7452 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7457,7 +7459,7 @@
+ T1_SetDefaultEncoding()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7484,7 +7486,7 @@
+ fi
+ 
+     echo $ac_n "checking for T1_GetCharOutline in -lt1""... $ac_c" 1>&6
+-echo "configure:7488: checking for T1_GetCharOutline in -lt1" >&5
++echo "configure:7490: checking for T1_GetCharOutline in -lt1" >&5
+ ac_lib_var=`echo t1'_'T1_GetCharOutline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7492,7 +7494,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lt1  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7496 "configure"
++#line 7498 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7503,7 +7505,7 @@
+ T1_GetCharOutline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7530,7 +7532,7 @@
+ fi
+ 
+     echo $ac_n "checking for T1_GetExtend in -lt1""... $ac_c" 1>&6
+-echo "configure:7534: checking for T1_GetExtend in -lt1" >&5
++echo "configure:7536: checking for T1_GetExtend in -lt1" >&5
+ ac_lib_var=`echo t1'_'T1_GetExtend | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7538,7 +7540,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lt1  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7542 "configure"
++#line 7544 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7549,7 +7551,7 @@
+ T1_GetExtend()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7581,7 +7583,7 @@
+ 
+ 
+     echo $ac_n "checking whether to enable t1lib support""... $ac_c" 1>&6
+-echo "configure:7585: checking whether to enable t1lib support" >&5
++echo "configure:7587: checking whether to enable t1lib support" >&5
+     echo "$ac_t""yes" 1>&6
+   else
+     cat >> confdefs.h <<\EOF
+@@ -7589,7 +7591,7 @@
+ EOF
+ 
+     echo $ac_n "checking whether to enable t1lib support""... $ac_c" 1>&6
+-echo "configure:7593: checking whether to enable t1lib support" >&5
++echo "configure:7595: checking whether to enable t1lib support" >&5
+     echo "$ac_t""no" 1>&6
+   fi
+ 
+@@ -7600,14 +7602,14 @@
+ EOF
+ 
+   echo $ac_n "checking whether to enable t1lib support""... $ac_c" 1>&6
+-echo "configure:7604: checking whether to enable t1lib support" >&5
++echo "configure:7606: checking whether to enable t1lib support" >&5
+   echo "$ac_t""no" 1>&6
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether to include GNU gettext support""... $ac_c" 1>&6
+-echo "configure:7611: checking whether to include GNU gettext support" >&5
++echo "configure:7613: checking whether to include GNU gettext support" >&5
+ # Check whether --with-gettext or --without-gettext was given.
+ if test "${with_gettext+set}" = set; then
+   withval="$with_gettext"
+@@ -7680,7 +7682,7 @@
+ 	GETTEXT_LIBS=
+     echo "$ac_t""yes" 1>&6
+ 	echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:7684: checking for bindtextdomain in -lintl" >&5
++echo "configure:7686: checking for bindtextdomain in -lintl" >&5
+ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7688,7 +7690,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7692 "configure"
++#line 7694 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7699,7 +7701,7 @@
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7719,7 +7721,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+ 		echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
+-echo "configure:7723: checking for bindtextdomain in -lc" >&5
++echo "configure:7725: checking for bindtextdomain in -lc" >&5
+ ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7727,7 +7729,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7731 "configure"
++#line 7733 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7738,7 +7740,7 @@
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7794,7 +7796,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include ImageMagick support""... $ac_c" 1>&6
+-echo "configure:7798: checking whether to include ImageMagick support" >&5
++echo "configure:7800: checking whether to include ImageMagick support" >&5
+ # Check whether --with-imagick or --without-imagick was given.
+ if test "${with_imagick+set}" = set; then
+   withval="$with_imagick"
+@@ -7819,7 +7821,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:7823: checking for X" >&5
++echo "configure:7825: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -7881,12 +7883,12 @@
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 7885 "configure"
++#line 7887 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -7955,14 +7957,14 @@
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7959 "configure"
++#line 7961 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -8172,7 +8174,7 @@
+ 	CPPFLAGS="$CPPFLAGS -I${ac_x_includes}/X11"
+ 	LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
+ 	echo $ac_n "checking for bzBuffToBuffCompress in -lbz2""... $ac_c" 1>&6
+-echo "configure:8176: checking for bzBuffToBuffCompress in -lbz2" >&5
++echo "configure:8178: checking for bzBuffToBuffCompress in -lbz2" >&5
+ ac_lib_var=`echo bz2'_'bzBuffToBuffCompress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8180,7 +8182,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbz2  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8184 "configure"
++#line 8186 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8191,7 +8193,7 @@
+ bzBuffToBuffCompress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8223,7 +8225,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
+-echo "configure:8227: checking for XShapeCombineMask in -lXext" >&5
++echo "configure:8229: checking for XShapeCombineMask in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8231,7 +8233,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8235 "configure"
++#line 8237 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8242,7 +8244,7 @@
+ XShapeCombineMask()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8274,7 +8276,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for DPSInitialize in -ldps""... $ac_c" 1>&6
+-echo "configure:8278: checking for DPSInitialize in -ldps" >&5
++echo "configure:8280: checking for DPSInitialize in -ldps" >&5
+ ac_lib_var=`echo dps'_'DPSInitialize | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8282,7 +8284,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldps  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8286 "configure"
++#line 8288 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8293,7 +8295,7 @@
+ DPSInitialize()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8325,7 +8327,7 @@
+ fi
+  
+ 	echo $ac_n "checking for XDPSPixelsPerPoint in -ldpstk""... $ac_c" 1>&6
+-echo "configure:8329: checking for XDPSPixelsPerPoint in -ldpstk" >&5
++echo "configure:8331: checking for XDPSPixelsPerPoint in -ldpstk" >&5
+ ac_lib_var=`echo dpstk'_'XDPSPixelsPerPoint | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8333,7 +8335,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldpstk  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8337 "configure"
++#line 8339 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8344,7 +8346,7 @@
+ XDPSPixelsPerPoint()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8376,7 +8378,7 @@
+ fi
+ 
+     echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8380: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8382: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8384,7 +8386,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltiff  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8388 "configure"
++#line 8390 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8395,7 +8397,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8427,7 +8429,7 @@
+ fi
+ 
+     echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+-echo "configure:8431: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:8433: checking for jpeg_read_header in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8435,7 +8437,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8439 "configure"
++#line 8441 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8446,7 +8448,7 @@
+ jpeg_read_header()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8478,7 +8480,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
+-echo "configure:8482: checking for compress in -lz" >&5
++echo "configure:8484: checking for compress in -lz" >&5
+ ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8486,7 +8488,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8490 "configure"
++#line 8492 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8497,7 +8499,7 @@
+ compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8529,7 +8531,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for FPX_OpenImageByFilename in -lfpx""... $ac_c" 1>&6
+-echo "configure:8533: checking for FPX_OpenImageByFilename in -lfpx" >&5
++echo "configure:8535: checking for FPX_OpenImageByFilename in -lfpx" >&5
+ ac_lib_var=`echo fpx'_'FPX_OpenImageByFilename | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8537,7 +8539,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lfpx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8541 "configure"
++#line 8543 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8548,7 +8550,7 @@
+ FPX_OpenImageByFilename()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8580,7 +8582,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+-echo "configure:8584: checking for png_info_init in -lpng" >&5
++echo "configure:8586: checking for png_info_init in -lpng" >&5
+ ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8588,7 +8590,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8592 "configure"
++#line 8594 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8599,7 +8601,7 @@
+ png_info_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8631,7 +8633,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:8635: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:8637: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8639,7 +8641,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lttf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8643 "configure"
++#line 8645 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8650,7 +8652,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8682,7 +8684,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for DFANputlabel in -ldf""... $ac_c" 1>&6
+-echo "configure:8686: checking for DFANputlabel in -ldf" >&5
++echo "configure:8688: checking for DFANputlabel in -ldf" >&5
+ ac_lib_var=`echo df'_'DFANputlabel | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8690,7 +8692,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8694 "configure"
++#line 8696 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8701,7 +8703,7 @@
+ DFANputlabel()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8733,7 +8735,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for jbg_dec_init in -ljbig""... $ac_c" 1>&6
+-echo "configure:8737: checking for jbg_dec_init in -ljbig" >&5
++echo "configure:8739: checking for jbg_dec_init in -ljbig" >&5
+ ac_lib_var=`echo jbig'_'jbg_dec_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8741,7 +8743,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljbig  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8745 "configure"
++#line 8747 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8752,7 +8754,7 @@
+ jbg_dec_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8803,7 +8805,7 @@
+ 
+ 
+ echo $ac_n "checking for Oracle support""... $ac_c" 1>&6
+-echo "configure:8807: checking for Oracle support" >&5
++echo "configure:8809: checking for Oracle support" >&5
+ # Check whether --with-oracle or --without-oracle was given.
+ if test "${with_oracle+set}" = set; then
+   withval="$with_oracle"
+@@ -8847,7 +8849,7 @@
+     # Need to know the version, otherwhise we will mixup nlsrtl
+     
+   echo $ac_n "checking Oracle version""... $ac_c" 1>&6
+-echo "configure:8851: checking Oracle version" >&5
++echo "configure:8853: checking Oracle version" >&5
+   if test -f "$ORACLEINST_TOP/orainst/unix.rgs"
+   then
+ 	ORACLE_VERSION=`grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
+@@ -9017,7 +9019,7 @@
+ 
+ 
+ echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
+-echo "configure:9021: checking for iODBC support" >&5
++echo "configure:9023: checking for iODBC support" >&5
+ # Check whether --with-iodbc or --without-iodbc was given.
+ if test "${with_iodbc+set}" = set; then
+   withval="$with_iodbc"
+@@ -9055,7 +9057,7 @@
+ 
+ 
+ echo $ac_n "checking for OpenLink ODBC support""... $ac_c" 1>&6
+-echo "configure:9059: checking for OpenLink ODBC support" >&5
++echo "configure:9061: checking for OpenLink ODBC support" >&5
+ # Check whether --with-openlink or --without-openlink was given.
+ if test "${with_openlink+set}" = set; then
+   withval="$with_openlink"
+@@ -9093,7 +9095,7 @@
+ 
+ 
+ echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
+-echo "configure:9097: checking for Adabas support" >&5
++echo "configure:9099: checking for Adabas support" >&5
+ # Check whether --with-adabas or --without-adabas was given.
+ if test "${with_adabas+set}" = set; then
+   withval="$with_adabas"
+@@ -9130,7 +9132,7 @@
+ 
+ 
+ echo $ac_n "checking for Sybase support""... $ac_c" 1>&6
+-echo "configure:9134: checking for Sybase support" >&5
++echo "configure:9136: checking for Sybase support" >&5
+ # Check whether --with-sybase or --without-sybase was given.
+ if test "${with_sybase+set}" = set; then
+   withval="$with_sybase"
+@@ -9148,7 +9150,7 @@
+     SYBASE_LIBS=-lsybdb
+     echo "$ac_t""yes" 1>&6
+     echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:9152: checking for dnet_addr in -ldnet_stub" >&5
++echo "configure:9154: checking for dnet_addr in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9156,7 +9158,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9160 "configure"
++#line 9162 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9167,7 +9169,7 @@
+ dnet_addr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9211,7 +9213,7 @@
+ 
+ 
+ echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
+-echo "configure:9215: checking for Sybase-CT support" >&5
++echo "configure:9217: checking for Sybase-CT support" >&5
+ # Check whether --with-sybase-ct or --without-sybase-ct was given.
+ if test "${with_sybase_ct+set}" = set; then
+   withval="$with_sybase_ct"
+@@ -9235,7 +9237,7 @@
+     old_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
+     echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
+-echo "configure:9239: checking for netg_errstr in -ltcl" >&5
++echo "configure:9241: checking for netg_errstr in -ltcl" >&5
+ ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9243,7 +9245,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltcl  $SYBASE_CT_LIBS  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9247 "configure"
++#line 9249 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9254,7 +9256,7 @@
+ netg_errstr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9276,7 +9278,7 @@
+ fi
+ 
+     echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
+-echo "configure:9280: checking for insck__getVdate in -linsck" >&5
++echo "configure:9282: checking for insck__getVdate in -linsck" >&5
+ ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9284,7 +9286,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-linsck  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9288 "configure"
++#line 9290 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9295,7 +9297,7 @@
+ insck__getVdate()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9331,7 +9333,7 @@
+ 
+ 
+ echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
+-echo "configure:9335: checking for MySQL support" >&5
++echo "configure:9337: checking for MySQL support" >&5
+ # Check whether --with-mysql or --without-mysql was given.
+ if test "${with_mysql+set}" = set; then
+   withval="$with_mysql"
+@@ -9476,17 +9478,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:9480: checking for $ac_hdr" >&5
++echo "configure:9482: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9485 "configure"
++#line 9487 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -9525,7 +9527,7 @@
+ 
+ 
+ echo $ac_n "checking for mSQL support""... $ac_c" 1>&6
+-echo "configure:9529: checking for mSQL support" >&5
++echo "configure:9531: checking for mSQL support" >&5
+ # Check whether --with-msql or --without-msql was given.
+ if test "${with_msql+set}" = set; then
+   withval="$with_msql"
+@@ -9607,11 +9609,11 @@
+     echo "$ac_t""yes" 1>&6
+     
+   echo $ac_n "checking mSQL version""... $ac_c" 1>&6
+-echo "configure:9611: checking mSQL version" >&5
++echo "configure:9613: checking mSQL version" >&5
+   ac_php_oldcflags=$CFLAGS
+   CFLAGS="$INCLUDES $CFLAGS";
+   cat > conftest.$ac_ext <<EOF
+-#line 9615 "configure"
++#line 9617 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #define APIENTRY
+@@ -9620,7 +9622,7 @@
+ int i = IDX_TYPE
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+     cat >> confdefs.h <<\EOF
+@@ -9657,7 +9659,7 @@
+ 
+ 
+ echo $ac_n "checking for PostgresSQL support""... $ac_c" 1>&6
+-echo "configure:9661: checking for PostgresSQL support" >&5
++echo "configure:9663: checking for PostgresSQL support" >&5
+ # Check whether --with-pgsql or --without-pgsql was given.
+ if test "${with_pgsql+set}" = set; then
+   withval="$with_pgsql"
+@@ -9752,12 +9754,12 @@
+ 
+     echo "$ac_t""yes" 1>&6
+     echo $ac_n "checking for PQcmdTuples""... $ac_c" 1>&6
+-echo "configure:9756: checking for PQcmdTuples" >&5
++echo "configure:9758: checking for PQcmdTuples" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_PQcmdTuples'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9761 "configure"
++#line 9763 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char PQcmdTuples(); below.  */
+@@ -9780,7 +9782,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_PQcmdTuples=yes"
+ else
+@@ -9815,7 +9817,7 @@
+ 
+ 
+ echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
+-echo "configure:9819: checking for IBM DB2 support" >&5
++echo "configure:9821: checking for IBM DB2 support" >&5
+ # Check whether --with-ibm-db2 or --without-ibm-db2 was given.
+ if test "${with_ibm_db2+set}" = set; then
+   withval="$with_ibm_db2"
+@@ -9910,7 +9912,7 @@
+ 
+ 
+ echo $ac_n "checking for Solid support""... $ac_c" 1>&6
+-echo "configure:9914: checking for Solid support" >&5
++echo "configure:9916: checking for Solid support" >&5
+ # Check whether --with-solid or --without-solid was given.
+ if test "${with_solid+set}" = set; then
+   withval="$with_solid"
+@@ -9945,7 +9947,7 @@
+ if test "$SOLID_LIBDIR" != ""; then
+   
+   echo $ac_n "checking Solid library file""... $ac_c" 1>&6
+-echo "configure:9949: checking Solid library file" >&5
++echo "configure:9951: checking Solid library file" >&5
+   ac_solid_uname_s=`uname -s 2>/dev/null`
+   case $ac_solid_uname_s in
+     AIX) ac_solid_os=a3x;;
+@@ -9978,11 +9980,11 @@
+   echo "$ac_t""`echo $SOLID_LIBS | sed -e 's!.*/!!'`" 1>&6
+   
+   echo $ac_n "checking whether Solid needs pthreads""... $ac_c" 1>&6
+-echo "configure:9982: checking whether Solid needs pthreads" >&5
++echo "configure:9984: checking whether Solid needs pthreads" >&5
+   save_LIBS=$LIBS
+   LIBS="$SOLID_LIBS"
+   cat > conftest.$ac_ext <<EOF
+-#line 9986 "configure"
++#line 9988 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9993,7 +9995,7 @@
+ SQLAllocEnv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$save_LIBS"
+                     echo "$ac_t""no" 1>&6
+@@ -10013,7 +10015,7 @@
+ 
+ 
+ echo $ac_n "checking for Empress support""... $ac_c" 1>&6
+-echo "configure:10017: checking for Empress support" >&5
++echo "configure:10019: checking for Empress support" >&5
+ # Check whether --with-empress or --without-empress was given.
+ if test "${with_empress+set}" = set; then
+   withval="$with_empress"
+@@ -10048,7 +10050,7 @@
+ if test "$EMPRESS_LIBDIR" != ""; then
+   
+   echo $ac_n "checking Empress library file""... $ac_c" 1>&6
+-echo "configure:10052: checking Empress library file" >&5
++echo "configure:10054: checking Empress library file" >&5
+   EMPRESS_LIBS=`echo $EMPRESS_LIBDIR/empodbc.so | cut -d' ' -f1`
+   if test ! -f $EMPRESS_LIBS; then
+     EMPRESS_LIBS=`echo $EMPRESS_LIBDIR/empodbc.a | cut -d' ' -f1`
+@@ -10061,7 +10063,7 @@
+ 
+ 
+ echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
+-echo "configure:10065: checking for LDAP support" >&5
++echo "configure:10067: checking for LDAP support" >&5
+ # Check whether --with-ldap or --without-ldap was given.
+ if test "${with_ldap+set}" = set; then
+   withval="$with_ldap"
+@@ -10280,7 +10282,7 @@
+ 
+ 
+ echo $ac_n "checking for Cybercash MCK support""... $ac_c" 1>&6
+-echo "configure:10284: checking for Cybercash MCK support" >&5
++echo "configure:10286: checking for Cybercash MCK support" >&5
+ # Check whether --with-mck or --without-mck was given.
+ if test "${with_mck+set}" = set; then
+   withval="$with_mck"
+@@ -10392,7 +10394,7 @@
+ 
+ 
+ echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
+-echo "configure:10396: checking for SNMP support" >&5
++echo "configure:10398: checking for SNMP support" >&5
+ # Check whether --with-snmp or --without-snmp was given.
+ if test "${with_snmp+set}" = set; then
+   withval="$with_snmp"
+@@ -10508,17 +10510,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:10512: checking for $ac_hdr" >&5
++echo "configure:10514: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10517 "configure"
++#line 10519 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -10551,14 +10553,14 @@
+ 		
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10555 "configure"
++#line 10557 "configure"
+ #include "confdefs.h"
+ 
+ #include <ucd-snmp-config.h>
+ main() { exit(USE_OPENSSL != 1); }
+ 		
+ EOF
+-if { (eval echo configure:10562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   
+ 			SNMP_SSL=yes
+@@ -10587,7 +10589,7 @@
+   done
+ 
+   echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6
+-echo "configure:10591: checking for OpenSSL" >&5
++echo "configure:10593: checking for OpenSSL" >&5
+ 
+   if test -z "$OPENSSL_DIR"; then
+     { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
+@@ -10672,7 +10674,7 @@
+ 	CPPFLAGS="$old_CPPFLAGS"
+ 	
+ 	echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
+-echo "configure:10676: checking for kstat_read in -lkstat" >&5
++echo "configure:10678: checking for kstat_read in -lkstat" >&5
+ ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10680,7 +10682,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkstat  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10684 "configure"
++#line 10686 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -10691,7 +10693,7 @@
+ kstat_read()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -10743,7 +10745,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
+-echo "configure:10747: checking whether to enable UCD SNMP hack" >&5
++echo "configure:10749: checking whether to enable UCD SNMP hack" >&5
+ # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
+ if test "${enable_ucd_snmp_hack+set}" = set; then
+   enableval="$enable_ucd_snmp_hack"
+@@ -10767,7 +10769,7 @@
+ 
+ 
+ echo $ac_n "checking for Velocis support""... $ac_c" 1>&6
+-echo "configure:10771: checking for Velocis support" >&5
++echo "configure:10773: checking for Velocis support" >&5
+ # Check whether --with-velocis or --without-velocis was given.
+ if test "${with_velocis+set}" = set; then
+   withval="$with_velocis"
+@@ -10815,7 +10817,7 @@
+ 
+ 
+ echo $ac_n "checking for Informix support""... $ac_c" 1>&6
+-echo "configure:10819: checking for Informix support" >&5
++echo "configure:10821: checking for Informix support" >&5
+ # Check whether --with-informix or --without-informix was given.
+ if test "${with_informix+set}" = set; then
+   withval="$with_informix"
+@@ -10862,7 +10864,7 @@
+ EOF
+ 
+ 			echo $ac_n "checking Informix version""... $ac_c" 1>&6
+-echo "configure:10866: checking Informix version" >&5
++echo "configure:10868: checking Informix version" >&5
+ 			IFX_VERSION=`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`
+ 			if test $IFX_VERSION -ge "900"; then
+ 				cat >> confdefs.h <<\EOF
+@@ -10901,7 +10903,7 @@
+ 
+ 
+ echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
+-echo "configure:10905: checking for InterBase support" >&5
++echo "configure:10907: checking for InterBase support" >&5
+ # Check whether --with-interbase or --without-interbase was given.
+ if test "${with_interbase+set}" = set; then
+   withval="$with_interbase"
+@@ -10939,7 +10941,7 @@
+ 
+ 
+ echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
+-echo "configure:10943: checking for a custom ODBC support" >&5
++echo "configure:10945: checking for a custom ODBC support" >&5
+ # Check whether --with-custom-odbc or --without-custom-odbc was given.
+ if test "${with_custom_odbc+set}" = set; then
+   withval="$with_custom_odbc"
+@@ -10977,7 +10979,7 @@
+ 
+ 
+ echo $ac_n "checking for Hyperwave support""... $ac_c" 1>&6
+-echo "configure:10981: checking for Hyperwave support" >&5
++echo "configure:10983: checking for Hyperwave support" >&5
+ # Check whether --with-hyperwave or --without-hyperwave was given.
+ if test "${with_hyperwave+set}" = set; then
+   withval="$with_hyperwave"
+@@ -11008,7 +11010,7 @@
+ 
+ 
+ echo $ac_n "checking for XML support""... $ac_c" 1>&6
+-echo "configure:11012: checking for XML support" >&5
++echo "configure:11014: checking for XML support" >&5
+ # Check whether --with-xml or --without-xml was given.
+ if test "${with_xml+set}" = set; then
+   withval="$with_xml"
+@@ -11124,7 +11126,7 @@
+  
+ 
+ echo $ac_n "checking whether to include YP support""... $ac_c" 1>&6
+-echo "configure:11128: checking whether to include YP support" >&5
++echo "configure:11130: checking whether to include YP support" >&5
+ # Check whether --with-yp or --without-yp was given.
+ if test "${with_yp+set}" = set; then
+   withval="$with_yp"
+@@ -11160,7 +11162,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include zlib support""... $ac_c" 1>&6
+-echo "configure:11164: checking whether to include zlib support" >&5
++echo "configure:11166: checking whether to include zlib support" >&5
+ # Check whether --with-zlib or --without-zlib was given.
+ if test "${with_zlib+set}" = set; then
+   withval="$with_zlib"
+@@ -11171,7 +11173,7 @@
+     yes)
+       echo "$ac_t""yes" 1>&6
+       echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
+-echo "configure:11175: checking for gzgets in -lz" >&5
++echo "configure:11177: checking for gzgets in -lz" >&5
+ ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11179,7 +11181,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11183 "configure"
++#line 11185 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11190,7 +11192,7 @@
+ gzgets()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11222,7 +11224,7 @@
+         old_LIBS=$LIBS
+         LIBS="$LIBS -L$withval/lib"
+         echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
+-echo "configure:11226: checking for gzgets in -lz" >&5
++echo "configure:11228: checking for gzgets in -lz" >&5
+ ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11230,7 +11232,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11234 "configure"
++#line 11236 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11241,7 +11243,7 @@
+ gzgets()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11282,7 +11284,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include pdflib support""... $ac_c" 1>&6
+-echo "configure:11286: checking whether to include pdflib support" >&5
++echo "configure:11288: checking whether to include pdflib support" >&5
+ # Check whether --with-pdflib or --without-pdflib was given.
+ if test "${with_pdflib+set}" = set; then
+   withval="$with_pdflib"
+@@ -11299,7 +11301,7 @@
+       echo "configure: warning: file p_basic.c which closes the pdf file. Read the php3" 1>&2
+       echo "configure: warning: documentation for more information." 1>&2
+       echo $ac_n "checking for PDF_close in -lpdf""... $ac_c" 1>&6
+-echo "configure:11303: checking for PDF_close in -lpdf" >&5
++echo "configure:11305: checking for PDF_close in -lpdf" >&5
+ ac_lib_var=`echo pdf'_'PDF_close | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11307,7 +11309,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11311 "configure"
++#line 11313 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11318,7 +11320,7 @@
+ PDF_close()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11343,7 +11345,7 @@
+ fi
+ 
+       echo $ac_n "checking for PDF_new in -lpdf""... $ac_c" 1>&6
+-echo "configure:11347: checking for PDF_new in -lpdf" >&5
++echo "configure:11349: checking for PDF_new in -lpdf" >&5
+ ac_lib_var=`echo pdf'_'PDF_new | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11351,7 +11353,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11355 "configure"
++#line 11357 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11362,7 +11364,7 @@
+ PDF_new()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11399,7 +11401,7 @@
+         old_LIBS=$LIBS
+         LIBS="$LIBS -L$withval/lib"
+         echo $ac_n "checking for PDF_open in -lpdf""... $ac_c" 1>&6
+-echo "configure:11403: checking for PDF_open in -lpdf" >&5
++echo "configure:11405: checking for PDF_open in -lpdf" >&5
+ ac_lib_var=`echo pdf'_'PDF_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11407,7 +11409,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11411 "configure"
++#line 11413 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11418,7 +11420,7 @@
+ PDF_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11451,7 +11453,7 @@
+           old_withval=$withval
+           if test -z $ZLIB_LIBS; then
+           echo $ac_n "checking for zlib (needed by pdflib 2.0)""... $ac_c" 1>&6
+-echo "configure:11455: checking for zlib (needed by pdflib 2.0)" >&5
++echo "configure:11457: checking for zlib (needed by pdflib 2.0)" >&5
+           # Check whether --with-zlib-dir or --without-zlib-dir was given.
+ if test "${with_zlib_dir+set}" = set; then
+   withval="$with_zlib_dir"
+@@ -11462,7 +11464,7 @@
+             fi
+             LIBS="$LIBS -L$withval/lib -lz"
+             echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+-echo "configure:11466: checking for deflate in -lz" >&5
++echo "configure:11468: checking for deflate in -lz" >&5
+ ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11470,7 +11472,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11474 "configure"
++#line 11476 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11481,7 +11483,7 @@
+ deflate()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11517,7 +11519,7 @@
+           fi
+ 
+           echo $ac_n "checking for libjpeg (needed by pdflib 2.0)""... $ac_c" 1>&6
+-echo "configure:11521: checking for libjpeg (needed by pdflib 2.0)" >&5
++echo "configure:11523: checking for libjpeg (needed by pdflib 2.0)" >&5
+           # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
+ if test "${with_jpeg_dir+set}" = set; then
+   withval="$with_jpeg_dir"
+@@ -11528,7 +11530,7 @@
+             fi
+             LIBS="$LIBS -L$withval/lib -ljpeg"
+             echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+-echo "configure:11532: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:11534: checking for jpeg_read_header in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11536,7 +11538,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11540 "configure"
++#line 11542 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11547,7 +11549,7 @@
+ jpeg_read_header()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11579,7 +11581,7 @@
+           withval=$old_withval
+ 
+           echo $ac_n "checking for libtiff (needed by pdflib 2.0)""... $ac_c" 1>&6
+-echo "configure:11583: checking for libtiff (needed by pdflib 2.0)" >&5
++echo "configure:11585: checking for libtiff (needed by pdflib 2.0)" >&5
+           # Check whether --with-tiff-dir or --without-tiff-dir was given.
+ if test "${with_tiff_dir+set}" = set; then
+   withval="$with_tiff_dir"
+@@ -11590,7 +11592,7 @@
+             fi
+             LIBS="$LIBS -L$withval/lib -ltiff"
+             echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:11594: checking for TIFFOpen in -ltiff" >&5
++echo "configure:11596: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11598,7 +11600,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltiff  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11602 "configure"
++#line 11604 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11609,7 +11611,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11642,7 +11644,7 @@
+ 
+           LIBS="$LIBS -L$withval/lib"
+           echo $ac_n "checking for PDF_new in -lpdf""... $ac_c" 1>&6
+-echo "configure:11646: checking for PDF_new in -lpdf" >&5
++echo "configure:11648: checking for PDF_new in -lpdf" >&5
+ ac_lib_var=`echo pdf'_'PDF_new | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11650,7 +11652,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11654 "configure"
++#line 11656 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11661,7 +11663,7 @@
+ PDF_new()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11706,7 +11708,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include cpdflib support""... $ac_c" 1>&6
+-echo "configure:11710: checking whether to include cpdflib support" >&5
++echo "configure:11712: checking whether to include cpdflib support" >&5
+ # Check whether --with-cpdflib or --without-cpdflib was given.
+ if test "${with_cpdflib+set}" = set; then
+   withval="$with_cpdflib"
+@@ -11717,7 +11719,7 @@
+     yes)
+       echo "$ac_t""yes" 1>&6
+       echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6
+-echo "configure:11721: checking for cpdf_open in -lcpdf" >&5
++echo "configure:11723: checking for cpdf_open in -lcpdf" >&5
+ ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11725,7 +11727,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11729 "configure"
++#line 11731 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11736,7 +11738,7 @@
+ cpdf_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11767,7 +11769,7 @@
+         old_LIBS=$LIBS
+         LIBS="$LIBS -L$withval/lib"
+         echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6
+-echo "configure:11771: checking for cpdf_open in -lcpdf" >&5
++echo "configure:11773: checking for cpdf_open in -lcpdf" >&5
+ ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11775,7 +11777,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcpdf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11779 "configure"
++#line 11781 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11786,7 +11788,7 @@
+ cpdf_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11827,7 +11829,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include fdftk support""... $ac_c" 1>&6
+-echo "configure:11831: checking whether to include fdftk support" >&5
++echo "configure:11833: checking whether to include fdftk support" >&5
+ # Check whether --with-fdftk or --without-fdftk was given.
+ if test "${with_fdftk+set}" = set; then
+   withval="$with_fdftk"
+@@ -11838,7 +11840,7 @@
+     yes)
+       echo "$ac_t""yes" 1>&6
+       echo $ac_n "checking for FDFOpen in -lFdfTk""... $ac_c" 1>&6
+-echo "configure:11842: checking for FDFOpen in -lFdfTk" >&5
++echo "configure:11844: checking for FDFOpen in -lFdfTk" >&5
+ ac_lib_var=`echo FdfTk'_'FDFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11846,7 +11848,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lFdfTk  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11850 "configure"
++#line 11852 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11857,7 +11859,7 @@
+ FDFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11888,7 +11890,7 @@
+         old_LIBS=$LIBS
+         LIBS="$LIBS -L$withval/lib"
+         echo $ac_n "checking for FDFOpen in -lFdfTk""... $ac_c" 1>&6
+-echo "configure:11892: checking for FDFOpen in -lFdfTk" >&5
++echo "configure:11894: checking for FDFOpen in -lFdfTk" >&5
+ ac_lib_var=`echo FdfTk'_'FDFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11896,7 +11898,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lFdfTk  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11900 "configure"
++#line 11902 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11907,7 +11909,7 @@
+ FDFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11948,7 +11950,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include the bundled dbase library""... $ac_c" 1>&6
+-echo "configure:11952: checking whether to include the bundled dbase library" >&5
++echo "configure:11954: checking whether to include the bundled dbase library" >&5
+ # Check whether --with-dbase or --without-dbase was given.
+ if test "${with_dbase+set}" = set; then
+   withval="$with_dbase"
+@@ -11988,7 +11990,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include the bundled filePro support""... $ac_c" 1>&6
+-echo "configure:11992: checking whether to include the bundled filePro support" >&5
++echo "configure:11994: checking whether to include the bundled filePro support" >&5
+ # Check whether --with-filepro or --without-filepro was given.
+ if test "${with_filepro+set}" = set; then
+   withval="$with_filepro"
+@@ -12020,7 +12022,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable DAV support through mod_dav""... $ac_c" 1>&6
+-echo "configure:12024: checking whether to enable DAV support through mod_dav" >&5
++echo "configure:12026: checking whether to enable DAV support through mod_dav" >&5
+ # Check whether --with-mod-dav or --without-mod-dav was given.
+ if test "${with_mod_dav+set}" = set; then
+   withval="$with_mod_dav"
+@@ -12058,7 +12060,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable unified ODBC support""... $ac_c" 1>&6
+-echo "configure:12062: checking whether to enable unified ODBC support" >&5
++echo "configure:12064: checking whether to enable unified ODBC support" >&5
+ # Check whether --enable-unified-odbc or --disable-unified-odbc was given.
+ if test "${enable_unified_odbc+set}" = set; then
+   enableval="$enable_unified_odbc"
+@@ -12116,7 +12118,7 @@
+ 
+ 
+ echo $ac_n "checking whether to use a configuration file""... $ac_c" 1>&6
+-echo "configure:12120: checking whether to use a configuration file" >&5
++echo "configure:12122: checking whether to use a configuration file" >&5
+ # Check whether --with-config-file-path or --without-config-file-path was given.
+ if test "${with_config_file_path+set}" = set; then
+   withval="$with_config_file_path"
+@@ -12172,7 +12174,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
+-echo "configure:12176: checking whether to include debugging symbols" >&5
++echo "configure:12178: checking whether to include debugging symbols" >&5
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+@@ -12215,7 +12217,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
+-echo "configure:12219: checking whether to enable safe mode by default" >&5
++echo "configure:12221: checking whether to enable safe mode by default" >&5
+ # Check whether --enable-safe-mode or --disable-safe-mode was given.
+ if test "${enable_safe_mode+set}" = set; then
+   enableval="$enable_safe_mode"
+@@ -12247,7 +12249,7 @@
+ 
+ 
+ echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
+-echo "configure:12251: checking for safe mode exec dir" >&5
++echo "configure:12253: checking for safe mode exec dir" >&5
+ # Check whether --with-exec-dir or --without-exec-dir was given.
+ if test "${with_exec_dir+set}" = set; then
+   withval="$with_exec_dir"
+@@ -12287,7 +12289,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
+-echo "configure:12291: checking whether to enable PHP's own SIGCHLD handler" >&5
++echo "configure:12293: checking whether to enable PHP's own SIGCHLD handler" >&5
+ # Check whether --enable-sigchild or --disable-sigchild was given.
+ if test "${enable_sigchild+set}" = set; then
+   enableval="$enable_sigchild"
+@@ -12318,7 +12320,7 @@
+  
+ 
+ echo $ac_n "checking whether to enable track_vars variables by default""... $ac_c" 1>&6
+-echo "configure:12322: checking whether to enable track_vars variables by default" >&5
++echo "configure:12324: checking whether to enable track_vars variables by default" >&5
+ # Check whether --enable-track-vars or --disable-track-vars was given.
+ if test "${enable_track_vars+set}" = set; then
+   enableval="$enable_track_vars"
+@@ -12350,7 +12352,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
+-echo "configure:12354: checking whether to enable magic quotes by default" >&5
++echo "configure:12356: checking whether to enable magic quotes by default" >&5
+ # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
+ if test "${enable_magic_quotes+set}" = set; then
+   enableval="$enable_magic_quotes"
+@@ -12382,7 +12384,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable remote debugger support""... $ac_c" 1>&6
+-echo "configure:12386: checking whether to enable remote debugger support" >&5
++echo "configure:12388: checking whether to enable remote debugger support" >&5
+ # Check whether --enable-debugger or --disable-debugger was given.
+ if test "${enable_debugger+set}" = set; then
+   enableval="$enable_debugger"
+@@ -12415,7 +12417,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
+-echo "configure:12419: checking whether to enable bc style precision math functions" >&5
++echo "configure:12421: checking whether to enable bc style precision math functions" >&5
+ # Check whether --enable-bcmath or --disable-bcmath was given.
+ if test "${enable_bcmath+set}" = set; then
+   enableval="$enable_bcmath"
+@@ -12451,7 +12453,7 @@
+ 
+ if test "$BINNAME" = "php"; then
+ echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6
+-echo "configure:12455: checking whether to force Apache CGI redirect" >&5
++echo "configure:12457: checking whether to force Apache CGI redirect" >&5
+ # Check whether --enable-force-cgi-redirect or --disable-force-cgi-redirect was given.
+ if test "${enable_force_cgi_redirect+set}" = set; then
+   enableval="$enable_force_cgi_redirect"
+@@ -12485,7 +12487,7 @@
+  
+ 
+ echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6
+-echo "configure:12489: checking whether to discard path_info + path_translated" >&5
++echo "configure:12491: checking whether to discard path_info + path_translated" >&5
+ # Check whether --enable-discard_path or --disable-discard_path was given.
+ if test "${enable_discard_path+set}" = set; then
+   enableval="$enable_discard_path"
+@@ -12520,7 +12522,7 @@
+ fi
+ 
+ echo $ac_n "checking whether to enable a memory limit""... $ac_c" 1>&6
+-echo "configure:12524: checking whether to enable a memory limit" >&5
++echo "configure:12526: checking whether to enable a memory limit" >&5
+ # Check whether --enable-memory-limit or --disable-memory-limit was given.
+ if test "${enable_memory_limit+set}" = set; then
+   enableval="$enable_memory_limit"
+@@ -12551,7 +12553,7 @@
+  
+ 
+ echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
+-echo "configure:12555: checking whether to enable short tags by default" >&5
++echo "configure:12557: checking whether to enable short tags by default" >&5
+ # Check whether --enable-short-tags or --disable-short-tags was given.
+ if test "${enable_short_tags+set}" = set; then
+   enableval="$enable_short_tags"
+@@ -12582,7 +12584,7 @@
+  
+ 
+ echo $ac_n "checking whether to enable the URL-aware fopen wrapper""... $ac_c" 1>&6
+-echo "configure:12586: checking whether to enable the URL-aware fopen wrapper" >&5
++echo "configure:12588: checking whether to enable the URL-aware fopen wrapper" >&5
+ # Check whether --enable-url-fopen-wrapper or --disable-url-fopen-wrapper was given.
+ if test "${enable_url_fopen_wrapper+set}" = set; then
+   enableval="$enable_url_fopen_wrapper"
+@@ -12613,7 +12615,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
+-echo "configure:12617: checking whether to enable System V semaphore support" >&5
++echo "configure:12619: checking whether to enable System V semaphore support" >&5
+ # Check whether --enable-sysvsem or --disable-sysvsem was given.
+ if test "${enable_sysvsem+set}" = set; then
+   enableval="$enable_sysvsem"
+@@ -12625,12 +12627,12 @@
+ EOF
+ 
+     echo $ac_n "checking for union semun""... $ac_c" 1>&6
+-echo "configure:12629: checking for union semun" >&5
++echo "configure:12631: checking for union semun" >&5
+ if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12634 "configure"
++#line 12636 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -12641,7 +12643,7 @@
+ union semun x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+ 				php_cv_semun=yes
+@@ -12691,7 +12693,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
+-echo "configure:12695: checking whether to enable System V shared memory support" >&5
++echo "configure:12697: checking whether to enable System V shared memory support" >&5
+ # Check whether --enable-sysvshm or --disable-sysvshm was given.
+ if test "${enable_sysvshm+set}" = set; then
+   enableval="$enable_sysvshm"
+@@ -12722,7 +12724,7 @@
+  
+ 
+ echo $ac_n "checking whether to enable displaying source support""... $ac_c" 1>&6
+-echo "configure:12726: checking whether to enable displaying source support" >&5
++echo "configure:12728: checking whether to enable displaying source support" >&5
+ # Check whether --enable-display-source or --disable-display-source was given.
+ if test "${enable_display_source+set}" = set; then
+   enableval="$enable_display_source"
+@@ -12769,7 +12771,7 @@
+   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+   
+     echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
+-echo "configure:12773: checking for gdbm_open in -lgdbm" >&5
++echo "configure:12775: checking for gdbm_open in -lgdbm" >&5
+ ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -12777,7 +12779,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgdbm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12781 "configure"
++#line 12783 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -12788,7 +12790,7 @@
+ gdbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -12904,7 +12906,7 @@
+ fi
+ 
+ echo $ac_n "checking for GDBM support""... $ac_c" 1>&6
+-echo "configure:12908: checking for GDBM support" >&5
++echo "configure:12910: checking for GDBM support" >&5
+ 
+   if test "$THIS_RESULT" = "yes"; then
+     HAVE_DBA=1
+@@ -12943,7 +12945,7 @@
+   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+   
+       echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
+-echo "configure:12947: checking for dbm_open in -l$LIB" >&5
++echo "configure:12949: checking for dbm_open in -l$LIB" >&5
+ ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -12951,7 +12953,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l$LIB  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12955 "configure"
++#line 12957 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -12962,7 +12964,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -13079,7 +13081,7 @@
+ fi
+ 
+ echo $ac_n "checking for NDBM support""... $ac_c" 1>&6
+-echo "configure:13083: checking for NDBM support" >&5
++echo "configure:13085: checking for NDBM support" >&5
+ 
+   if test "$THIS_RESULT" = "yes"; then
+     HAVE_DBA=1
+@@ -13132,7 +13134,7 @@
+   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+   
+       echo $ac_n "checking for db_appinit in -l$LIB""... $ac_c" 1>&6
+-echo "configure:13136: checking for db_appinit in -l$LIB" >&5
++echo "configure:13138: checking for db_appinit in -l$LIB" >&5
+ ac_lib_var=`echo $LIB'_'db_appinit | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -13140,7 +13142,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l$LIB  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 13144 "configure"
++#line 13146 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -13151,7 +13153,7 @@
+ db_appinit()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -13268,7 +13270,7 @@
+ fi
+ 
+ echo $ac_n "checking for Berkeley DB2 support""... $ac_c" 1>&6
+-echo "configure:13272: checking for Berkeley DB2 support" >&5
++echo "configure:13274: checking for Berkeley DB2 support" >&5
+ 
+   if test "$THIS_RESULT" = "yes"; then
+     HAVE_DBA=1
+@@ -13296,7 +13298,7 @@
+   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+   
+       echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
+-echo "configure:13300: checking for dbminit in -l$LIB" >&5
++echo "configure:13302: checking for dbminit in -l$LIB" >&5
+ ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -13304,7 +13306,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l$LIB  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 13308 "configure"
++#line 13310 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -13315,7 +13317,7 @@
+ dbminit()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -13432,7 +13434,7 @@
+ fi
+ 
+ echo $ac_n "checking for DBM support""... $ac_c" 1>&6
+-echo "configure:13436: checking for DBM support" >&5
++echo "configure:13438: checking for DBM support" >&5
+ 
+   if test "$THIS_RESULT" = "yes"; then
+     HAVE_DBA=1
+@@ -13460,7 +13462,7 @@
+   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+   
+       echo $ac_n "checking for cdb_bread in -l$LIB""... $ac_c" 1>&6
+-echo "configure:13464: checking for cdb_bread in -l$LIB" >&5
++echo "configure:13466: checking for cdb_bread in -l$LIB" >&5
+ ac_lib_var=`echo $LIB'_'cdb_bread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -13468,7 +13470,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l$LIB  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 13472 "configure"
++#line 13474 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -13479,7 +13481,7 @@
+ cdb_bread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -13596,7 +13598,7 @@
+ fi
+ 
+ echo $ac_n "checking for CDB support""... $ac_c" 1>&6
+-echo "configure:13600: checking for CDB support" >&5
++echo "configure:13602: checking for CDB support" >&5
+ 
+   if test "$THIS_RESULT" = "yes"; then
+     HAVE_DBA=1
+@@ -13608,7 +13610,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
+-echo "configure:13612: checking whether to enable DBA interface" >&5
++echo "configure:13614: checking whether to enable DBA interface" >&5
+ if test "$HAVE_DBA" = "1"; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+@@ -13624,7 +13626,7 @@
+ fi
+ 
+ echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
+-echo "configure:13628: checking for mcrypt support" >&5
++echo "configure:13630: checking for mcrypt support" >&5
+ # Check whether --with-mcrypt or --without-mcrypt was given.
+ if test "${with_mcrypt+set}" = set; then
+   withval="$with_mcrypt"
+@@ -13719,7 +13721,7 @@
+ 
+ 
+ echo $ac_n "checking for mhash support""... $ac_c" 1>&6
+-echo "configure:13723: checking for mhash support" >&5
++echo "configure:13725: checking for mhash support" >&5
+ # Check whether --with-mhash or --without-mhash was given.
+ if test "${with_mhash+set}" = set; then
+   withval="$with_mhash"
+@@ -13814,7 +13816,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include PCRE support""... $ac_c" 1>&6
+-echo "configure:13818: checking whether to include PCRE support" >&5
++echo "configure:13820: checking whether to include PCRE support" >&5
+ # Check whether --with-pcre-regex or --without-pcre-regex was given.
+ if test "${with_pcre_regex+set}" = set; then
+   withval="$with_pcre_regex"
+@@ -13850,12 +13852,12 @@
+ 
+ 
+ echo $ac_n "checking for memmove""... $ac_c" 1>&6
+-echo "configure:13854: checking for memmove" >&5
++echo "configure:13856: checking for memmove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 13859 "configure"
++#line 13861 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char memmove(); below.  */
+@@ -13878,7 +13880,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_memmove=yes"
+ else
+@@ -13903,7 +13905,7 @@
+ 
+ 
+ echo $ac_n "checking whether to include POSIX support""... $ac_c" 1>&6
+-echo "configure:13907: checking whether to include POSIX support" >&5
++echo "configure:13909: checking whether to include POSIX support" >&5
+ # Check whether --with-posix or --without-posix was given.
+ if test "${with_posix+set}" = set; then
+   withval="$with_posix"
+@@ -13931,7 +13933,7 @@
+ 
+ RESULT=no
+ echo $ac_n "checking whether to include GNU recode support""... $ac_c" 1>&6
+-echo "configure:13935: checking whether to include GNU recode support" >&5
++echo "configure:13937: checking whether to include GNU recode support" >&5
+ # Check whether --with-recode or --without-recode was given.
+ if test "${with_recode+set}" = set; then
+   withval="$with_recode"
+@@ -13978,7 +13980,7 @@
+         LDFLAGS="$LDFLAGS -L$RECODE_DIR/lib"
+         LIBS="$LIBS -lrecode"
+         cat > conftest.$ac_ext <<EOF
+-#line 13982 "configure"
++#line 13984 "configure"
+ #include "confdefs.h"
+ 
+ char *program_name;
+@@ -13989,7 +13991,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -14054,7 +14056,7 @@
+ echo "$ac_t""$RESULT" 1>&6
+ 
+ echo $ac_n "checking whether to enable dmalloc support""... $ac_c" 1>&6
+-echo "configure:14058: checking whether to enable dmalloc support" >&5
++echo "configure:14060: checking whether to enable dmalloc support" >&5
+ # Check whether --enable-dmalloc or --disable-dmalloc was given.
+ if test "${enable_dmalloc+set}" = set; then
+   enableval="$enable_dmalloc"
+@@ -14077,7 +14079,7 @@
+ 
+ 
+ echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
+-echo "configure:14081: checking for __dn_skipname in -lbind" >&5
++echo "configure:14083: checking for __dn_skipname in -lbind" >&5
+ ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -14085,7 +14087,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbind  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 14089 "configure"
++#line 14091 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -14096,7 +14098,7 @@
+ __dn_skipname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else