diff options
-rw-r--r-- | chat/xchat/Makefile | 5 | ||||
-rw-r--r-- | chat/xchat/PLIST | 3 | ||||
-rw-r--r-- | chat/xchat/distinfo | 10 | ||||
-rw-r--r-- | chat/xchat/patches/patch-aa | 18 | ||||
-rw-r--r-- | chat/xchat/patches/patch-ab | 529 |
5 files changed, 287 insertions, 278 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 713dbf12964..f8a3443856a 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2002/01/16 14:22:22 tron Exp $ +# $NetBSD: Makefile,v 1.15 2002/01/16 14:59:38 tron Exp $ -DISTNAME= xchat-1.8.3 -PKGREVISION= 1 +DISTNAME= xchat-1.8.7 CATEGORIES= chat x11 gnome MASTER_SITES= ${HOMEPAGE}files/source/1.8/ EXTRACT_SUFX= .tar.bz2 diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST index 770d02ee86a..9fb9472637c 100644 --- a/chat/xchat/PLIST +++ b/chat/xchat/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 19:47:12 zuntum 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 @@ -27,6 +27,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo ${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/pt_BR/LC_MESSAGES/xchat.mo diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index 4129b83f662..0b639f0e389 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2001/09/24 20:04:02 tron Exp $ +$NetBSD: distinfo,v 1.10 2002/01/16 14:59:38 tron Exp $ -SHA1 (xchat-1.8.3.tar.bz2) = 7e0dedee5f8724d42b85763f05958466f2a8a7d4 -Size (xchat-1.8.3.tar.bz2) = 627706 bytes -SHA1 (patch-aa) = d870e35dae1fdfe976cbe9572146438ae0620dd3 -SHA1 (patch-ab) = 141689091f4533456050b1ab931af9390945d81f +SHA1 (xchat-1.8.7.tar.bz2) = be69774757970ce0100d36ec769a64590c84cb78 +Size (xchat-1.8.7.tar.bz2) = 698662 bytes +SHA1 (patch-aa) = c744594c0be4f65b37a356708e70e61ac432ff19 +SHA1 (patch-ab) = 3313686bb4c80cd178e9cdcc786747ea68c07bbb SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa index 640ad5bb252..7940ab11a84 100644 --- a/chat/xchat/patches/patch-aa +++ b/chat/xchat/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2001/07/31 09:48:54 tron Exp $ +$NetBSD: patch-aa,v 1.3 2002/01/16 14:59:39 tron Exp $ ---- configure.in.orig Mon Jul 23 08:40:37 2001 -+++ configure.in Mon Jul 30 23:02:43 2001 -@@ -7,7 +7,7 @@ +x--- configure.in.orig Sun Jan 6 07:43:37 2002 ++++ configure.in Wed Jan 16 15:40:37 2002 +@@ -8,7 +8,7 @@ AC_PROG_RANLIB AC_PROG_CPP --ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt 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 nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN" +-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" AM_GNU_GETTEXT AC_PATH_PROG(sedpath, sed) -@@ -303,6 +303,7 @@ +@@ -317,6 +317,7 @@ PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'` PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'` changequote([, ])dnl @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/31 09:48:54 tron Exp $ if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then PY_LIBS="-lpython$PY_VERSION" PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" -@@ -544,6 +545,8 @@ +@@ -585,6 +586,8 @@ AC_PATH_PROG(sortpath, sort) AC_PATH_PROG(uniqpath, uniq) @@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/31 09:48:54 tron Exp $ if test "_$trpath" != _; then if test "_$sortpath" != _; then if test "_$uniqpath" != _; then -@@ -556,6 +559,7 @@ +@@ -597,6 +600,7 @@ GUI_CFLAGS=`cat cflags` rm -f cflags cflags2 diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab index da8e62e5074..aca50e2016c 100644 --- a/chat/xchat/patches/patch-ab +++ b/chat/xchat/patches/patch-ab @@ -1,23 +1,23 @@ -$NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $ +$NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 tron Exp $ ---- configure.orig Mon Jul 23 08:40:41 2001 -+++ configure Tue Jul 31 10:39:27 2001 -@@ -1164,7 +1164,7 @@ +--- configure.orig Mon Jan 7 11:16:55 2002 ++++ configure Wed Jan 16 15:44:51 2002 +@@ -1192,7 +1192,7 @@ echo "$ac_t""$CPP" 1>&6 --ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt 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 nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN" +-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" echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 - echo "configure:1170: checking for POSIXized ISC" >&5 + echo "configure:1198: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && -@@ -4431,7 +4431,47 @@ +@@ -4481,7 +4481,47 @@ 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]'` - if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then + echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -+echo "configure:4436: checking for openpty in -lutil" >&5 ++echo "configure:4486: 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 @@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $ + ac_save_LIBS="$LIBS" +LIBS="-lutil $LIBS" +cat > conftest.$ac_ext <<EOF -+#line 4444 "configure" ++#line 4494 "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 @@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $ +openpty() +; return 0; } +EOF -+if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4505: \"$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 @@ -60,748 +60,757 @@ $NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $ PY_LIBS="-lpython$PY_VERSION" PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" -@@ -4441,7 +4481,7 @@ +@@ -4491,7 +4531,7 @@ echo "$ac_t""ok" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:4445: checking for pthread_create in -lpthread" >&5 -+echo "configure:4485: checking for pthread_create in -lpthread" >&5 +-echo "configure:4495: checking for pthread_create in -lpthread" >&5 ++echo "configure:4535: 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 -@@ -4449,7 +4489,7 @@ +@@ -4499,7 +4539,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF --#line 4453 "configure" -+#line 4493 "configure" +-#line 4503 "configure" ++#line 4543 "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 -@@ -4460,7 +4500,7 @@ +@@ -4510,7 +4550,7 @@ pthread_create() ; return 0; } EOF --if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4554: \"$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 -@@ -4489,7 +4529,7 @@ +@@ -4539,7 +4579,7 @@ if test "$PY_MAJOR" = "2."; then echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 --echo "configure:4493: checking for openpty in -lutil" >&5 -+echo "configure:4533: checking for openpty in -lutil" >&5 +-echo "configure:4543: checking for openpty in -lutil" >&5 ++echo "configure:4583: 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 -@@ -4497,7 +4537,7 @@ +@@ -4547,7 +4587,7 @@ ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF --#line 4501 "configure" -+#line 4541 "configure" +-#line 4551 "configure" ++#line 4591 "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 -@@ -4508,7 +4548,7 @@ +@@ -4558,7 +4598,7 @@ openpty() ; return 0; } EOF --if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4602: \"$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 -@@ -4536,7 +4576,7 @@ +@@ -4586,7 +4626,7 @@ fi echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 --echo "configure:4540: checking for dbopen in -ldb" >&5 -+echo "configure:4580: checking for dbopen in -ldb" >&5 +-echo "configure:4590: checking for dbopen in -ldb" >&5 ++echo "configure:4630: 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 -@@ -4544,7 +4584,7 @@ +@@ -4594,7 +4634,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <<EOF --#line 4548 "configure" -+#line 4588 "configure" +-#line 4598 "configure" ++#line 4638 "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 -@@ -4555,7 +4595,7 @@ +@@ -4605,7 +4645,7 @@ dbopen() ; return 0; } EOF --if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4649: \"$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 -@@ -4601,7 +4641,7 @@ +@@ -4651,7 +4691,7 @@ oldLIBS=$LIBS LIBS="$LIBS `$gnomepath applets --libs`" echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6 --echo "configure:4605: checking for applet_widget_init in -lpanel_applet" >&5 -+echo "configure:4645: checking for applet_widget_init in -lpanel_applet" >&5 +-echo "configure:4655: checking for applet_widget_init in -lpanel_applet" >&5 ++echo "configure:4695: 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 -@@ -4609,7 +4649,7 @@ +@@ -4659,7 +4699,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpanel_applet $LIBS" cat > conftest.$ac_ext <<EOF --#line 4613 "configure" -+#line 4653 "configure" +-#line 4663 "configure" ++#line 4703 "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 -@@ -4620,7 +4660,7 @@ +@@ -4670,7 +4710,7 @@ applet_widget_init() ; return 0; } EOF --if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4714: \"$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 -@@ -4660,12 +4700,12 @@ +@@ -4711,12 +4751,12 @@ for ac_func in getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4664: checking for $ac_func" >&5 -+echo "configure:4704: checking for $ac_func" >&5 +-echo "configure:4715: checking for $ac_func" >&5 ++echo "configure:4755: 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 4669 "configure" -+#line 4709 "configure" +-#line 4720 "configure" ++#line 4760 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4688,7 +4728,7 @@ +@@ -4739,7 +4779,7 @@ ; return 0; } EOF --if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4783: \"$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 -@@ -4713,7 +4753,7 @@ +@@ -4764,7 +4804,7 @@ done echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 --echo "configure:4717: checking whether to enable IPv6 support" >&5 -+echo "configure:4757: checking whether to enable IPv6 support" >&5 +-echo "configure:4768: checking whether to enable IPv6 support" >&5 ++echo "configure:4808: checking whether to enable IPv6 support" >&5 if test "$have_getaddrinfo" = yes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -@@ -4739,7 +4779,7 @@ +@@ -4790,7 +4830,7 @@ LIBS="-L$openssl_path/lib $LIBS" fi echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 --echo "configure:4743: checking for SSL_new in -lssl" >&5 -+echo "configure:4783: checking for SSL_new in -lssl" >&5 +-echo "configure:4794: checking for SSL_new in -lssl" >&5 ++echo "configure:4834: 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 -@@ -4747,7 +4787,7 @@ +@@ -4798,7 +4838,7 @@ ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF --#line 4751 "configure" -+#line 4791 "configure" +-#line 4802 "configure" ++#line 4842 "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 -@@ -4758,7 +4798,7 @@ +@@ -4809,7 +4849,7 @@ SSL_new() ; return 0; } EOF --if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4853: \"$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 -@@ -4788,17 +4828,17 @@ +@@ -4839,17 +4879,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4792: checking for $ac_hdr" >&5 -+echo "configure:4832: checking for $ac_hdr" >&5 +-echo "configure:4843: checking for $ac_hdr" >&5 ++echo "configure:4883: 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 4797 "configure" -+#line 4837 "configure" +-#line 4848 "configure" ++#line 4888 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:4853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4893: \"$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* -@@ -4845,12 +4885,12 @@ +@@ -4896,12 +4936,12 @@ for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4849: checking for $ac_func" >&5 -+echo "configure:4889: checking for $ac_func" >&5 +-echo "configure:4900: checking for $ac_func" >&5 ++echo "configure:4940: 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 4854 "configure" -+#line 4894 "configure" +-#line 4905 "configure" ++#line 4945 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4873,7 +4913,7 @@ +@@ -4924,7 +4964,7 @@ ; return 0; } EOF --if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4968: \"$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 -@@ -4901,12 +4941,12 @@ +@@ -4952,12 +4992,12 @@ for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4905: checking for $ac_func" >&5 -+echo "configure:4945: checking for $ac_func" >&5 +-echo "configure:4956: checking for $ac_func" >&5 ++echo "configure:4996: 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 4910 "configure" -+#line 4950 "configure" +-#line 4961 "configure" ++#line 5001 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4929,7 +4969,7 @@ +@@ -4980,7 +5020,7 @@ ; return 0; } EOF --if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5024: \"$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 -@@ -5049,7 +5089,7 @@ +@@ -5100,7 +5140,7 @@ if test "$socks" = yes; then socks=no echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6 --echo "configure:5053: checking for SOCKSconnect in -lsocks5" >&5 -+echo "configure:5093: checking for SOCKSconnect in -lsocks5" >&5 +-echo "configure:5104: checking for SOCKSconnect in -lsocks5" >&5 ++echo "configure:5144: 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 -@@ -5057,7 +5097,7 @@ +@@ -5108,7 +5148,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks5 $LIBS" cat > conftest.$ac_ext <<EOF --#line 5061 "configure" -+#line 5101 "configure" +-#line 5112 "configure" ++#line 5152 "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 -@@ -5068,7 +5108,7 @@ +@@ -5119,7 +5159,7 @@ SOCKSconnect() ; return 0; } EOF --if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5163: \"$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 -@@ -5093,17 +5133,17 @@ +@@ -5144,17 +5184,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5097: checking for $ac_hdr" >&5 -+echo "configure:5137: checking for $ac_hdr" >&5 +-echo "configure:5148: checking for $ac_hdr" >&5 ++echo "configure:5188: 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 5102 "configure" -+#line 5142 "configure" +-#line 5153 "configure" ++#line 5193 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5198: \"$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* -@@ -5160,17 +5200,17 @@ +@@ -5211,17 +5251,17 @@ 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:5164: checking for iconv.h" >&5 -+echo "configure:5204: checking for iconv.h" >&5 +-echo "configure:5215: checking for iconv.h" >&5 ++echo "configure:5255: 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 5169 "configure" -+#line 5209 "configure" +-#line 5220 "configure" ++#line 5260 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5265: \"$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* -@@ -5227,12 +5267,12 @@ +@@ -5258,7 +5298,7 @@ + + + echo $ac_n "checking for i386/MMX support""... $ac_c" 1>&6 +-echo "configure:5262: checking for i386/MMX support" >&5 ++echo "configure:5302: checking for i386/MMX support" >&5 + if test "$mmx" = "yes"; then + machine=`uname -m` + case $machine in +@@ -5311,12 +5351,12 @@ for ac_func in snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5231: checking for $ac_func" >&5 -+echo "configure:5271: checking for $ac_func" >&5 +-echo "configure:5315: checking for $ac_func" >&5 ++echo "configure:5355: 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 5236 "configure" -+#line 5276 "configure" +-#line 5320 "configure" ++#line 5360 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5255,7 +5295,7 @@ +@@ -5339,7 +5379,7 @@ ; return 0; } EOF --if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5383: \"$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 -@@ -5283,12 +5323,12 @@ +@@ -5367,12 +5407,12 @@ for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5287: checking for $ac_func" >&5 -+echo "configure:5327: checking for $ac_func" >&5 +-echo "configure:5371: checking for $ac_func" >&5 ++echo "configure:5411: 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 5292 "configure" -+#line 5332 "configure" +-#line 5376 "configure" ++#line 5416 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5311,7 +5351,7 @@ +@@ -5395,7 +5435,7 @@ ; return 0; } EOF --if { (eval echo configure:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5439: \"$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 -@@ -5339,12 +5379,12 @@ +@@ -5423,12 +5463,12 @@ for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5343: checking for $ac_func" >&5 -+echo "configure:5383: checking for $ac_func" >&5 +-echo "configure:5427: checking for $ac_func" >&5 ++echo "configure:5467: 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 5348 "configure" -+#line 5388 "configure" +-#line 5432 "configure" ++#line 5472 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5367,7 +5407,7 @@ +@@ -5451,7 +5491,7 @@ ; return 0; } EOF --if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5495: \"$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 -@@ -5393,12 +5433,12 @@ +@@ -5477,12 +5517,12 @@ echo $ac_n "checking for select""... $ac_c" 1>&6 --echo "configure:5397: checking for select" >&5 -+echo "configure:5437: checking for select" >&5 +-echo "configure:5481: checking for select" >&5 ++echo "configure:5521: 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 5402 "configure" -+#line 5442 "configure" +-#line 5486 "configure" ++#line 5526 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char select(); below. */ -@@ -5421,7 +5461,7 @@ +@@ -5505,7 +5545,7 @@ ; return 0; } EOF --if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5549: \"$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 -@@ -5439,7 +5479,7 @@ +@@ -5523,7 +5563,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5443: checking for select in -lsocket" >&5 -+echo "configure:5483: checking for select in -lsocket" >&5 +-echo "configure:5527: checking for select in -lsocket" >&5 ++echo "configure:5567: 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 -@@ -5447,7 +5487,7 @@ +@@ -5531,7 +5571,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5451 "configure" -+#line 5491 "configure" +-#line 5535 "configure" ++#line 5575 "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 -@@ -5458,7 +5498,7 @@ +@@ -5542,7 +5582,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5586: \"$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 -@@ -5484,7 +5524,7 @@ +@@ -5568,7 +5608,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6 --echo "configure:5488: checking for select in -lnsl" >&5 -+echo "configure:5528: checking for select in -lnsl" >&5 +-echo "configure:5572: checking for select in -lnsl" >&5 ++echo "configure:5612: 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 -@@ -5492,7 +5532,7 @@ +@@ -5576,7 +5616,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5496 "configure" -+#line 5536 "configure" +-#line 5580 "configure" ++#line 5620 "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 -@@ -5503,7 +5543,7 @@ +@@ -5587,7 +5627,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5631: \"$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 -@@ -5529,7 +5569,7 @@ +@@ -5613,7 +5653,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -linet""... $ac_c" 1>&6 --echo "configure:5533: checking for select in -linet" >&5 -+echo "configure:5573: checking for select in -linet" >&5 +-echo "configure:5617: checking for select in -linet" >&5 ++echo "configure:5657: 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 -@@ -5537,7 +5577,7 @@ +@@ -5621,7 +5661,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5541 "configure" -+#line 5581 "configure" +-#line 5625 "configure" ++#line 5665 "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 -@@ -5548,7 +5588,7 @@ +@@ -5632,7 +5672,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5676: \"$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 -@@ -5574,7 +5614,7 @@ +@@ -5658,7 +5698,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6 --echo "configure:5578: checking for select in -lcposix" >&5 -+echo "configure:5618: checking for select in -lcposix" >&5 +-echo "configure:5662: checking for select in -lcposix" >&5 ++echo "configure:5702: 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 -@@ -5582,7 +5622,7 @@ +@@ -5666,7 +5706,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF --#line 5586 "configure" -+#line 5626 "configure" +-#line 5670 "configure" ++#line 5710 "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 -@@ -5593,7 +5633,7 @@ +@@ -5677,7 +5717,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5721: \"$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 -@@ -5619,7 +5659,7 @@ +@@ -5703,7 +5743,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6 --echo "configure:5623: checking for select in -lnet" >&5 -+echo "configure:5663: checking for select in -lnet" >&5 +-echo "configure:5707: checking for select in -lnet" >&5 ++echo "configure:5747: 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 -@@ -5627,7 +5667,7 @@ +@@ -5711,7 +5751,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5631 "configure" -+#line 5671 "configure" +-#line 5715 "configure" ++#line 5755 "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 -@@ -5638,7 +5678,7 @@ +@@ -5722,7 +5762,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5766: \"$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 -@@ -5678,7 +5718,7 @@ +@@ -5762,7 +5802,7 @@ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5682: checking for select in -lsocket" >&5 -+echo "configure:5722: checking for select in -lsocket" >&5 +-echo "configure:5766: checking for select in -lsocket" >&5 ++echo "configure:5806: 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 -@@ -5686,7 +5726,7 @@ +@@ -5770,7 +5810,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5690 "configure" -+#line 5730 "configure" +-#line 5774 "configure" ++#line 5814 "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 -@@ -5697,7 +5737,7 @@ +@@ -5781,7 +5821,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5825: \"$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 -@@ -5726,12 +5766,12 @@ +@@ -5810,12 +5850,12 @@ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:5730: checking for gethostbyname" >&5 -+echo "configure:5770: checking for gethostbyname" >&5 +-echo "configure:5814: checking for gethostbyname" >&5 ++echo "configure:5854: 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 5735 "configure" -+#line 5775 "configure" +-#line 5819 "configure" ++#line 5859 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ -@@ -5754,7 +5794,7 @@ +@@ -5838,7 +5878,7 @@ ; return 0; } EOF --if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5882: \"$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 -@@ -5772,7 +5812,7 @@ +@@ -5856,7 +5896,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 --echo "configure:5776: checking for gethostbyname in -lresolv" >&5 -+echo "configure:5816: checking for gethostbyname in -lresolv" >&5 +-echo "configure:5860: checking for gethostbyname in -lresolv" >&5 ++echo "configure:5900: 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 -@@ -5780,7 +5820,7 @@ +@@ -5864,7 +5904,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF --#line 5784 "configure" -+#line 5824 "configure" +-#line 5868 "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 -@@ -5791,7 +5831,7 @@ +@@ -5875,7 +5915,7 @@ gethostbyname() ; return 0; } EOF --if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5879: \"$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 -@@ -5817,7 +5857,7 @@ +@@ -5901,7 +5941,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:5821: checking for gethostbyname in -lnsl" >&5 -+echo "configure:5861: checking for gethostbyname in -lnsl" >&5 +-echo "configure:5905: checking for gethostbyname in -lnsl" >&5 ++echo "configure:5945: 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 -@@ -5825,7 +5865,7 @@ +@@ -5909,7 +5949,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5829 "configure" -+#line 5869 "configure" +-#line 5913 "configure" ++#line 5953 "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 -@@ -5836,7 +5876,7 @@ +@@ -5920,7 +5960,7 @@ gethostbyname() ; return 0; } EOF --if { (eval echo configure:5840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5964: \"$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 -@@ -5869,12 +5909,12 @@ +@@ -5953,12 +5993,12 @@ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 --echo "configure:5873: checking for gethostname" >&5 -+echo "configure:5913: checking for gethostname" >&5 +-echo "configure:5957: checking for gethostname" >&5 ++echo "configure:5997: 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 5878 "configure" -+#line 5918 "configure" +-#line 5962 "configure" ++#line 6002 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ -@@ -5897,7 +5937,7 @@ +@@ -5981,7 +6021,7 @@ ; return 0; } EOF --if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6025: \"$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 -@@ -5915,7 +5955,7 @@ +@@ -5999,7 +6039,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:5919: checking for gethostname in -lnsl" >&5 -+echo "configure:5959: checking for gethostname in -lnsl" >&5 +-echo "configure:6003: checking for gethostname in -lnsl" >&5 ++echo "configure:6043: 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 -@@ -5923,7 +5963,7 @@ +@@ -6007,7 +6047,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5927 "configure" -+#line 5967 "configure" +-#line 6011 "configure" ++#line 6051 "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 -@@ -5934,7 +5974,7 @@ +@@ -6018,7 +6058,7 @@ gethostname() ; return 0; } EOF --if { (eval echo configure:5938: \"$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 +-if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6062: \"$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 -@@ -5976,17 +6016,17 @@ +@@ -6060,17 +6100,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5980: checking for $ac_hdr" >&5 -+echo "configure:6020: checking for $ac_hdr" >&5 +-echo "configure:6064: checking for $ac_hdr" >&5 ++echo "configure:6104: 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 5985 "configure" -+#line 6025 "configure" +-#line 6069 "configure" ++#line 6109 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:6074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6114: \"$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* -@@ -6020,7 +6060,7 @@ +@@ -6104,7 +6144,7 @@ # 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:6024: checking for $ac_word" >&5 -+echo "configure:6064: checking for $ac_word" >&5 +-echo "configure:6108: checking for $ac_word" >&5 ++echo "configure:6148: 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 -@@ -6055,7 +6095,7 @@ +@@ -6139,7 +6179,7 @@ # 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:6059: checking for $ac_word" >&5 -+echo "configure:6099: checking for $ac_word" >&5 +-echo "configure:6143: checking for $ac_word" >&5 ++echo "configure:6183: 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 -@@ -6090,7 +6130,7 @@ +@@ -6174,7 +6214,7 @@ # 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:6094: checking for $ac_word" >&5 -+echo "configure:6134: checking for $ac_word" >&5 +-echo "configure:6178: checking for $ac_word" >&5 ++echo "configure:6218: 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 -@@ -6123,6 +6163,7 @@ +@@ -6207,6 +6247,7 @@ fi @@ -809,7 +818,7 @@ $NetBSD: patch-ab,v 1.3 2001/07/31 09:48:54 tron Exp $ if test "_$trpath" != _; then if test "_$sortpath" != _; then if test "_$uniqpath" != _; then -@@ -6135,6 +6176,7 @@ +@@ -6219,6 +6260,7 @@ GUI_CFLAGS=`cat cflags` rm -f cflags cflags2 |