diff options
| author | tron <tron@pkgsrc.org> | 2002-04-09 09:14:58 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2002-04-09 09:14:58 +0000 |
| commit | 85dc2d2d26ec753ef603d264e63cbb3e7a6a6412 (patch) | |
| tree | f5b44b88686af2c8e83a62b14254df1c3b431503 /chat/xchat | |
| parent | 2d2a9340663e98dd54fd7ad047ec216d70fc8f73 (diff) | |
| download | pkgsrc-85dc2d2d26ec753ef603d264e63cbb3e7a6a6412.tar.gz | |
Update "xchat" package to version 1.8.8. Changes since version 1.8.7:
- Updated Swedish translation (Christian Rose).
- Updated Spanish translation (Antonio de la Torre).
- Updated French translation (Olivier Berger).
- Updated Slovak translation (Stanislav Visnovsky).
- Updated Slovenian translation (Nejc Novak).
- Updated Japanese translation (Yukihiro Nakai).
- Fixed history OBO error (Lloyd Williams, Elizandro Garcia Roos).
- Fixed NLS not working properly under non-gnome build (Hiroyuki
Yamamoto).
- Backported 64-bit fixes from 1.9.1.
- Auto detect socklen_t.
- Make nick completion work when completion-char is set blank.
- Avoid crash when /set truncchans too low.
- win32: Made a built-in OpenURL function that should work on NT too.
- Fixed ConnectCmd not being executed after a second connect through
the serverlist.
- Use nicksuffix prefs in middle-click userlist.
- Fixed recursive wildcard match in /dcc send (debian bug 135348).
Diffstat (limited to 'chat/xchat')
| -rw-r--r-- | chat/xchat/Makefile | 5 | ||||
| -rw-r--r-- | chat/xchat/distinfo | 8 | ||||
| -rw-r--r-- | chat/xchat/patches/patch-ab | 2747 |
3 files changed, 2486 insertions, 274 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 5b32631f3cf..618d36b3a14 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2002/03/19 08:00:18 skrll Exp $ +# $NetBSD: Makefile,v 1.20 2002/04/09 09:14:58 tron Exp $ -DISTNAME= xchat-1.8.7 -PKGREVISION= 1 +DISTNAME= xchat-1.8.8 CATEGORIES= chat x11 gnome MASTER_SITES= ${HOMEPAGE}files/source/1.8/ EXTRACT_SUFX= .tar.bz2 diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index 0b639f0e389..5d0fb218b51 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2002/01/16 14:59:38 tron Exp $ +$NetBSD: distinfo,v 1.11 2002/04/09 09:14:58 tron Exp $ -SHA1 (xchat-1.8.7.tar.bz2) = be69774757970ce0100d36ec769a64590c84cb78 -Size (xchat-1.8.7.tar.bz2) = 698662 bytes +SHA1 (xchat-1.8.8.tar.bz2) = c47dd8bfbc6f7f7a455fc183cc2208a45e2d1f52 +Size (xchat-1.8.8.tar.bz2) = 735589 bytes SHA1 (patch-aa) = c744594c0be4f65b37a356708e70e61ac432ff19 -SHA1 (patch-ab) = 3313686bb4c80cd178e9cdcc786747ea68c07bbb +SHA1 (patch-ab) = abfe6acc7dc1c6509a3da3e771d75bac50c13cf6 SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab index aca50e2016c..2a5a4f84391 100644 --- a/chat/xchat/patches/patch-ab +++ b/chat/xchat/patches/patch-ab @@ -1,23 +1,2090 @@ -$NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 tron Exp $ +$NetBSD: patch-ab,v 1.5 2002/04/09 09:14:58 tron Exp $ ---- configure.orig Mon Jan 7 11:16:55 2002 -+++ configure Wed Jan 16 15:44:51 2002 -@@ -1192,7 +1192,7 @@ +--- configure.orig Wed Mar 6 03:23:05 2002 ++++ configure Tue Apr 9 11:06:52 2002 +@@ -15,12 +15,12 @@ + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" + ac_help="$ac_help +- --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" +-ac_help="$ac_help + --disable-nls do not use Native Language Support" + ac_help="$ac_help + --with-included-gettext use the GNU gettext library included here" + ac_help="$ac_help ++ --with-catgets use catgets functions if available" ++ac_help="$ac_help + --enable-debug enable use of Memory Debug (default: no)" + ac_help="$ac_help + --enable-socks enable use of SOCKS5 (default: no)" +@@ -1192,84 +1192,35 @@ 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" +- +-# 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; } +-fi +- +-echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:1204: checking host system type" >&5 +- +-host_alias=$host +-case "$host_alias" in +-NONE) +- case $nonopt in +- NONE) +- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : +- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } +- fi ;; +- *) host_alias=$nonopt ;; +- esac ;; +-esac +- +-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-echo "$ac_t""$host" 1>&6 +- +- +- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 +-echo "configure:1226: checking for strerror in -lcposix" >&5 +-ac_lib_var=`echo cposix'_'strerror | 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 1234 "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. */ +-char strerror(); +- +-int main() { +-strerror() +-; return 0; } +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:1198: checking for POSIXized ISC" >&5 - if test -d /etc/conf/kconfig.d && -@@ -4481,7 +4481,47 @@ ++echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ++echo "configure:1198: checking for POSIXized ISC" >&5 ++if test -d /etc/conf/kconfig.d && ++ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 ++then ++ echo "$ac_t""yes" 1>&6 ++ ISC=yes # If later tests want to check for ISC. ++ cat >> confdefs.h <<\EOF ++#define _POSIX_SOURCE 1 + EOF +-if { (eval echo configure:1245: \"$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 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -lcposix" ++ if test "$GCC" = yes; then ++ CC="$CC -posix" ++ else ++ CC="$CC -Xp" ++ fi + else + echo "$ac_t""no" 1>&6 ++ ISC= + fi + +- +- + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1268: checking for ANSI C header files" >&5 ++echo "configure:1219: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1273 "configure" ++#line 1224 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -1277,7 +1228,7 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1232: \"$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* +@@ -1294,7 +1245,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1298 "configure" ++#line 1249 "configure" + #include "confdefs.h" + #include <string.h> + EOF +@@ -1312,7 +1263,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1316 "configure" ++#line 1267 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF +@@ -1333,7 +1284,7 @@ + : + else + cat > conftest.$ac_ext <<EOF +-#line 1337 "configure" ++#line 1288 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -1344,7 +1295,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -1368,12 +1319,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:1372: checking for working const" >&5 ++echo "configure:1323: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1377 "configure" ++#line 1328 "configure" + #include "confdefs.h" + + int main() { +@@ -1422,7 +1373,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -1443,21 +1394,21 @@ + fi + + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:1447: checking for inline" >&5 ++echo "configure:1398: checking for inline" >&5 + if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <<EOF +-#line 1454 "configure" ++#line 1405 "configure" + #include "confdefs.h" + + int main() { + } $ac_kw foo() { + ; return 0; } + EOF +-if { (eval echo configure:1461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break + else +@@ -1483,12 +1434,12 @@ + esac + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:1487: checking for off_t" >&5 ++echo "configure:1438: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1492 "configure" ++#line 1443 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -1516,12 +1467,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:1520: checking for size_t" >&5 ++echo "configure:1471: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1525 "configure" ++#line 1476 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -1551,19 +1502,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:1555: checking for working alloca.h" >&5 ++echo "configure:1506: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1560 "configure" ++#line 1511 "configure" + #include "confdefs.h" + #include <alloca.h> + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -1584,12 +1535,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:1588: checking for alloca" >&5 ++echo "configure:1539: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1593 "configure" ++#line 1544 "configure" + #include "confdefs.h" + + #ifdef __GNUC__ +@@ -1617,7 +1568,7 @@ + char *p = (char *) alloca(1); + ; return 0; } + EOF +-if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -1649,12 +1600,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:1653: checking whether alloca needs Cray hooks" >&5 ++echo "configure:1604: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1658 "configure" ++#line 1609 "configure" + #include "confdefs.h" + #if defined(CRAY) && ! defined(CRAY2) + webecray +@@ -1679,12 +1630,12 @@ + if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:1683: checking for $ac_func" >&5 ++echo "configure:1634: 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 1688 "configure" ++#line 1639 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -1707,7 +1658,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1662: \"$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 +@@ -1734,7 +1685,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:1738: checking stack direction for C alloca" >&5 ++echo "configure:1689: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1742,7 +1693,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <<EOF +-#line 1746 "configure" ++#line 1697 "configure" + #include "confdefs.h" + find_stack_direction () + { +@@ -1761,7 +1712,7 @@ + exit (find_stack_direction() < 0); + } + EOF +-if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -1782,21 +1733,21 @@ + + 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 ++echo "configure:1741: 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 1795 "configure" ++#line 1746 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1751: \"$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* +@@ -1825,12 +1776,12 @@ + for ac_func in getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:1829: checking for $ac_func" >&5 ++echo "configure:1780: 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 1834 "configure" ++#line 1785 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -1853,7 +1804,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1808: \"$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 +@@ -1878,7 +1829,7 @@ + done + + echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +-echo "configure:1882: checking for working mmap" >&5 ++echo "configure:1833: checking for working mmap" >&5 + if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1886,7 +1837,7 @@ + ac_cv_func_mmap_fixed_mapped=no + else + cat > conftest.$ac_ext <<EOF +-#line 1890 "configure" ++#line 1841 "configure" + #include "confdefs.h" + + /* Thanks to Mike Haertel and Jim Avera for this test. +@@ -1914,24 +1865,11 @@ + #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 +@@ -2039,7 +1977,7 @@ + } + + 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:1981: \"$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 +@@ -2061,60 +1999,23 @@ + + 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 +-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" +-#include "confdefs.h" +- +-#include <features.h> +-#ifdef __GNU_LIBRARY__ +- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) +- Lucky GNU user +- #endif +-#endif +- +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "Lucky GNU user" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_gnu_library_2_1=yes +-else +- rm -rf conftest* +- ac_cv_gnu_library_2_1=no +-fi +-rm -f conftest* +- +- +- +-fi +- +-echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 +- +- GLIBC21="$ac_cv_gnu_library_2_1" +- +- +- +- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +-stdlib.h string.h unistd.h sys/param.h ++ ++ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.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:2009: 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 2014 "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:2019: \"$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* +@@ -2140,17 +2041,16 @@ + fi + done + +- for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +-getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +-strdup strtoul tsearch __argz_count __argz_stringify __argz_next ++ for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ ++strdup __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:2049: 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 2054 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -2173,7 +2073,7 @@ + + ; 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:2077: \"$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 +@@ -2198,184 +2098,85 @@ + done + + +- +- +- # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. +-if test "${with_libiconv_prefix+set}" = set; then +- withval="$with_libiconv_prefix" +- +- for dir in `echo "$withval" | tr : ' '`; do +- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi +- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi +- done +- +-fi +- +- +- echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:2217: checking for iconv" >&5 +-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then ++ if test "${ac_cv_func_stpcpy+set}" != "set"; then ++ for ac_func in stpcpy ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:2106: 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 +- +- am_cv_func_iconv="no, consider installing GNU libiconv" +- am_cv_lib_iconv=no +- cat > conftest.$ac_ext <<EOF +-#line 2225 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-#include <iconv.h> +-int main() { +-iconv_t cd = iconv_open("",""); +- 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 +- rm -rf conftest* +- am_cv_func_iconv=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +- if test "$am_cv_func_iconv" != yes; then +- am_save_LIBS="$LIBS" +- LIBS="$LIBS -liconv" +- cat > conftest.$ac_ext <<EOF +-#line 2247 "configure" ++ cat > conftest.$ac_ext <<EOF ++#line 2111 "configure" + #include "confdefs.h" +-#include <stdlib.h> +-#include <iconv.h> +-int main() { +-iconv_t cd = iconv_open("",""); +- 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 +- rm -rf conftest* +- am_cv_lib_iconv=yes +- am_cv_func_iconv=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +- LIBS="$am_save_LIBS" +- fi +- +-fi +- +-echo "$ac_t""$am_cv_func_iconv" 1>&6 +- if test "$am_cv_func_iconv" = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ICONV 1 +-EOF ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++#include <assert.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. */ ++char $ac_func(); + +- echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 +-echo "configure:2278: 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" +-#include "confdefs.h" ++int main() { + +-#include <stdlib.h> +-#include <iconv.h> +-extern +-#ifdef __cplusplus +-"C" +-#endif +-#if defined(__STDC__) || defined(__cplusplus) +-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me + #else +-size_t iconv(); ++$ac_func(); + #endif + +-int main() { +- + ; return 0; } + EOF +-if { (eval echo configure:2303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- am_cv_proto_iconv_arg1="" ++ eval "ac_cv_func_$ac_func=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- am_cv_proto_iconv_arg1="const" ++ eval "ac_cv_func_$ac_func=no" + fi + rm -f conftest* +- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" + fi + +- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` +- echo "$ac_t""${ac_t:- +- }$am_cv_proto_iconv" 1>&6 +- cat >> confdefs.h <<EOF +-#define ICONV_CONST $am_cv_proto_iconv_arg1 +-EOF +- +- fi +- LIBICONV= +- if test "$am_cv_lib_iconv" = yes; then +- LIBICONV="-liconv" +- fi +- +- +- +- echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:2332: 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" +-#include "confdefs.h" +-#include <langinfo.h> +-int main() { +-char* cs = nl_langinfo(CODESET); +-; return 0; } ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_func 1 + EOF +-if { (eval echo configure:2344: \"$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 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- am_cv_langinfo_codeset=no +-fi +-rm -f conftest* +- ++ echo "$ac_t""no" 1>&6 + fi ++done + +-echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 +- if test $am_cv_langinfo_codeset = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_LANGINFO_CODESET 1 ++ fi ++ if test "${ac_cv_func_stpcpy}" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_STPCPY 1 + EOF + +- fi ++ 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:2168: 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 2173 "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:2180: \"$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 +@@ -2396,7 +2197,7 @@ + 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:2201: 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" +@@ -2408,9 +2209,7 @@ + echo "$ac_t""$USE_NLS" 1>&6 + + +- BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no +- INTLLIBS= + + if test "$USE_NLS" = "yes"; then + cat >> confdefs.h <<\EOF +@@ -2418,7 +2217,7 @@ + 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:2221: 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" +@@ -2431,24 +2230,23 @@ + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then +- CATOBJEXT=NONE +- +- +- ++ nls_cv_header_intl= ++ nls_cv_header_libgt= ++ CATOBJEXT=NONE + + 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:2240: 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 2245 "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:2250: \"$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* +@@ -2464,178 +2262,464 @@ + 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 +-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then ++ echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 ++echo "configure:2267: checking for gettext in libc" >&5 ++if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#line 2272 "configure" ++#include "confdefs.h" ++#include <libintl.h> ++int main() { ++return (int) gettext ("") ++; return 0; } ++EOF ++if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ gt_cv_func_gettext_libc=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ gt_cv_func_gettext_libc=no ++fi ++rm -f conftest* ++fi ++ ++echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 ++ ++ if test "$gt_cv_func_gettext_libc" != "yes"; then ++ echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 ++echo "configure:2295: checking for bindtextdomain in -lintl" >&5 ++ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 2303 "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. */ ++char bindtextdomain(); ++ ++int main() { ++bindtextdomain() ++; return 0; } ++EOF ++if { (eval echo configure:2314: \"$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 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 ++echo "configure:2330: checking for gettext in libintl" >&5 ++if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 ++echo "configure:2335: checking for gettext in -lintl" >&5 ++ac_lib_var=`echo intl'_'gettext | 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="-lintl $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 2343 "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. */ ++char gettext(); ++ ++int main() { ++gettext() ++; return 0; } ++EOF ++if { (eval echo configure:2354: \"$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 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ gt_cv_func_gettext_libintl=yes ++else ++ echo "$ac_t""no" 1>&6 ++gt_cv_func_gettext_libintl=no ++fi ++ ++fi ++ ++echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$gt_cv_func_gettext_libc" = "yes" \ ++ || test "$gt_cv_func_gettext_libintl" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_GETTEXT 1 ++EOF ++ ++ # 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:2393: 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 ++ /*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ++ ac_cv_path_MSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ++ ;; ++esac ++fi ++MSGFMT="$ac_cv_path_MSGFMT" ++if test -n "$MSGFMT"; then ++ echo "$ac_t""$MSGFMT" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ if test "$MSGFMT" != "no"; then ++ for ac_func in dcgettext ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:2427: 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 2474 "configure" ++#line 2432 "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> ++/* 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. */ ++char $ac_func(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ ++; return 0; } ++EOF ++if { (eval echo configure:2455: \"$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 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_func 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ ++ # 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:2482: 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 ++ /*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT="$ac_cv_path_GMSGFMT" ++if test -n "$GMSGFMT"; then ++ echo "$ac_t""$GMSGFMT" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ # 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:2518: 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 ++ /*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ++ ;; ++esac ++fi ++XGETTEXT="$ac_cv_path_XGETTEXT" ++if test -n "$XGETTEXT"; then ++ echo "$ac_t""$XGETTEXT" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ cat > conftest.$ac_ext <<EOF ++#line 2550 "configure" + #include "confdefs.h" +-#include <libintl.h> +-extern int _nl_msg_cat_cntr; ++ + int main() { +-bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr ++extern int _nl_msg_cat_cntr; ++ return _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:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- gt_cv_func_gnugettext1_libc=yes ++ CATOBJEXT=.gmo ++ DATADIRNAME=share + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- gt_cv_func_gnugettext1_libc=no ++ CATOBJEXT=.mo ++ DATADIRNAME=lib + fi + rm -f conftest* ++ INSTOBJEXT=.mo ++ fi ++ fi ++ ++else ++ echo "$ac_t""no" 1>&6 + fi + +-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 +-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then ++ if test "$CATOBJEXT" = "NONE"; then ++ echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 ++echo "configure:2581: checking whether catgets can be used" >&5 ++ # Check whether --with-catgets or --without-catgets was given. ++if test "${with_catgets+set}" = set; then ++ withval="$with_catgets" ++ nls_cv_use_catgets=$withval ++else ++ nls_cv_use_catgets=no ++fi ++ ++ echo "$ac_t""$nls_cv_use_catgets" 1>&6 ++ ++ if test "$nls_cv_use_catgets" = "yes"; then ++ echo $ac_n "checking for main in -li""... $ac_c" 1>&6 ++echo "configure:2594: checking for main in -li" >&5 ++ac_lib_var=`echo i'_'main | 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 +- gt_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $LIBICONV" +- cat > conftest.$ac_ext <<EOF +-#line 2506 "configure" ++ ac_save_LIBS="$LIBS" ++LIBS="-li $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 2602 "configure" + #include "confdefs.h" +-#include <libintl.h> +-extern int _nl_msg_cat_cntr; ++ + int main() { +-bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr ++main() + ; 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:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- gt_cv_func_gnugettext1_libintl=yes ++ eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- gt_cv_func_gnugettext1_libintl=no ++ eval "ac_cv_lib_$ac_lib_var=no" + fi + rm -f conftest* +- LIBS="$gt_save_LIBS" +-fi +- +-echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 +- fi ++LIBS="$ac_save_LIBS" + +- if test "$gt_cv_func_gnugettext1_libc" = "yes" \ +- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ +- && test "$PACKAGE" != gettext; }; then +- cat >> confdefs.h <<\EOF +-#define HAVE_GETTEXT 1 ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_lib 1 + EOF + ++ LIBS="-li $LIBS" + +- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then +- INTLLIBS="-lintl $LIBICONV" +- fi +- +- gt_save_LIBS="$LIBS" +- 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 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for catgets""... $ac_c" 1>&6 ++echo "configure:2637: checking for catgets" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2553 "configure" ++#line 2642 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ ++ which can conflict with char catgets(); below. */ + #include <assert.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. */ +-char $ac_func(); ++char catgets(); + + int main() { + + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined (__stub_catgets) || defined (__stub___catgets) + choke me + #else +-$ac_func(); ++catgets(); + #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:2665: \"$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" ++ eval "ac_cv_func_catgets=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ eval "ac_cv_func_catgets=no" + fi + rm -f conftest* + fi + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_func 1 ++ cat >> confdefs.h <<\EOF ++#define HAVE_CATGETS 1 + EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done +- +- LIBS="$gt_save_LIBS" + +- # Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 ++ INTLOBJS="\$(CATOBJS)" ++ # Extract the first word of "gencat", so it can be a program name with args. ++set dummy gencat; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2605: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then ++echo "configure:2687: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- case "$MSGFMT" in ++ case "$GENCAT" in + /*) +- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. + ;; + *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then +- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then +- ac_cv_path_MSGFMT="$ac_dir/$ac_word" +- break +- fi ++ ac_cv_path_GENCAT="$ac_dir/$ac_word" ++ break + fi + done + IFS="$ac_save_ifs" +- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ++ test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" + ;; + esac + fi +-MSGFMT="$ac_cv_path_MSGFMT" +-if test -n "$MSGFMT"; then +- echo "$ac_t""$MSGFMT" 1>&6 ++GENCAT="$ac_cv_path_GENCAT" ++if test -n "$GENCAT"; then ++ echo "$ac_t""$GENCAT" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi +- if test "$MSGFMT" != "no"; then +- # Extract the first word of "gmsgfmt", so it can be a program name with args. ++ if test "$GENCAT" != "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:2723: 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 +@@ -2657,7 +2741,7 @@ + fi + done + IFS="$ac_save_ifs" +- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" + ;; + esac + fi +@@ -2668,12 +2752,46 @@ + echo "$ac_t""no" 1>&6 + fi + +- fi ++ if test "$GMSGFMT" = "no"; then ++ # 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:2760: 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 ++ /*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ++ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" ++ ;; ++esac ++fi ++GMSGFMT="$ac_cv_path_GMSGFMT" ++if test -n "$GMSGFMT"; then ++ echo "$ac_t""$GMSGFMT" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi + +- # Extract the first word of "xgettext", so it can be a program name with args. ++ fi ++ # 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:2795: 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 +@@ -2704,14 +2822,22 @@ + echo "$ac_t""no" 1>&6 + fi + +- +- CATOBJEXT=.gmo +- fi +- ++ USE_INCLUDED_LIBINTL=yes ++ CATOBJEXT=.cat ++ INSTOBJEXT=.cat ++ DATADIRNAME=lib ++ INTLDEPS='$(top_builddir)/intl/libintl.a' ++ INTLLIBS=$INTLDEPS ++ LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++ nls_cv_header_intl=intl/libintl.h ++ nls_cv_header_libgt=intl/libgettext.h ++ fi + else + echo "$ac_t""no" 1>&6 + fi + ++ fi ++ fi + + if test "$CATOBJEXT" = "NONE"; then + nls_cv_use_gnu_gettext=yes +@@ -2723,7 +2849,7 @@ + # 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:2853: 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 +@@ -2757,7 +2883,7 @@ + # 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:2887: 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 +@@ -2793,7 +2919,7 @@ + # 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:2923: 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 +@@ -2825,11 +2951,15 @@ + fi + + +- BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo +- INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" +- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` ++ INSTOBJEXT=.mo ++ DATADIRNAME=share ++ INTLDEPS='$(top_builddir)/intl/libintl.a' ++ INTLLIBS=$INTLDEPS ++ LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++ nls_cv_header_intl=intl/libintl.h ++ nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then +@@ -2841,65 +2971,22 @@ + fi + fi + +- POSUB=po ++ # We need to process the po/ directory. ++ POSUB=po ++ else ++ DATADIRNAME=share ++ nls_cv_header_intl=intl/libintl.h ++ nls_cv_header_libgt=intl/libgettext.h + fi + ++ + + +- if test "$PACKAGE" = gettext; then +- BUILD_INCLUDED_LIBINTL=yes +- fi +- +- for ac_prog in bison +-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 +-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 +- ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_INTLBISON="$ac_prog" +- break +- fi +- done +- IFS="$ac_save_ifs" +-fi +-fi +-INTLBISON="$ac_cv_prog_INTLBISON" +-if test -n "$INTLBISON"; then +- echo "$ac_t""$INTLBISON" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-test -n "$INTLBISON" && break +-done +- +- 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 +- 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].*) +- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; +- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; +- esac +- echo "$ac_t""$ac_prog_version" 1>&6 +- fi +- if test $ac_verc_fail = yes; then +- INTLBISON=: ++ # If this is used in GNU gettext we have to set USE_NLS to `yes' ++ # because some of the sources are only built for this goal. ++ if test "$PACKAGE" = gettext; then ++ USE_NLS=yes ++ USE_INCLUDED_LIBINTL=yes + fi + + for lang in $ALL_LINGUAS; do +@@ -2916,17 +3003,7 @@ + + + +- +- nls_cv_header_intl= +- nls_cv_header_libgt= +- +- DATADIRNAME=share +- +- +- INSTOBJEXT=.mo + +- +- GENCAT=gencat + + + +@@ -2935,23 +3012,12 @@ + 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:3016: checking for catalogs to be installed" >&5 + NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi ++ for lang in ${LINGUAS=$ALL_LINGUAS}; do ++ case "$ALL_LINGUAS" in ++ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ++ esac + done + LINGUAS=$NEW_LINGUAS + echo "$ac_t""$LINGUAS" 1>&6 +@@ -2962,6 +3028,66 @@ + fi + fi + ++ if test $ac_cv_header_locale_h = yes; then ++ INCLUDE_LOCALE_H="#include <locale.h>" ++ else ++ INCLUDE_LOCALE_H="\ ++/* The system does not provide the header <locale.h>. Take care yourself. */" ++ fi ++ ++ ++ test -d intl || mkdir intl ++ if test "$CATOBJEXT" = ".cat"; then ++ ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 ++echo "configure:3044: checking for linux/version.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 3049 "configure" ++#include "confdefs.h" ++#include <linux/version.h> ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:3054: \"$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" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ msgformat=linux ++else ++ echo "$ac_t""no" 1>&6 ++msgformat=xopen ++fi ++ ++ ++ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed ++ fi ++ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ ++ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed ++ ++ if test "$PACKAGE" = "gettext"; then ++ GT_NO="#NO#" ++ GT_YES= ++ else ++ GT_NO= ++ GT_YES="#YES#" ++ fi ++ ++ ++ + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +@@ -2971,14 +3097,28 @@ + fi + + +- INTL_LIBTOOL_SUFFIX_PREFIX= ++ l= + ++ ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES + + + # 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:3122: 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 +@@ -3017,7 +3157,7 @@ + # 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:3161: 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 +@@ -3053,7 +3193,7 @@ + system="unknown" + else + echo $ac_n "checking system type""... $ac_c" 1>&6 +-echo "configure:3057: checking system type" >&5 ++echo "configure:3197: checking system type" >&5 + system=`$unamepath -s` + echo "$ac_t""$system" 1>&6 + if test "$system" = "Linux"; then +@@ -3263,7 +3403,7 @@ + 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:3407: 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 +@@ -3271,7 +3411,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 3275 "configure" ++#line 3415 "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 +@@ -3282,7 +3422,7 @@ + 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:3426: \"$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 +@@ -3368,7 +3508,7 @@ + # 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:3512: 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 +@@ -3403,7 +3543,7 @@ + + 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:3547: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -3426,7 +3566,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 3430 "configure" ++#line 3570 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -3502,7 +3642,7 @@ + } + + 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:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -3522,7 +3662,7 @@ + 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:3666: checking for Glib compile flags" >&5 + GLIB_CFLAGS=`$GLIB_CONFIG --cflags` + GLIB_LIBS=`$GLIB_CONFIG gmodule --libs` + CFLAGS="$CFLAGS $GLIB_CFLAGS" +@@ -3530,7 +3670,7 @@ + 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:3674: checking glib-config for prefix" >&5 + prefix=`$GLIB_CONFIG --prefix` + echo "$ac_t""$prefix" 1>&6 + fi +@@ -3553,7 +3693,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 3557 "configure" ++#line 3697 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -3563,7 +3703,7 @@ + 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:3707: \"$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" +@@ -3603,7 +3743,7 @@ + fi + + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:3607: checking for dlopen in -ldl" >&5 ++echo "configure:3747: 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 +@@ -3611,7 +3751,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 3615 "configure" ++#line 3755 "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 +@@ -3622,7 +3762,7 @@ + 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:3766: \"$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 +@@ -3711,7 +3851,7 @@ + # 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:3855: 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 +@@ -3746,7 +3886,7 @@ + + 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:3890: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -3769,7 +3909,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 3773 "configure" ++#line 3913 "configure" + #include "confdefs.h" + + #include <gtk/gtk.h> +@@ -3847,7 +3987,7 @@ + } + + 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:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -3881,7 +4021,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 3885 "configure" ++#line 4025 "configure" + #include "confdefs.h" + + #include <gtk/gtk.h> +@@ -3891,7 +4031,7 @@ + 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:4035: \"$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" +@@ -3951,7 +4091,7 @@ + # 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: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 +@@ -3984,7 +4124,7 @@ + fi + + echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6 +-echo "configure:3988: checking for Gnome compile flags" >&5 ++echo "configure:4128: checking for Gnome compile flags" >&5 + GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` + if test "_$GNOME_CFLAGS" = _ ; then + gnome=no +@@ -4012,7 +4152,7 @@ + # 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:4156: 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 +@@ -4046,7 +4186,7 @@ + + fi + echo $ac_n "checking for zvt""... $ac_c" 1>&6 +-echo "configure:4050: checking for zvt" >&5 ++echo "configure:4190: checking for zvt" >&5 + if test "_$gnomepath" = "_"; then + echo "$ac_t""No gnome-config, can't do it." 1>&6 + zvt=no +@@ -4068,7 +4208,7 @@ + # 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:4212: 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 +@@ -4104,7 +4244,7 @@ + # 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:4248: 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 +@@ -4138,7 +4278,7 @@ + + 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:4282: 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 +@@ -4172,7 +4312,7 @@ + # 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:4316: 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 +@@ -4205,7 +4345,7 @@ + fi + + echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6 +-echo "configure:4209: checking for Perl compile flags" >&5 ++echo "configure:4349: 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 +@@ -4229,12 +4369,12 @@ + 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:4373: 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 4378 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -4257,7 +4397,7 @@ + + ; 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:4401: \"$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 +@@ -4283,7 +4423,7 @@ + + + echo $ac_n "checking for old perl""... $ac_c" 1>&6 +-echo "configure:4287: checking for old perl" >&5 ++echo "configure:4427: 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 +@@ -4303,7 +4443,7 @@ + # 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:4447: 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 +@@ -4339,12 +4479,52 @@ + 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:4483: 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]'` - 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:4486: checking for openpty in -lutil" >&5 ++echo "configure:4489: 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 +2092,7 @@ $NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 tron Exp $ + ac_save_LIBS="$LIBS" +LIBS="-lutil $LIBS" +cat > conftest.$ac_ext <<EOF -+#line 4494 "configure" ++#line 4497 "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 +2103,7 @@ $NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 tron Exp $ +openpty() +; return 0; } +EOF -+if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4508: \"$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,757 +2127,773 @@ $NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 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" -@@ -4491,7 +4531,7 @@ +@@ -4354,7 +4534,7 @@ echo "$ac_t""ok" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:4495: checking for pthread_create in -lpthread" >&5 -+echo "configure:4535: checking for pthread_create in -lpthread" >&5 +-echo "configure:4358: checking for pthread_create in -lpthread" >&5 ++echo "configure:4538: 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 -@@ -4499,7 +4539,7 @@ +@@ -4362,7 +4542,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF --#line 4503 "configure" -+#line 4543 "configure" +-#line 4366 "configure" ++#line 4546 "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 -@@ -4510,7 +4550,7 @@ +@@ -4373,7 +4553,7 @@ pthread_create() ; return 0; } EOF --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 +-if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4557: \"$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 -@@ -4539,7 +4579,7 @@ +@@ -4402,7 +4582,7 @@ if test "$PY_MAJOR" = "2."; then echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 --echo "configure:4543: checking for openpty in -lutil" >&5 -+echo "configure:4583: checking for openpty in -lutil" >&5 +-echo "configure:4406: checking for openpty in -lutil" >&5 ++echo "configure:4586: 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 -@@ -4547,7 +4587,7 @@ +@@ -4410,7 +4590,7 @@ ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF --#line 4551 "configure" -+#line 4591 "configure" +-#line 4414 "configure" ++#line 4594 "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 -@@ -4558,7 +4598,7 @@ +@@ -4421,7 +4601,7 @@ openpty() ; return 0; } EOF --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 +-if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4605: \"$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 -@@ -4586,7 +4626,7 @@ +@@ -4449,7 +4629,7 @@ fi echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 --echo "configure:4590: checking for dbopen in -ldb" >&5 -+echo "configure:4630: checking for dbopen in -ldb" >&5 +-echo "configure:4453: checking for dbopen in -ldb" >&5 ++echo "configure:4633: 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 -@@ -4594,7 +4634,7 @@ +@@ -4457,7 +4637,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <<EOF --#line 4598 "configure" -+#line 4638 "configure" +-#line 4461 "configure" ++#line 4641 "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 -@@ -4605,7 +4645,7 @@ +@@ -4468,7 +4648,7 @@ dbopen() ; return 0; } EOF --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 +-if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4652: \"$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 -@@ -4651,7 +4691,7 @@ +@@ -4514,7 +4694,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:4655: checking for applet_widget_init in -lpanel_applet" >&5 -+echo "configure:4695: checking for applet_widget_init in -lpanel_applet" >&5 +-echo "configure:4518: checking for applet_widget_init in -lpanel_applet" >&5 ++echo "configure:4698: 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 -@@ -4659,7 +4699,7 @@ +@@ -4522,7 +4702,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpanel_applet $LIBS" cat > conftest.$ac_ext <<EOF --#line 4663 "configure" -+#line 4703 "configure" +-#line 4526 "configure" ++#line 4706 "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 -@@ -4670,7 +4710,7 @@ +@@ -4533,7 +4713,7 @@ applet_widget_init() ; return 0; } EOF --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 +-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4717: \"$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 -@@ -4711,12 +4751,12 @@ +@@ -4574,12 +4754,12 @@ for ac_func in getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4715: checking for $ac_func" >&5 -+echo "configure:4755: checking for $ac_func" >&5 +-echo "configure:4578: checking for $ac_func" >&5 ++echo "configure:4758: 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 4720 "configure" -+#line 4760 "configure" +-#line 4583 "configure" ++#line 4763 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4739,7 +4779,7 @@ +@@ -4602,7 +4782,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4786: \"$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 -@@ -4764,7 +4804,7 @@ +@@ -4627,7 +4807,7 @@ done echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 --echo "configure:4768: checking whether to enable IPv6 support" >&5 -+echo "configure:4808: checking whether to enable IPv6 support" >&5 +-echo "configure:4631: checking whether to enable IPv6 support" >&5 ++echo "configure:4811: checking whether to enable IPv6 support" >&5 if test "$have_getaddrinfo" = yes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -@@ -4790,7 +4830,7 @@ +@@ -4653,7 +4833,7 @@ LIBS="-L$openssl_path/lib $LIBS" fi echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 --echo "configure:4794: checking for SSL_new in -lssl" >&5 -+echo "configure:4834: checking for SSL_new in -lssl" >&5 +-echo "configure:4657: checking for SSL_new in -lssl" >&5 ++echo "configure:4837: 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 -@@ -4798,7 +4838,7 @@ +@@ -4661,7 +4841,7 @@ ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF --#line 4802 "configure" -+#line 4842 "configure" +-#line 4665 "configure" ++#line 4845 "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 -@@ -4809,7 +4849,7 @@ +@@ -4672,7 +4852,7 @@ SSL_new() ; return 0; } EOF --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 +-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4856: \"$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 -@@ -4839,17 +4879,17 @@ +@@ -4702,17 +4882,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4843: checking for $ac_hdr" >&5 -+echo "configure:4883: checking for $ac_hdr" >&5 +-echo "configure:4706: checking for $ac_hdr" >&5 ++echo "configure:4886: 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 4848 "configure" -+#line 4888 "configure" +-#line 4711 "configure" ++#line 4891 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (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; } +-{ (eval echo configure:4716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4896: \"$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* -@@ -4896,12 +4936,12 @@ +@@ -4759,12 +4939,12 @@ for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4900: checking for $ac_func" >&5 -+echo "configure:4940: checking for $ac_func" >&5 +-echo "configure:4763: checking for $ac_func" >&5 ++echo "configure:4943: 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 4905 "configure" -+#line 4945 "configure" +-#line 4768 "configure" ++#line 4948 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4924,7 +4964,7 @@ +@@ -4787,7 +4967,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4971: \"$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 -@@ -4952,12 +4992,12 @@ +@@ -4815,12 +4995,12 @@ for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4956: checking for $ac_func" >&5 -+echo "configure:4996: checking for $ac_func" >&5 +-echo "configure:4819: checking for $ac_func" >&5 ++echo "configure:4999: 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 4961 "configure" -+#line 5001 "configure" +-#line 4824 "configure" ++#line 5004 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4980,7 +5020,7 @@ +@@ -4843,7 +5023,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5027: \"$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 -@@ -5100,7 +5140,7 @@ +@@ -4963,7 +5143,7 @@ if test "$socks" = yes; then socks=no echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6 --echo "configure:5104: checking for SOCKSconnect in -lsocks5" >&5 -+echo "configure:5144: checking for SOCKSconnect in -lsocks5" >&5 +-echo "configure:4967: checking for SOCKSconnect in -lsocks5" >&5 ++echo "configure:5147: 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 -@@ -5108,7 +5148,7 @@ +@@ -4971,7 +5151,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks5 $LIBS" cat > conftest.$ac_ext <<EOF --#line 5112 "configure" -+#line 5152 "configure" +-#line 4975 "configure" ++#line 5155 "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 -@@ -5119,7 +5159,7 @@ +@@ -4982,7 +5162,7 @@ SOCKSconnect() ; return 0; } EOF --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 +-if { (eval echo configure:4986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5166: \"$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 -@@ -5144,17 +5184,17 @@ +@@ -5007,17 +5187,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5148: checking for $ac_hdr" >&5 -+echo "configure:5188: checking for $ac_hdr" >&5 +-echo "configure:5011: checking for $ac_hdr" >&5 ++echo "configure:5191: 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 5153 "configure" -+#line 5193 "configure" +-#line 5016 "configure" ++#line 5196 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (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; } +-{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5201: \"$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* -@@ -5211,17 +5251,17 @@ +@@ -5074,17 +5254,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:5215: checking for iconv.h" >&5 -+echo "configure:5255: checking for iconv.h" >&5 +-echo "configure:5078: checking for iconv.h" >&5 ++echo "configure:5258: 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 5220 "configure" -+#line 5260 "configure" +-#line 5083 "configure" ++#line 5263 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (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; } +-{ (eval echo configure:5088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5268: \"$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* -@@ -5258,7 +5298,7 @@ +@@ -5121,7 +5301,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 +-echo "configure:5125: checking for i386/MMX support" >&5 ++echo "configure:5305: checking for i386/MMX support" >&5 if test "$mmx" = "yes"; then machine=`uname -m` case $machine in -@@ -5311,12 +5351,12 @@ +@@ -5174,12 +5354,12 @@ for ac_func in snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5315: checking for $ac_func" >&5 -+echo "configure:5355: checking for $ac_func" >&5 +-echo "configure:5178: checking for $ac_func" >&5 ++echo "configure:5358: 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 5320 "configure" -+#line 5360 "configure" +-#line 5183 "configure" ++#line 5363 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5339,7 +5379,7 @@ +@@ -5202,7 +5382,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5386: \"$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 -@@ -5367,12 +5407,12 @@ +@@ -5230,12 +5410,12 @@ for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5371: checking for $ac_func" >&5 -+echo "configure:5411: checking for $ac_func" >&5 +-echo "configure:5234: checking for $ac_func" >&5 ++echo "configure:5414: 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 5376 "configure" -+#line 5416 "configure" +-#line 5239 "configure" ++#line 5419 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5395,7 +5435,7 @@ +@@ -5258,7 +5438,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5442: \"$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 -@@ -5423,12 +5463,12 @@ +@@ -5286,12 +5466,12 @@ for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5427: checking for $ac_func" >&5 -+echo "configure:5467: checking for $ac_func" >&5 +-echo "configure:5290: checking for $ac_func" >&5 ++echo "configure:5470: 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 5432 "configure" -+#line 5472 "configure" +-#line 5295 "configure" ++#line 5475 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5451,7 +5491,7 @@ +@@ -5314,7 +5494,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5498: \"$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 -@@ -5477,12 +5517,12 @@ +@@ -5340,12 +5520,12 @@ echo $ac_n "checking for select""... $ac_c" 1>&6 --echo "configure:5481: checking for select" >&5 -+echo "configure:5521: checking for select" >&5 +-echo "configure:5344: checking for select" >&5 ++echo "configure:5524: 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 5486 "configure" -+#line 5526 "configure" +-#line 5349 "configure" ++#line 5529 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char select(); below. */ -@@ -5505,7 +5545,7 @@ +@@ -5368,7 +5548,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5552: \"$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 -@@ -5523,7 +5563,7 @@ +@@ -5386,7 +5566,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5527: checking for select in -lsocket" >&5 -+echo "configure:5567: checking for select in -lsocket" >&5 +-echo "configure:5390: checking for select in -lsocket" >&5 ++echo "configure:5570: 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 -@@ -5531,7 +5571,7 @@ +@@ -5394,7 +5574,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5535 "configure" -+#line 5575 "configure" +-#line 5398 "configure" ++#line 5578 "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 -@@ -5542,7 +5582,7 @@ +@@ -5405,7 +5585,7 @@ select() ; return 0; } EOF --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 +-if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5589: \"$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 -@@ -5568,7 +5608,7 @@ +@@ -5431,7 +5611,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6 --echo "configure:5572: checking for select in -lnsl" >&5 -+echo "configure:5612: checking for select in -lnsl" >&5 +-echo "configure:5435: checking for select in -lnsl" >&5 ++echo "configure:5615: 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 -@@ -5576,7 +5616,7 @@ +@@ -5439,7 +5619,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5580 "configure" -+#line 5620 "configure" +-#line 5443 "configure" ++#line 5623 "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 -@@ -5587,7 +5627,7 @@ +@@ -5450,7 +5630,7 @@ select() ; return 0; } EOF --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 +-if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5634: \"$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 -@@ -5613,7 +5653,7 @@ +@@ -5476,7 +5656,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -linet""... $ac_c" 1>&6 --echo "configure:5617: checking for select in -linet" >&5 -+echo "configure:5657: checking for select in -linet" >&5 +-echo "configure:5480: checking for select in -linet" >&5 ++echo "configure:5660: 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 -@@ -5621,7 +5661,7 @@ +@@ -5484,7 +5664,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5625 "configure" -+#line 5665 "configure" +-#line 5488 "configure" ++#line 5668 "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 -@@ -5632,7 +5672,7 @@ +@@ -5495,7 +5675,7 @@ select() ; return 0; } EOF --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 +-if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5679: \"$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 -@@ -5658,7 +5698,7 @@ +@@ -5521,7 +5701,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6 --echo "configure:5662: checking for select in -lcposix" >&5 -+echo "configure:5702: checking for select in -lcposix" >&5 +-echo "configure:5525: checking for select in -lcposix" >&5 ++echo "configure:5705: 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 -@@ -5666,7 +5706,7 @@ +@@ -5529,7 +5709,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF --#line 5670 "configure" -+#line 5710 "configure" +-#line 5533 "configure" ++#line 5713 "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 -@@ -5677,7 +5717,7 @@ +@@ -5540,7 +5720,7 @@ select() ; return 0; } EOF --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 +-if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5724: \"$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 -@@ -5703,7 +5743,7 @@ +@@ -5566,7 +5746,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6 --echo "configure:5707: checking for select in -lnet" >&5 -+echo "configure:5747: checking for select in -lnet" >&5 +-echo "configure:5570: checking for select in -lnet" >&5 ++echo "configure:5750: 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 -@@ -5711,7 +5751,7 @@ +@@ -5574,7 +5754,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5715 "configure" -+#line 5755 "configure" +-#line 5578 "configure" ++#line 5758 "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 -@@ -5722,7 +5762,7 @@ +@@ -5585,7 +5765,7 @@ select() ; return 0; } EOF --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 +-if { (eval echo configure:5589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5762,7 +5802,7 @@ +@@ -5625,7 +5805,7 @@ echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5766: checking for select in -lsocket" >&5 -+echo "configure:5806: checking for select in -lsocket" >&5 +-echo "configure:5629: checking for select in -lsocket" >&5 ++echo "configure:5809: 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 -@@ -5770,7 +5810,7 @@ +@@ -5633,7 +5813,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5774 "configure" -+#line 5814 "configure" +-#line 5637 "configure" ++#line 5817 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5781,7 +5821,7 @@ +@@ -5644,7 +5824,7 @@ select() ; return 0; } EOF --if { (eval echo configure:5785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5828: \"$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 -@@ -5810,12 +5850,12 @@ +@@ -5673,12 +5853,12 @@ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:5814: checking for gethostbyname" >&5 -+echo "configure:5854: checking for gethostbyname" >&5 +-echo "configure:5677: checking for gethostbyname" >&5 ++echo "configure:5857: 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 5819 "configure" -+#line 5859 "configure" +-#line 5682 "configure" ++#line 5862 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ -@@ -5838,7 +5878,7 @@ +@@ -5701,7 +5881,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5885: \"$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 -@@ -5856,7 +5896,7 @@ +@@ -5719,7 +5899,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 --echo "configure:5860: checking for gethostbyname in -lresolv" >&5 -+echo "configure:5900: checking for gethostbyname in -lresolv" >&5 +-echo "configure:5723: checking for gethostbyname in -lresolv" >&5 ++echo "configure:5903: 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 -@@ -5864,7 +5904,7 @@ +@@ -5727,7 +5907,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF --#line 5868 "configure" -+#line 5908 "configure" +-#line 5731 "configure" ++#line 5911 "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 -@@ -5875,7 +5915,7 @@ +@@ -5738,7 +5918,7 @@ gethostbyname() ; return 0; } EOF --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 +-if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5922: \"$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 -@@ -5901,7 +5941,7 @@ +@@ -5764,7 +5944,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:5905: checking for gethostbyname in -lnsl" >&5 -+echo "configure:5945: checking for gethostbyname in -lnsl" >&5 +-echo "configure:5768: checking for gethostbyname in -lnsl" >&5 ++echo "configure:5948: 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 -@@ -5909,7 +5949,7 @@ +@@ -5772,7 +5952,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5913 "configure" -+#line 5953 "configure" +-#line 5776 "configure" ++#line 5956 "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 -@@ -5920,7 +5960,7 @@ +@@ -5783,7 +5963,7 @@ gethostbyname() ; return 0; } EOF --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 +-if { (eval echo configure:5787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5953,12 +5993,12 @@ +@@ -5816,12 +5996,12 @@ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 --echo "configure:5957: checking for gethostname" >&5 -+echo "configure:5997: checking for gethostname" >&5 +-echo "configure:5820: checking for gethostname" >&5 ++echo "configure:6000: 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 5962 "configure" -+#line 6002 "configure" +-#line 5825 "configure" ++#line 6005 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ -@@ -5981,7 +6021,7 @@ +@@ -5844,7 +6024,7 @@ ; return 0; } EOF --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 +-if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6028: \"$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 -@@ -5999,7 +6039,7 @@ +@@ -5862,7 +6042,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:6003: checking for gethostname in -lnsl" >&5 -+echo "configure:6043: checking for gethostname in -lnsl" >&5 +-echo "configure:5866: checking for gethostname in -lnsl" >&5 ++echo "configure:6046: 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 -@@ -6007,7 +6047,7 @@ +@@ -5870,7 +6050,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 6011 "configure" -+#line 6051 "configure" +-#line 5874 "configure" ++#line 6054 "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 -@@ -6018,7 +6058,7 @@ +@@ -5881,7 +6061,7 @@ gethostname() ; return 0; } EOF --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 +-if { (eval echo configure:5885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6065: \"$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 -@@ -6060,17 +6100,17 @@ +@@ -5923,17 +6103,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6064: checking for $ac_hdr" >&5 -+echo "configure:6104: checking for $ac_hdr" >&5 +-echo "configure:5927: checking for $ac_hdr" >&5 ++echo "configure:6107: 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 6069 "configure" -+#line 6109 "configure" +-#line 5932 "configure" ++#line 6112 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (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; } +-{ (eval echo configure:5937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6117: \"$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* -@@ -6104,7 +6144,7 @@ +@@ -5961,13 +6141,13 @@ + + + echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 +-echo "configure:5965: checking for socklen_t" >&5 ++echo "configure:6145: 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 5971 "configure" ++#line 6151 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -6002,7 +6182,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:6108: checking for $ac_word" >&5 -+echo "configure:6148: checking for $ac_word" >&5 +-echo "configure:6006: checking for $ac_word" >&5 ++echo "configure:6186: 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 -@@ -6139,7 +6179,7 @@ +@@ -6037,7 +6217,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:6143: checking for $ac_word" >&5 -+echo "configure:6183: checking for $ac_word" >&5 +-echo "configure:6041: checking for $ac_word" >&5 ++echo "configure:6221: 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 -@@ -6174,7 +6214,7 @@ +@@ -6072,7 +6252,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:6178: checking for $ac_word" >&5 -+echo "configure:6218: checking for $ac_word" >&5 +-echo "configure:6076: checking for $ac_word" >&5 ++echo "configure:6256: 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 -@@ -6207,6 +6247,7 @@ +@@ -6105,6 +6285,7 @@ fi @@ -818,11 +2901,141 @@ $NetBSD: patch-ab,v 1.4 2002/01/16 14:59:39 tron Exp $ if test "_$trpath" != _; then if test "_$sortpath" != _; then if test "_$uniqpath" != _; then -@@ -6219,6 +6260,7 @@ - GUI_CFLAGS=`cat cflags` - rm -f cflags cflags2 - -+fi +@@ -6120,6 +6301,7 @@ fi fi fi ++fi + + + +@@ -6282,33 +6464,28 @@ + s%@CC@%$CC%g + s%@RANLIB@%$RANLIB%g + s%@CPP@%$CPP%g +-s%@host@%$host%g +-s%@host_alias@%$host_alias%g +-s%@host_cpu@%$host_cpu%g +-s%@host_vendor@%$host_vendor%g +-s%@host_os@%$host_os%g + s%@ALLOCA@%$ALLOCA%g +-s%@GLIBC21@%$GLIBC21%g +-s%@LIBICONV@%$LIBICONV%g + s%@USE_NLS@%$USE_NLS%g + s%@MSGFMT@%$MSGFMT%g + s%@GMSGFMT@%$GMSGFMT%g + s%@XGETTEXT@%$XGETTEXT%g +-s%@INTLBISON@%$INTLBISON%g +-s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g ++s%@GENCAT@%$GENCAT%g + s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g + s%@CATALOGS@%$CATALOGS%g + s%@CATOBJEXT@%$CATOBJEXT%g ++s%@DATADIRNAME@%$DATADIRNAME%g + s%@GMOFILES@%$GMOFILES%g ++s%@INSTOBJEXT@%$INSTOBJEXT%g ++s%@INTLDEPS@%$INTLDEPS%g + s%@INTLLIBS@%$INTLLIBS%g + s%@INTLOBJS@%$INTLOBJS%g + s%@POFILES@%$POFILES%g + s%@POSUB@%$POSUB%g +-s%@DATADIRNAME@%$DATADIRNAME%g +-s%@INSTOBJEXT@%$INSTOBJEXT%g +-s%@GENCAT@%$GENCAT%g ++s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g ++s%@GT_NO@%$GT_NO%g ++s%@GT_YES@%$GT_YES%g + s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g +-s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g ++s%@l@%$l%g + s%@sedpath@%$sedpath%g + s%@unamepath@%$unamepath%g + s%@GLIB_CONFIG@%$GLIB_CONFIG%g +@@ -6563,6 +6740,51 @@ + fi; done + + EOF ++ ++cat >> $CONFIG_STATUS <<EOF ++ac_sources="$nls_cv_header_libgt" ++ac_dests="$nls_cv_header_intl" ++EOF ++ ++cat >> $CONFIG_STATUS <<\EOF ++srcdir=$ac_given_srcdir ++while test -n "$ac_sources"; do ++ set $ac_dests; ac_dest=$1; shift; ac_dests=$* ++ set $ac_sources; ac_source=$1; shift; ac_sources=$* ++ ++ echo "linking $srcdir/$ac_source to $ac_dest" ++ ++ if test ! -r $srcdir/$ac_source; then ++ { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } ++ fi ++ rm -f $ac_dest ++ ++ # Make relative symlinks. ++ # Remove last slash and all that follows it. Not all systems have dirname. ++ ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` ++ if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then ++ # The dest file is in a subdirectory. ++ test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" ++ ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" ++ # A "../" for each directory in $ac_dest_dir_suffix. ++ ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` ++ else ++ ac_dest_dir_suffix= ac_dots= ++ fi ++ ++ case "$srcdir" in ++ [/$]*) ac_rel_source="$srcdir/$ac_source" ;; ++ *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; ++ esac ++ ++ # Make a symlink if possible; otherwise try a hard link. ++ if ln -s $ac_rel_source $ac_dest 2>/dev/null || ++ ln $srcdir/$ac_source $ac_dest; then : ++ else ++ { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } ++ fi ++done ++EOF + cat >> $CONFIG_STATUS <<EOF + + +@@ -6570,32 +6792,9 @@ + EOF + cat >> $CONFIG_STATUS <<\EOF + test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h +-for ac_file in $CONFIG_FILES; do +- # Support "outfile[:infile[:infile...]]" +- case "$ac_file" in +- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- esac +- # PO directories have a Makefile.in generated from Makefile.in.in. +- case "$ac_file" in */Makefile.in) +- # Adjust a relative srcdir. +- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` +- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" +- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` +- case "$ac_given_srcdir" in +- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; +- /*) top_srcdir="$ac_given_srcdir" ;; +- *) top_srcdir="$ac_dots$ac_given_srcdir" ;; +- esac +- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then +- rm -f "$ac_dir/POTFILES" +- echo creating "$ac_dir/POTFILES" +- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" +- echo creating "$ac_dir/Makefile" +- sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" +- fi +- ;; +- esac +- done ++case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac + + exit 0 + EOF |