Pullup revisions 1.58 and 1.59 to the 1.6 pkgsrc branch.

Requested by Thomas Klausner.

> Date: Mon, 19 Aug 2002 18:17:57 +0300 (EEST)
> From: Thomas Klausner <wiz@netbsd.org>
>
> Module Name:    pkgsrc
> Committed By:   wiz
> Date:           Mon Aug 19 15:17:56 UTC 2002
>
> Modified Files:
>         pkgsrc/security/openssl: Makefile
>
> Log Message:
> Compile no-shared on 1.4.x. This makes the package install and work for me
> on 1.4.2/i386. Approved by agc.

> Date: Mon, 19 Aug 2002 19:00:07 +0300 (EEST)
> From: Thomas Klausner <wiz@netbsd.org>
>
> Module Name:    pkgsrc
> Committed By:   wiz
> Date:           Mon Aug 19 16:00:07 UTC 2002
>
> Modified Files:
>         pkgsrc/security/openssl: Makefile
>
> Log Message:
> Fix a comment, and improve pattern to also work on netbsd-1-4.

6 files changed, 1810 insertions, 11 deletions

diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 39997d2bc1a..d39da665241 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2002/08/19 19:59:36 tron Exp $
+# $NetBSD: Makefile,v 1.23 2002/07/26 17:36:24 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=	1
+
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-zvt
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 7f0000b46d6..b947033e3ea 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:59:37 tron Exp $
+# $NetBSD: Makefile.common,v 1.1 2002/07/26 17:36:24 wiz Exp $
 
-DISTNAME=	xchat-1.8.10
+DISTNAME=	xchat-1.8.9
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -22,7 +22,6 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	ac_cv_lib_intl_bindtextdomain='yes'
 CONFIGURE_ENV+=	pythonpath=${PYTHONBIN}
 MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
-USE_GNU_GETTEXT=	YES
 BUILD_USES_MSGFMT=	YES
 
 BUILD_DEFS+=	USE_INET6 USE_SOCKS
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index 8eed49bcf12..9fb9472637c 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:59:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/16 14:59:38 tron Exp $
 bin/xchat
 bin/xchat-text
 share/doc/xchat/xchat-1.html
@@ -30,7 +30,6 @@ ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
@@ -41,8 +40,6 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
 @dirrm share/doc/xchat
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index f2c48a9ba8c..a49eed7142f 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.16 2002/08/19 19:59:38 tron Exp $
+$NetBSD: distinfo,v 1.15 2002/07/19 05:22:51 mycroft Exp $
 
-SHA1 (xchat-1.8.10.tar.bz2) = 10c85bd23faa58f2f962eec6a96364e9743ac91c
-Size (xchat-1.8.10.tar.bz2) = 824407 bytes
+SHA1 (xchat-1.8.9.tar.bz2) = feb8dab8dab8170586ff18caa09fe510ba0a4d46
+Size (xchat-1.8.9.tar.bz2) = 747762 bytes
+SHA1 (patch-aa) = 86bcdaf1ccd33d64fc44583eec39e192dfcba06d
+SHA1 (patch-ab) = 416a335b6e8d77a61fddabc823d77e3151dc359d
 SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
 SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7
 SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa
new file mode 100644
index 00000000000..3c7de209de3
--- /dev/null
+++ b/chat/xchat/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2002/06/06 11:25:53 manu Exp $
+
+--- configure.in.orig	Thu Jun  6 13:02:43 2002
++++ configure.in	Thu Jun  6 13:04:13 2002
+@@ -7,9 +7,9 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_CPP
+ 
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pl pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5"
++ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ AM_GNU_GETTEXT
+ 
+ AC_PATH_PROG(sedpath, sed)
+ if test "_$sedpath" = _; then
diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab
new file mode 100644
index 00000000000..01b5bd58995
--- /dev/null
+++ b/chat/xchat/patches/patch-ab
@@ -0,0 +1,1784 @@
+$NetBSD: patch-ab,v 1.6 2002/06/06 11:25:53 manu Exp $
+
+--- configure.orig	Sat Apr 27 06:57:11 2002
++++ configure	Thu Jun  6 13:14:57 2002
+@@ -1191,9 +1191,9 @@
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ 
+-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5"
++ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN"
+ 
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+@@ -1781,9 +1781,9 @@
+ EOF
+ 
+ fi
+ 
+-for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
++for ac_hdr in unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1790: checking for $ac_hdr" >&5
+@@ -1913,26 +1913,13 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
+-
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-
+ /* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
++# ifdef HAVE_UNISTD_H
++#  include <unistd.h>
++# endif
+ 
+ /* Assume that all systems that can run configure have sys/param.h.  */
+ # ifndef HAVE_SYS_PARAM_H
+ #  define HAVE_SYS_PARAM_H 1
+@@ -2038,9 +2025,9 @@
+ 	exit(0);
+ }
+ 
+ EOF
+-if { (eval echo configure:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2062,14 +2049,14 @@
+ fi
+ 
+ 
+     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+-echo "configure:2067: checking whether we are using the GNU C Library 2.1 or newer" >&5
++echo "configure:2054: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2072 "configure"
++#line 2059 "configure"
+ #include "confdefs.h"
+ 
+ #include <features.h>
+ #ifdef __GNU_LIBRARY__
+@@ -2103,19 +2090,19 @@
+ stdlib.h string.h unistd.h sys/param.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2108: checking for $ac_hdr" >&5
++echo "configure:2095: 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 2113 "configure"
++#line 2100 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2105: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -2144,14 +2131,14 @@
+ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+ strdup strtoul tsearch __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2149: checking for $ac_func" >&5
++echo "configure:2136: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2154 "configure"
++#line 2141 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -2172,9 +2159,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -2212,17 +2199,17 @@
+ fi
+ 
+ 
+   echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:2217: checking for iconv" >&5
++echo "configure:2204: checking for iconv" >&5
+ if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_cv_lib_iconv=no
+     cat > conftest.$ac_ext <<EOF
+-#line 2225 "configure"
++#line 2212 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+ int main() {
+@@ -2230,9 +2217,9 @@
+        iconv(cd,NULL,NULL,NULL,NULL);
+        iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_func_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2242,9 +2229,9 @@
+     if test "$am_cv_func_iconv" != yes; then
+       am_save_LIBS="$LIBS"
+       LIBS="$LIBS -liconv"
+       cat > conftest.$ac_ext <<EOF
+-#line 2247 "configure"
++#line 2234 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+ int main() {
+@@ -2252,9 +2239,9 @@
+          iconv(cd,NULL,NULL,NULL,NULL);
+          iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_lib_iconv=yes
+         am_cv_func_iconv=yes
+ else
+@@ -2273,15 +2260,15 @@
+ #define HAVE_ICONV 1
+ EOF
+ 
+     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+-echo "configure:2278: checking for iconv declaration" >&5
++echo "configure:2265: checking for iconv declaration" >&5
+     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+       cat > conftest.$ac_ext <<EOF
+-#line 2284 "configure"
++#line 2271 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -2298,9 +2285,9 @@
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_proto_iconv_arg1=""
+ else
+   echo "configure: failed program was:" >&5
+@@ -2327,21 +2314,21 @@
+   
+ 
+    
+   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+-echo "configure:2332: checking for nl_langinfo and CODESET" >&5
++echo "configure:2319: checking for nl_langinfo and CODESET" >&5
+ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2337 "configure"
++#line 2324 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int main() {
+ char* cs = nl_langinfo(CODESET);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_langinfo_codeset=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2362,21 +2349,21 @@
+   fi
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:2367: checking for LC_MESSAGES" >&5
++echo "configure:2354: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2372 "configure"
++#line 2359 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2395,9 +2382,9 @@
+ 
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:2400: checking whether NLS is requested" >&5
++echo "configure:2387: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+   USE_NLS=$enableval
+@@ -2417,9 +2404,9 @@
+ #define ENABLE_NLS 1
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:2422: checking whether included gettext is requested" >&5
++echo "configure:2409: checking whether included gettext is requested" >&5
+       # Check whether --with-included-gettext or --without-included-gettext was given.
+ if test "${with_included_gettext+set}" = set; then
+   withval="$with_included_gettext"
+   nls_cv_force_use_gnu_gettext=$withval
+@@ -2437,19 +2424,19 @@
+         
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:2442: checking for libintl.h" >&5
++echo "configure:2429: checking for libintl.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 2447 "configure"
++#line 2434 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2439: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -2464,23 +2451,23 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+-echo "configure:2469: checking for GNU gettext in libc" >&5
++echo "configure:2456: checking for GNU gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2474 "configure"
++#line 2461 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+ int main() {
+ bindtextdomain ("", "");
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libc=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2494,25 +2481,25 @@
+ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
+ 
+ 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+ 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+-echo "configure:2499: checking for GNU gettext in libintl" >&5
++echo "configure:2486: checking for GNU gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   gt_save_LIBS="$LIBS"
+ 		LIBS="$LIBS -lintl $LIBICONV"
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2506 "configure"
++#line 2493 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+ int main() {
+ bindtextdomain ("", "");
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libintl=yes
+ else
+   echo "configure: failed program was:" >&5
+@@ -2543,14 +2530,14 @@
+ 	     LIBS="$LIBS $INTLLIBS"
+ 	     for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2548: checking for $ac_func" >&5
++echo "configure:2535: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2553 "configure"
++#line 2540 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -2571,9 +2558,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -2600,9 +2587,9 @@
+ 
+ 	     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2605: checking for $ac_word" >&5
++echo "configure:2592: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MSGFMT" in
+@@ -2634,9 +2621,9 @@
+ 	     if test "$MSGFMT" != "no"; then
+ 	       # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2639: checking for $ac_word" >&5
++echo "configure:2626: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GMSGFMT" in
+@@ -2672,9 +2659,9 @@
+ 
+ 	     # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2677: checking for $ac_word" >&5
++echo "configure:2664: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$XGETTEXT" in
+@@ -2722,9 +2709,9 @@
+                 INTLOBJS="\$(GETTOBJS)"
+         # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2727: checking for $ac_word" >&5
++echo "configure:2714: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MSGFMT" in
+@@ -2756,9 +2743,9 @@
+ 
+         # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2761: checking for $ac_word" >&5
++echo "configure:2748: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GMSGFMT" in
+@@ -2792,9 +2779,9 @@
+ 
+         # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2797: checking for $ac_word" >&5
++echo "configure:2784: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$XGETTEXT" in
+@@ -2854,9 +2841,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2859: checking for $ac_word" >&5
++echo "configure:2846: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$INTLBISON"; then
+@@ -2887,9 +2874,9 @@
+     if test -z "$INTLBISON"; then
+       ac_verc_fail=yes
+     else
+             echo $ac_n "checking version of bison""... $ac_c" 1>&6
+-echo "configure:2892: checking version of bison" >&5
++echo "configure:2879: checking version of bison" >&5
+       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+       case $ac_prog_version in
+         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+@@ -2934,9 +2921,9 @@
+      if test "x$ALL_LINGUAS" = "x"; then
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:2939: checking for catalogs to be installed" >&5
++echo "configure:2926: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for presentlang in $ALL_LINGUAS; do
+          useit=no
+          for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+@@ -2977,9 +2964,9 @@
+ 
+ # Extract the first word of "sed", so it can be a program name with args.
+ set dummy sed; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2982: checking for $ac_word" >&5
++echo "configure:2969: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$sedpath" in
+@@ -3016,9 +3003,9 @@
+ 
+ # Extract the first word of "uname", so it can be a program name with args.
+ set dummy uname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3021: checking for $ac_word" >&5
++echo "configure:3008: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_unamepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$unamepath" in
+@@ -3052,9 +3039,9 @@
+ if test "_$unamepath" = _; then
+ 	system="unknown"
+ else
+ 	echo $ac_n "checking system type""... $ac_c" 1>&6
+-echo "configure:3057: checking system type" >&5
++echo "configure:3044: checking system type" >&5
+ 	system=`$unamepath -s`
+ 	echo "$ac_t""$system" 1>&6
+ 	if test "$system" = "Linux"; then
+ 		cat >> confdefs.h <<\EOF
+@@ -3262,17 +3249,17 @@
+ if test "$glib" = no; then
+ 	glibreplace=yes
+ 	gtkfe=no
+ 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3267: checking for dlopen in -ldl" >&5
++echo "configure:3254: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3275 "configure"
++#line 3262 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -3281,9 +3268,9 @@
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3273: \"$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
+   echo "configure: failed program was:" >&5
+@@ -3367,9 +3354,9 @@
+ 
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3372: checking for $ac_word" >&5
++echo "configure:3359: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GLIB_CONFIG" in
+@@ -3402,9 +3389,9 @@
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:3407: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:3394: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+@@ -3425,9 +3412,9 @@
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3430 "configure"
++#line 3417 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+@@ -3501,9 +3488,9 @@
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:3506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3521,17 +3508,17 @@
+   if test "x$no_glib" = x ; then
+      echo "$ac_t""yes" 1>&6
+      
+ 		echo $ac_n "checking for Glib compile flags""... $ac_c" 1>&6
+-echo "configure:3526: checking for Glib compile flags" >&5
++echo "configure:3513: checking for Glib compile flags" >&5
+ 		GLIB_CFLAGS=`$GLIB_CONFIG --cflags`
+ 		GLIB_LIBS=`$GLIB_CONFIG gmodule --libs`
+ 		CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ 		LIBS="$LIBS $GLIB_LIBS"
+ 		echo "$ac_t""ok" 1>&6
+ 		if test "$prefix" = "NONE"; then
+ 			echo $ac_n "checking glib-config for prefix""... $ac_c" 1>&6
+-echo "configure:3534: checking glib-config for prefix" >&5
++echo "configure:3521: checking glib-config for prefix" >&5
+ 			prefix=`$GLIB_CONFIG --prefix`
+ 			echo "$ac_t""$prefix" 1>&6
+ 		fi
+ 		cat >> confdefs.h <<EOF
+@@ -3552,9 +3539,9 @@
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 3557 "configure"
++#line 3544 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+@@ -3562,9 +3549,9 @@
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+@@ -3602,17 +3589,17 @@
+ 			echo "configure: warning: Cannot find GLIB! Not building GTK frontend" 1>&2
+ 		fi
+ 
+ 		echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3607: checking for dlopen in -ldl" >&5
++echo "configure:3594: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3615 "configure"
++#line 3602 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -3621,9 +3608,9 @@
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3613: \"$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
+   echo "configure: failed program was:" >&5
+@@ -3710,9 +3697,9 @@
+ 
+   # Extract the first word of "gtk-config", so it can be a program name with args.
+ set dummy gtk-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3715: checking for $ac_word" >&5
++echo "configure:3702: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GTK_CONFIG" in
+@@ -3745,9 +3732,9 @@
+ fi
+ 
+   min_gtk_version=1.2.0
+   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+-echo "configure:3750: checking for GTK - version >= $min_gtk_version" >&5
++echo "configure:3737: checking for GTK - version >= $min_gtk_version" >&5
+   no_gtk=""
+   if test "$GTK_CONFIG" = "no" ; then
+     no_gtk=yes
+   else
+@@ -3768,9 +3755,9 @@
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3773 "configure"
++#line 3760 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+@@ -3846,9 +3833,9 @@
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3880,9 +3867,9 @@
+           echo "*** Could not run GTK test program, checking why..."
+           CFLAGS="$CFLAGS $GTK_CFLAGS"
+           LIBS="$LIBS $GTK_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 3885 "configure"
++#line 3872 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+@@ -3890,9 +3877,9 @@
+ int main() {
+  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GTK or finding the wrong"
+           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+@@ -3950,9 +3937,9 @@
+ if test "$gnome" = yes; then
+ 	# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3955: checking for $ac_word" >&5
++echo "configure:3942: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -3983,9 +3970,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6
+-echo "configure:3988: checking for Gnome compile flags" >&5
++echo "configure:3975: checking for Gnome compile flags" >&5
+ 	GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null`
+ 	if test "_$GNOME_CFLAGS" = _ ; then
+ 		gnome=no
+ 		echo "$ac_t""Gnome not found, building without it." 1>&6
+@@ -4011,9 +3998,9 @@
+ 	if test "$gnome" = no; then
+ 		# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4016: checking for $ac_word" >&5
++echo "configure:4003: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -4045,9 +4032,9 @@
+ fi
+ 
+ 	fi
+ 	echo $ac_n "checking for zvt""... $ac_c" 1>&6
+-echo "configure:4050: checking for zvt" >&5
++echo "configure:4037: checking for zvt" >&5
+ 	if test "_$gnomepath" = "_"; then
+ 		echo "$ac_t""No gnome-config, can't do it." 1>&6
+ 		zvt=no
+ 	else
+@@ -4067,9 +4054,9 @@
+ if test "$gdk_pixbuf" = yes ; then
+ 	# Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
+ set dummy gdk-pixbuf-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4072: checking for $ac_word" >&5
++echo "configure:4059: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gdkpixbufpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gdkpixbufpath" in
+@@ -4103,9 +4090,9 @@
+ 	if test "$gnome" = no; then
+ 		# Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4108: checking for $ac_word" >&5
++echo "configure:4095: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$gnomepath" in
+@@ -4137,9 +4124,9 @@
+ fi
+ 
+ 	fi
+ 	echo $ac_n "checking for gdk-pixbuf >= 0.8""... $ac_c" 1>&6
+-echo "configure:4142: checking for gdk-pixbuf >= 0.8" >&5
++echo "configure:4129: checking for gdk-pixbuf >= 0.8" >&5
+ 	GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
+ 	GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
+ 	if test "_$GDK_PIXBUF_CFLAGS" = _; then
+ 		echo "$ac_t""not found, building without gdk-pixbuf." 1>&6
+@@ -4171,9 +4158,9 @@
+ if test "$perl" = yes; then
+ 	# Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4176: checking for $ac_word" >&5
++echo "configure:4163: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_perlpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$perlpath" in
+@@ -4204,9 +4191,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6
+-echo "configure:4209: checking for Perl compile flags" >&5
++echo "configure:4196: checking for Perl compile flags" >&5
+ 	PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+ 	if test "_$PERL_CFLAGS" = _ ; then
+ 		echo "$ac_t""not found, building without perl." 1>&6
+ 		perl=no
+@@ -4228,14 +4215,14 @@
+ 
+ 		for ac_func in eval_pv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4233: checking for $ac_func" >&5
++echo "configure:4220: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4238 "configure"
++#line 4225 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4256,9 +4243,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -4282,9 +4269,9 @@
+ done
+ 
+ 
+ 		echo $ac_n "checking for old perl""... $ac_c" 1>&6
+-echo "configure:4287: checking for old perl" >&5
++echo "configure:4274: checking for old perl" >&5
+ 		PERL_OLD=`$perlpath -e 'if($]<5.006){printf"yes\n";}else{printf"no\n";}'`
+ 		if test "$PERL_OLD" = "yes"; then
+ 			cat >> confdefs.h <<\EOF
+ #define OLD_PERL 1
+@@ -4302,9 +4289,9 @@
+ 	if test "$python" = yes; then
+ 		# Extract the first word of "python", so it can be a program name with args.
+ set dummy python; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4307: checking for $ac_word" >&5
++echo "configure:4294: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_pythonpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$pythonpath" in
+@@ -4338,9 +4325,9 @@
+ 		if test "_$pythonpath" = _ ; then
+ 			python=no
+ 		else
+ 			echo $ac_n "checking for Python compile flags""... $ac_c" 1>&6
+-echo "configure:4343: checking for Python compile flags" >&5
++echo "configure:4330: checking for Python compile flags" >&5
+ 			PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
+ 			PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
+ 						PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`
+ 			PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`
+@@ -4353,17 +4340,17 @@
+ EOF
+ 
+ 				echo "$ac_t""ok" 1>&6
+ 				echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:4358: checking for pthread_create in -lpthread" >&5
++echo "configure:4345: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4366 "configure"
++#line 4353 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4372,9 +4359,9 @@
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4364: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4401,17 +4388,17 @@
+ fi
+ 
+ 				if test "$PY_MAJOR" = "2."; then
+ 										echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+-echo "configure:4406: checking for openpty in -lutil" >&5
++echo "configure:4393: checking for openpty in -lutil" >&5
+ ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lutil  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4414 "configure"
++#line 4401 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4420,9 +4407,9 @@
+ int main() {
+ openpty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4412: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4448,17 +4435,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 					echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:4453: checking for dbopen in -ldb" >&5
++echo "configure:4440: checking for dbopen in -ldb" >&5
+ ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4461 "configure"
++#line 4448 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4467,9 +4454,9 @@
+ int main() {
+ dbopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4459: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4513,17 +4500,17 @@
+ 	if test "$gnome" = yes; then
+ 		oldLIBS=$LIBS
+ 		LIBS="$LIBS `$gnomepath applets --libs`"
+ 		echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6
+-echo "configure:4518: checking for applet_widget_init in -lpanel_applet" >&5
++echo "configure:4505: checking for applet_widget_init in -lpanel_applet" >&5
+ ac_lib_var=`echo panel_applet'_'applet_widget_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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpanel_applet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4526 "configure"
++#line 4513 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4532,9 +4519,9 @@
+ int main() {
+ applet_widget_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4524: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4573,14 +4560,14 @@
+ if test "$ipv6" = yes; then
+ 	for ac_func in getaddrinfo
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4578: checking for $ac_func" >&5
++echo "configure:4565: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4583 "configure"
++#line 4570 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4601,9 +4588,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -4626,9 +4613,9 @@
+ fi
+ done
+ 
+ 	echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
+-echo "configure:4631: checking whether to enable IPv6 support" >&5
++echo "configure:4618: checking whether to enable IPv6 support" >&5
+ 	if test "$have_getaddrinfo" = yes; then
+ 		echo "$ac_t""yes" 1>&6
+ 		cat >> confdefs.h <<\EOF
+ #define USE_IPV6 1
+@@ -4652,17 +4639,17 @@
+ 	if test -n "$openssl_path"; then
+ 		LIBS="-L$openssl_path/lib $LIBS"
+ 	fi
+ 	echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
+-echo "configure:4657: checking for SSL_new in -lssl" >&5
++echo "configure:4644: checking for SSL_new in -lssl" >&5
+ ac_lib_var=`echo ssl'_'SSL_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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lssl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4665 "configure"
++#line 4652 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4671,9 +4658,9 @@
+ int main() {
+ SSL_new()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4663: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4701,19 +4688,19 @@
+ 		for ac_hdr in openssl/ssl.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4706: checking for $ac_hdr" >&5
++echo "configure:4693: 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 4711 "configure"
++#line 4698 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4703: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -4758,14 +4745,14 @@
+ if test "$plugin" = yes; then
+ 	for ac_func in dlopen
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4763: checking for $ac_func" >&5
++echo "configure:4750: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4768 "configure"
++#line 4755 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4786,9 +4773,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -4814,14 +4801,14 @@
+ 	if test "$have_dl" = yes; then
+ 		for ac_func in dlerror
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4819: checking for $ac_func" >&5
++echo "configure:4806: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4824 "configure"
++#line 4811 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -4842,9 +4829,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -4953,17 +4940,17 @@
+ 
+ if test "$socks" = yes; then
+ 	socks=no
+ 	echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6
+-echo "configure:4958: checking for SOCKSconnect in -lsocks5" >&5
++echo "configure:4945: checking for SOCKSconnect in -lsocks5" >&5
+ ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocks5  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4966 "configure"
++#line 4953 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -4972,9 +4959,9 @@
+ int main() {
+ SOCKSconnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4964: \"$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
+   echo "configure: failed program was:" >&5
+@@ -4997,19 +4984,19 @@
+ 		for ac_hdr in socks.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5002: checking for $ac_hdr" >&5
++echo "configure:4989: 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 5007 "configure"
++#line 4994 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4999: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5064,19 +5051,19 @@
+ 
+ if test "$WITH_JAPANESE" = "yes"; then
+ 	ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
+-echo "configure:5069: checking for iconv.h" >&5
++echo "configure:5056: checking for iconv.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 5074 "configure"
++#line 5061 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5066: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5111,9 +5098,9 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for i386/MMX support""... $ac_c" 1>&6
+-echo "configure:5116: checking for i386/MMX support" >&5
++echo "configure:5103: checking for i386/MMX support" >&5
+ if test "$mmx" = "yes"; then
+   machine=`uname -m`
+   case $machine in
+     i386|i486|i586|i686|i786)
+@@ -5164,14 +5151,14 @@
+ 
+ for ac_func in snprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5169: checking for $ac_func" >&5
++echo "configure:5156: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5174 "configure"
++#line 5161 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5192,9 +5179,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5220,14 +5207,14 @@
+ 
+ for ac_func in vsnprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5225: checking for $ac_func" >&5
++echo "configure:5212: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5230 "configure"
++#line 5217 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5248,9 +5235,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5276,14 +5263,14 @@
+ 
+ for ac_func in setenv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5281: checking for $ac_func" >&5
++echo "configure:5268: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5286 "configure"
++#line 5273 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+@@ -5304,9 +5291,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5330,14 +5317,14 @@
+ done
+ 
+ 
+ echo $ac_n "checking for select""... $ac_c" 1>&6
+-echo "configure:5335: checking for select" >&5
++echo "configure:5322: checking for select" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5340 "configure"
++#line 5327 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char select(); below.  */
+ #include <assert.h>
+@@ -5358,9 +5345,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_select=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5376,17 +5363,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
+-echo "configure:5381: checking for select in -lsocket" >&5
++echo "configure:5368: checking for select in -lsocket" >&5
+ ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5389 "configure"
++#line 5376 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5395,9 +5382,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5387: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5421,17 +5408,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6
+-echo "configure:5426: checking for select in -lnsl" >&5
++echo "configure:5413: checking for select in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5434 "configure"
++#line 5421 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5440,9 +5427,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5432: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5466,17 +5453,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -linet""... $ac_c" 1>&6
+-echo "configure:5471: checking for select in -linet" >&5
++echo "configure:5458: checking for select in -linet" >&5
+ ac_lib_var=`echo inet'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5479 "configure"
++#line 5466 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5485,9 +5472,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5477: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5511,17 +5498,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6
+-echo "configure:5516: checking for select in -lcposix" >&5
++echo "configure:5503: checking for select in -lcposix" >&5
+ ac_lib_var=`echo cposix'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5524 "configure"
++#line 5511 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5530,9 +5517,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5522: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5556,17 +5543,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6
+-echo "configure:5561: checking for select in -lnet" >&5
++echo "configure:5548: checking for select in -lnet" >&5
+ ac_lib_var=`echo net'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5569 "configure"
++#line 5556 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5575,9 +5562,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5567: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5615,17 +5602,17 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6
+-echo "configure:5620: checking for select in -lsocket" >&5
++echo "configure:5607: checking for select in -lsocket" >&5
+ ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5628 "configure"
++#line 5615 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5634,9 +5621,9 @@
+ int main() {
+ select()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5626: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5663,14 +5650,14 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:5668: checking for gethostbyname" >&5
++echo "configure:5655: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5673 "configure"
++#line 5660 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+ #include <assert.h>
+@@ -5691,9 +5678,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5709,17 +5696,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
+-echo "configure:5714: checking for gethostbyname in -lresolv" >&5
++echo "configure:5701: checking for gethostbyname in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lresolv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5722 "configure"
++#line 5709 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5728,9 +5715,9 @@
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5720: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5754,17 +5741,17 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:5759: checking for gethostbyname in -lnsl" >&5
++echo "configure:5746: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5767 "configure"
++#line 5754 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5773,9 +5760,9 @@
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5765: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5806,14 +5793,14 @@
+ fi
+ 
+ 
+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6
+-echo "configure:5811: checking for gethostname" >&5
++echo "configure:5798: checking for gethostname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5816 "configure"
++#line 5803 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostname(); below.  */
+ #include <assert.h>
+@@ -5834,9 +5821,9 @@
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostname=yes"
+ else
+   echo "configure: failed program was:" >&5
+@@ -5852,17 +5839,17 @@
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
+-echo "configure:5857: checking for gethostname in -lnsl" >&5
++echo "configure:5844: checking for gethostname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5865 "configure"
++#line 5852 "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
+     builtin and then its argument prototype would still apply.  */
+@@ -5871,9 +5858,9 @@
+ int main() {
+ gethostname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5863: \"$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
+   echo "configure: failed program was:" >&5
+@@ -5913,19 +5900,19 @@
+ for ac_hdr in strings.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5918: checking for $ac_hdr" >&5
++echo "configure:5905: 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 5923 "configure"
++#line 5910 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5915: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -5951,15 +5938,15 @@
+ done
+ 
+ 
+ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+-echo "configure:5956: checking for socklen_t" >&5
++echo "configure:5943: checking for socklen_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 5962 "configure"
++#line 5949 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -5992,9 +5979,9 @@
+ 
+ # Extract the first word of "tr", so it can be a program name with args.
+ set dummy tr; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5997: checking for $ac_word" >&5
++echo "configure:5984: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$trpath" in
+@@ -6027,9 +6014,9 @@
+ 
+ # Extract the first word of "sort", so it can be a program name with args.
+ set dummy sort; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6032: checking for $ac_word" >&5
++echo "configure:6019: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$sortpath" in
+@@ -6062,9 +6049,9 @@
+ 
+ # Extract the first word of "uniq", so it can be a program name with args.
+ set dummy uniq; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6067: checking for $ac_word" >&5
++echo "configure:6054: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$uniqpath" in