summaryrefslogtreecommitdiff
path: root/mail/balsa
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-08-19 21:06:47 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-08-19 21:06:47 +0000
commit1a61d7a32b7602c517b9b2e380c301856b14a6ad (patch)
tree2c3a1e88234188bd39224a41b0d51bd6c4d17953 /mail/balsa
parent. Synchronise with jdk13 Makefile as much as possible to reduce (diff)
Update to 1.4.0.
Notes
Notes: svn path=/head/; revision=64674
Diffstat (limited to 'mail/balsa')
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/balsa/distinfo2
-rw-r--r--mail/balsa/files/patch-configure4650
-rw-r--r--mail/balsa/pkg-plist1
4 files changed, 52 insertions, 4605 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index acd19e749104..0a14727fa97b 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= balsa
-PORTVERSION= 1.3.7
+PORTVERSION= 1.4.0
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \
ftp://ftp.newton.cx/pub/balsa/
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-threads \
--disable-more-warnings \
--with-ssl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib -liconv -lintl"
+ LIBS="-L${LOCALBASE}/lib -liconv"
MAN1= balsa.1
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index e4c935ebb01b..db66d7caf0ca 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.3.7.tar.bz2) = 8c074e4f5ebd11bab1411fef228c88b4
+MD5 (balsa-1.4.0.tar.bz2) = e219438bc10e92760b501c3d1dd87603
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index a9b2c0202772..6da3e430d3c7 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,1327 +1,6 @@
-This patch is so large because it was generated by autoconf213 to fix a problem
-where libintl support was ommitted. This configure.in patch came from balsa
-CVS, so it should be in the next version. After it's released, this patch
-can be consolidated down balsa-1.3.6's patch-configure.
-
---- configure.orig Thu Aug 8 08:21:03 2002
-+++ configure Sat Aug 10 03:04:36 2002
-@@ -225,6 +225,18 @@
- --with-gss Enable GSS [default=no]"
- ac_help="$ac_help
- --enable-more-warnings Enable maximum compiler warnings [default=yes]"
-+ac_help="$ac_help
-+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
-+ac_help="$ac_help
-+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
-+ --without-libiconv-prefix don't search for libiconv in includedir and libdir"
-+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-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
-+ --without-libintl-prefix don't search for libintl in includedir and libdir"
-
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -242,6 +254,7 @@
- program_transform_name=s,x,x,
- silent=
- site=
-+sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -356,6 +369,7 @@
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
-+ --site-file=FILE use FILE as the site file
- --version print the version of autoconf that created configure
- Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
-@@ -526,6 +540,11 @@
- -site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
-
-+ -site-file | --site-file | --site-fil | --site-fi | --site-f)
-+ ac_prev=sitefile ;;
-+ -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-+ sitefile="$ac_optarg" ;;
-+
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -691,12 +710,16 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+if test -z "$sitefile"; then
-+ if test -z "$CONFIG_SITE"; then
-+ if test "x$prefix" != xNONE; then
-+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ else
-+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ fi
- fi
-+else
-+ CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
-@@ -734,6 +757,102 @@
- ac_n= ac_c='\c' ac_t=
- fi
-
-+# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
-+ withval="$with_gnu_ld"
-+ test "$withval" = no || with_gnu_ld=yes
-+else
-+ with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-+echo "configure:773: checking for ld used by GCC" >&5
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [\\/]* | [A-Za-z]:[\\/]*)
-+ re_direlt='/[^/][^/]*/\.\./'
-+ # Canonicalize the path of ld
-+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-+echo "configure:803: checking for GNU ld" >&5
-+else
-+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-+echo "configure:806: checking for non-GNU ld" >&5
-+fi
-+if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -z "$LD"; then
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+ for ac_dir in $PATH; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ acl_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+ test "$with_gnu_ld" != no && break
-+ else
-+ test "$with_gnu_ld" != yes && break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+else
-+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$acl_cv_path_LD"
-+if test -n "$LD"; then
-+ echo "$ac_t""$LD" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-+echo "configure:841: checking if the linker ($LD) is GNU ld" >&5
-+if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+ acl_cv_prog_gnu_ld=yes
-+else
-+ acl_cv_prog_gnu_ld=no
-+fi
-+fi
-+
-+echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
-+with_gnu_ld=$acl_cv_prog_gnu_ld
-+
-+
-
-
-
-@@ -784,7 +903,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:788: checking for a BSD compatible install" >&5
-+echo "configure:907: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -837,7 +956,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:841: checking whether build environment is sane" >&5
-+echo "configure:960: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -894,7 +1013,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:898: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1017: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -940,7 +1059,7 @@
-
- missing_dir=`cd $ac_aux_dir && pwd`
- echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:944: checking for working aclocal" >&5
-+echo "configure:1063: checking for working aclocal" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -953,7 +1072,7 @@
- fi
-
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:957: checking for working autoconf" >&5
-+echo "configure:1076: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -966,7 +1085,7 @@
- fi
-
- echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:970: checking for working automake" >&5
-+echo "configure:1089: checking for working automake" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -979,7 +1098,7 @@
- fi
-
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:983: checking for working autoheader" >&5
-+echo "configure:1102: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -992,7 +1111,7 @@
- fi
-
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:996: checking for working makeinfo" >&5
-+echo "configure:1115: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -1008,7 +1127,7 @@
-
-
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:1012: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:1131: checking whether to enable maintainer-specific portions of Makefiles" >&5
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
-@@ -1101,7 +1220,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:1105: checking for $ac_word" >&5
-+echo "configure:1224: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1138,7 +1257,7 @@
- no_gnome_config="yes"
- else
- echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
--echo "configure:1142: checking if $GNOME_CONFIG works" >&5
-+echo "configure:1261: checking if $GNOME_CONFIG works" >&5
- if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
- echo "$ac_t""yes" 1>&6
-
-@@ -1146,7 +1265,7 @@
- # Extract the first word of "orbit-config", so it can be a program name with args.
- set dummy orbit-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1150: checking for $ac_word" >&5
-+echo "configure:1269: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1182,7 +1301,7 @@
- # Extract the first word of "orbit-idl", so it can be a program name with args.
- set dummy orbit-idl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1186: checking for $ac_word" >&5
-+echo "configure:1305: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_ORBIT_IDL'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1216,7 +1335,7 @@
- fi
-
- echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6
--echo "configure:1220: checking for working ORBit environment" >&5
-+echo "configure:1339: checking for working ORBit environment" >&5
- if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1252,7 +1371,7 @@
- fi
-
- echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6
--echo "configure:1256: checking for gnorba libraries" >&5
-+echo "configure:1375: checking for gnorba libraries" >&5
- if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1316,7 +1435,7 @@
-
- if test "$no_gnome_config" = "yes"; then
- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1320: checking for gnomeConf.sh file in $gnome_prefix" >&5
-+echo "configure:1439: checking for gnomeConf.sh file in $gnome_prefix" >&5
- if test -f $gnome_prefix/gnomeConf.sh; then
- echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from" \
-@@ -1336,7 +1455,7 @@
- n=""
- for i in $n; do
- echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6
--echo "configure:1340: checking extra library \"$i\"" >&5
-+echo "configure:1459: checking extra library \"$i\"" >&5
- case $i in
- applets)
-
-@@ -1363,7 +1482,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1367: checking for $ac_word" >&5
-+echo "configure:1486: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1393,7 +1512,7 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1397: checking for $ac_word" >&5
-+echo "configure:1516: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1444,7 +1563,7 @@
- # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1448: checking for $ac_word" >&5
-+echo "configure:1567: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1476,7 +1595,7 @@
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1480: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1599: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1487,12 +1606,12 @@
-
- cat > conftest.$ac_ext << EOF
-
--#line 1491 "configure"
-+#line 1610 "configure"
- #include "confdefs.h"
-
- main(){return(0);}
- EOF
--if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -1518,12 +1637,12 @@
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1522: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1641: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1527: checking whether we are using GNU C" >&5
-+echo "configure:1646: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1532,7 +1651,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -1551,7 +1670,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1555: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1674: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1584,7 +1703,7 @@
-
-
- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
--echo "configure:1588: checking for strerror in -lcposix" >&5
-+echo "configure:1707: 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
-@@ -1592,7 +1711,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcposix $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1596 "configure"
-+#line 1715 "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
-@@ -1603,7 +1722,7 @@
- strerror()
- ; return 0; }
- EOF
--if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1726: \"$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
-@@ -1626,7 +1745,7 @@
-
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1630: checking how to run the C preprocessor" >&5
-+echo "configure:1749: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -1641,13 +1760,13 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 1645 "configure"
-+#line 1764 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1770: \"$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
- :
-@@ -1658,13 +1777,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 1662 "configure"
-+#line 1781 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1787: \"$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
- :
-@@ -1675,13 +1794,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
--#line 1679 "configure"
-+#line 1798 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1804: \"$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
- :
-@@ -1706,12 +1825,12 @@
- echo "$ac_t""$CPP" 1>&6
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1710: checking for ANSI C header files" >&5
-+echo "configure:1829: 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 1715 "configure"
-+#line 1834 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1719,7 +1838,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1842: \"$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*
-@@ -1736,7 +1855,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 1740 "configure"
-+#line 1859 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1754,7 +1873,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 1758 "configure"
-+#line 1877 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1775,7 +1894,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1779 "configure"
-+#line 1898 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1786,7 +1905,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1814,7 +1933,7 @@
- # 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:1818: checking for $ac_word" >&5
-+echo "configure:1937: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1856,12 +1975,12 @@
- fi
-
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:1860: checking for Cygwin environment" >&5
-+echo "configure:1979: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1865 "configure"
-+#line 1984 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -1872,7 +1991,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_cygwin=yes
- else
-@@ -1889,19 +2008,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:1893: checking for mingw32 environment" >&5
-+echo "configure:2012: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1898 "configure"
-+#line 2017 "configure"
- #include "confdefs.h"
-
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_mingw32=yes
- else
-@@ -1993,7 +2112,7 @@
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1997: checking host system type" >&5
-+echo "configure:2116: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
-@@ -2014,7 +2133,7 @@
- echo "$ac_t""$host" 1>&6
-
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:2018: checking build system type" >&5
-+echo "configure:2137: checking build system type" >&5
-
- build_alias=$build
- case "$build_alias" in
-@@ -2043,7 +2162,7 @@
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
--echo "configure:2047: checking for ld used by GCC" >&5
-+echo "configure:2166: checking for ld used by GCC" >&5
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -2073,10 +2192,10 @@
- esac
- elif test "$with_gnu_ld" = yes; then
- echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:2077: checking for GNU ld" >&5
-+echo "configure:2196: checking for GNU ld" >&5
- else
- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:2080: checking for non-GNU ld" >&5
-+echo "configure:2199: checking for non-GNU ld" >&5
- fi
- if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2111,7 +2230,7 @@
- fi
- test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
- echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
--echo "configure:2115: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:2234: checking if the linker ($LD) is GNU ld" >&5
- if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2128,7 +2247,7 @@
-
-
- echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
--echo "configure:2132: checking for $LD option to reload object files" >&5
-+echo "configure:2251: checking for $LD option to reload object files" >&5
- if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2140,7 +2259,7 @@
- test -n "$reload_flag" && reload_flag=" $reload_flag"
-
- echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:2144: checking for BSD-compatible nm" >&5
-+echo "configure:2263: checking for BSD-compatible nm" >&5
- if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2178,7 +2297,7 @@
- echo "$ac_t""$NM" 1>&6
-
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:2182: checking whether ln -s works" >&5
-+echo "configure:2301: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2199,7 +2318,7 @@
- fi
-
- echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
--echo "configure:2203: checking how to recognise dependant libraries" >&5
-+echo "configure:2322: checking how to recognise dependant libraries" >&5
- if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2382,13 +2501,13 @@
- deplibs_check_method=$lt_cv_deplibs_check_method
-
- echo $ac_n "checking for object suffix""... $ac_c" 1>&6
--echo "configure:2386: checking for object suffix" >&5
-+echo "configure:2505: checking for object suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- rm -f conftest*
- echo 'int i = 1;' > conftest.$ac_ext
--if { (eval echo configure:2392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- for ac_file in conftest.*; do
- case $ac_file in
- *.c) ;;
-@@ -2408,7 +2527,7 @@
-
-
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:2412: checking for executable suffix" >&5
-+echo "configure:2531: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2418,10 +2537,10 @@
- rm -f conftest*
- echo 'int main () { return 0; }' > conftest.$ac_ext
- ac_cv_exeext=
-- if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+ if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- for file in conftest.*; do
- case $file in
-- *.c | *.o | *.obj) ;;
-+ *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
- *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
- esac
- done
-@@ -2449,7 +2568,7 @@
-
- # Check for command to grab the raw symbol name followed by C symbol from nm.
- echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
--echo "configure:2453: checking command to parse $NM output" >&5
-+echo "configure:2572: checking command to parse $NM output" >&5
- if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2529,10 +2648,10 @@
- int main(){nm_test_var='a';nm_test_func();return(0);}
- EOF
-
-- if { (eval echo configure:2533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ if { (eval echo configure:2652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
-- if { (eval echo configure:2536: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
-+ if { (eval echo configure:2655: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
-@@ -2583,7 +2702,7 @@
- save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$no_builtin_flag"
-- if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+ if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- pipe_works=yes
- fi
- LIBS="$save_LIBS"
-@@ -2632,17 +2751,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2636: checking for $ac_hdr" >&5
-+echo "configure:2755: 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 2641 "configure"
-+#line 2760 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2765: \"$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*
-@@ -2677,7 +2796,7 @@
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
--echo "configure:2681: checking for ${ac_tool_prefix}file" >&5
-+echo "configure:2800: checking for ${ac_tool_prefix}file" >&5
- if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2739,7 +2858,7 @@
- if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- echo $ac_n "checking for file""... $ac_c" 1>&6
--echo "configure:2743: checking for file" >&5
-+echo "configure:2862: checking for file" >&5
- if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2810,7 +2929,7 @@
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2814: checking for $ac_word" >&5
-+echo "configure:2933: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2842,7 +2961,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2846: checking for $ac_word" >&5
-+echo "configure:2965: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2877,7 +2996,7 @@
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2881: checking for $ac_word" >&5
-+echo "configure:3000: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2909,7 +3028,7 @@
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2913: checking for $ac_word" >&5
-+echo "configure:3032: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2958,8 +3077,8 @@
- case $host in
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 2962 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 3081 "configure"' > conftest.$ac_ext
-+ if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
-@@ -2980,7 +3099,7 @@
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:2984: checking whether the C compiler needs -belf" >&5
-+echo "configure:3103: checking whether the C compiler needs -belf" >&5
- if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2993,14 +3112,14 @@
- cross_compiling=$ac_cv_prog_cc_cross
-
- cat > conftest.$ac_ext <<EOF
--#line 2997 "configure"
-+#line 3116 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- lt_cv_cc_needs_belf=yes
- else
-@@ -3120,7 +3239,7 @@
- compiler="$2"
-
- echo $ac_n "checking for objdir""... $ac_c" 1>&6
--echo "configure:3124: checking for objdir" >&5
-+echo "configure:3243: checking for objdir" >&5
- rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
- if test -d .libs; then
-@@ -3147,7 +3266,7 @@
- # in isolation, and that seeing it set (from the cache) indicates that
- # the associated values are set (in the cache) correctly too.
- echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
--echo "configure:3151: checking for $compiler option to produce PIC" >&5
-+echo "configure:3270: checking for $compiler option to produce PIC" >&5
- if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3299,21 +3418,21 @@
-
- # Check to make sure the pic_flag actually works.
- echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
--echo "configure:3303: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-+echo "configure:3422: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
- if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
- cat > conftest.$ac_ext <<EOF
--#line 3310 "configure"
-+#line 3429 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- case $host_os in
- hpux9* | hpux10* | hpux11*)
-@@ -3365,7 +3484,7 @@
- fi
-
- echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
--echo "configure:3369: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-+echo "configure:3488: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
- if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3373,14 +3492,14 @@
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
- cat > conftest.$ac_ext <<EOF
--#line 3377 "configure"
-+#line 3496 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- lt_cv_prog_cc_static_works=yes
- else
-@@ -3407,7 +3526,7 @@
-
- # Check to see if options -o and -c are simultaneously supported by compiler
- echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
--echo "configure:3411: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo "configure:3530: checking if $compiler supports -c -o file.$ac_objext" >&5
- if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3426,7 +3545,7 @@
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
- compiler_c_o=no
--if { (eval echo configure:3430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+if { (eval echo configure:3549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s out/conftest.err; then
-@@ -3455,7 +3574,7 @@
- if test x"$compiler_c_o" = x"yes"; then
- # Check to see if we can write to a .lo
- echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
--echo "configure:3459: checking if $compiler supports -c -o file.lo" >&5
-+echo "configure:3578: checking if $compiler supports -c -o file.lo" >&5
- if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3466,14 +3585,14 @@
- save_objext="$ac_objext"
- ac_objext=lo
- cat > conftest.$ac_ext <<EOF
--#line 3470 "configure"
-+#line 3589 "configure"
- #include "confdefs.h"
-
- int main() {
- int some_variable = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:3477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -3504,7 +3623,7 @@
- if test "$compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
--echo "configure:3508: checking if we can lock with hard links" >&5
-+echo "configure:3627: checking if we can lock with hard links" >&5
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-@@ -3523,20 +3642,20 @@
- if test "$GCC" = yes; then
- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
- echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
--echo "configure:3527: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo "configure:3646: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- echo "int some_variable = 0;" > conftest.$ac_ext
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
- compiler_rtti_exceptions=no
- cat > conftest.$ac_ext <<EOF
--#line 3533 "configure"
-+#line 3652 "configure"
- #include "confdefs.h"
-
- int main() {
- int some_variable = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:3540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -3563,7 +3682,7 @@
-
- # See if the linker supports building shared libraries.
- echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
--echo "configure:3567: checking whether the linker ($LD) supports shared libraries" >&5
-+echo "configure:3686: checking whether the linker ($LD) supports shared libraries" >&5
-
- allow_undefined_flag=
- no_undefined_flag=
-@@ -4247,7 +4366,7 @@
-
- # Check hardcoding attributes.
- echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
--echo "configure:4251: checking how to hardcode library paths into programs" >&5
-+echo "configure:4370: checking how to hardcode library paths into programs" >&5
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var"; then
-@@ -4275,7 +4394,7 @@
- striplib=
- old_striplib=
- echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
--echo "configure:4279: checking whether stripping libraries is possible" >&5
-+echo "configure:4398: checking whether stripping libraries is possible" >&5
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-@@ -4289,7 +4408,7 @@
-
- # PORTME Fill in your ld.so characteristics
- echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
--echo "configure:4293: checking dynamic linker characteristics" >&5
-+echo "configure:4412: checking dynamic linker characteristics" >&5
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -4686,11 +4805,11 @@
-
- # Report the final consequences.
- echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
--echo "configure:4690: checking if libtool supports shared libraries" >&5
-+echo "configure:4809: checking if libtool supports shared libraries" >&5
- echo "$ac_t""$can_build_shared" 1>&6
-
- echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
--echo "configure:4694: checking whether to build shared libraries" >&5
-+echo "configure:4813: checking whether to build shared libraries" >&5
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -4713,7 +4832,7 @@
- echo "$ac_t""$enable_shared" 1>&6
-
- echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
--echo "configure:4717: checking whether to build static libraries" >&5
-+echo "configure:4836: checking whether to build static libraries" >&5
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- echo "$ac_t""$enable_static" 1>&6
-@@ -4754,12 +4873,12 @@
-
- *)
- echo $ac_n "checking for shl_load""... $ac_c" 1>&6
--echo "configure:4758: checking for shl_load" >&5
-+echo "configure:4877: checking for shl_load" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4763 "configure"
-+#line 4882 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load(); below. */
-@@ -4782,7 +4901,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_shl_load=yes"
- else
-@@ -4800,7 +4919,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:4804: checking for shl_load in -ldld" >&5
-+echo "configure:4923: checking for shl_load in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4808,7 +4927,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4812 "configure"
-+#line 4931 "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
-@@ -4819,7 +4938,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4942: \"$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
-@@ -4838,12 +4957,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:4842: checking for dlopen" >&5
-+echo "configure:4961: checking for dlopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4847 "configure"
-+#line 4966 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen(); below. */
-@@ -4866,7 +4985,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_dlopen=yes"
- else
-@@ -4884,7 +5003,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:4888: checking for dlopen in -ldl" >&5
-+echo "configure:5007: 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
-@@ -4892,7 +5011,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4896 "configure"
-+#line 5015 "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
-@@ -4903,7 +5022,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5026: \"$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
-@@ -4922,7 +5041,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
--echo "configure:4926: checking for dlopen in -lsvld" >&5
-+echo "configure:5045: checking for dlopen in -lsvld" >&5
- ac_lib_var=`echo svld'_'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
-@@ -4930,7 +5049,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsvld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4934 "configure"
-+#line 5053 "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
-@@ -4941,7 +5060,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:4945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5064: \"$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
-@@ -4960,7 +5079,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
--echo "configure:4964: checking for dld_link in -ldld" >&5
-+echo "configure:5083: checking for dld_link in -ldld" >&5
- ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4968,7 +5087,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4972 "configure"
-+#line 5091 "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
-@@ -4979,7 +5098,7 @@
- dld_link()
- ; return 0; }
- EOF
--if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5102: \"$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
-@@ -5035,7 +5154,7 @@
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
--echo "configure:5039: checking whether a program can dlopen itself" >&5
-+echo "configure:5158: checking whether a program can dlopen itself" >&5
- if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5045,7 +5164,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 5049 "configure"
-+#line 5168 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -5106,7 +5225,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
-@@ -5129,7 +5248,7 @@
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
--echo "configure:5133: checking whether a statically linked program can dlopen itself" >&5
-+echo "configure:5252: checking whether a statically linked program can dlopen itself" >&5
- if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5139,7 +5258,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 5143 "configure"
-+#line 5262 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -5200,7 +5319,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:5204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
-@@ -5249,14 +5368,14 @@
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
--echo "configure:5253: checking whether -lc should be explicitly linked in" >&5
-+echo "configure:5372: checking whether -lc should be explicitly linked in" >&5
- if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- $rm conftest*
- echo 'static int dummy;' > conftest.$ac_ext
-
-- if { (eval echo configure:5260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ if { (eval echo configure:5379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
-@@ -5269,7 +5388,7 @@
- libname=conftest
- save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
-- if { (eval echo configure:5273: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+ if { (eval echo configure:5392: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
- then
- lt_cv_archive_cmds_need_lc=no
- else
-@@ -5843,6 +5962,7 @@
+--- configure.orig Mon Aug 19 14:05:07 2002
++++ configure Mon Aug 19 16:55:27 2002
+@@ -5951,6 +5951,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -1329,563 +8,61 @@ can be consolidated down balsa-1.3.6's patch-configure.
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5904,7 +6024,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:5908: checking for $ac_word" >&5
-+echo "configure:6027: 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
-@@ -5939,7 +6059,7 @@
-
- min_glib_version=1.2.0
- echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
--echo "configure:5943: checking for GLIB - version >= $min_glib_version" >&5
-+echo "configure:6062: checking for GLIB - version >= $min_glib_version" >&5
- no_glib=""
- if test "$GLIB_CONFIG" = "no" ; then
- no_glib=yes
-@@ -5962,7 +6082,7 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat > conftest.$ac_ext <<EOF
--#line 5966 "configure"
-+#line 6085 "configure"
- #include "confdefs.h"
-
- #include <glib.h>
-@@ -6038,7 +6158,7 @@
- }
-
- EOF
--if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -6072,7 +6192,7 @@
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6076 "configure"
-+#line 6195 "configure"
- #include "confdefs.h"
-
- #include <glib.h>
-@@ -6082,7 +6202,7 @@
- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
- ; return 0; }
- EOF
--if { (eval echo configure:6086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6205: \"$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"
-@@ -6126,7 +6246,7 @@
-
- PTHREAD_LIB=""
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:6130: checking for pthread_create in -lpthread" >&5
-+echo "configure:6249: 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
-@@ -6134,7 +6254,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpthread $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6138 "configure"
-+#line 6257 "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
-@@ -6145,7 +6265,7 @@
- pthread_create()
- ; return 0; }
- EOF
--if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6268: \"$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
-@@ -6164,7 +6284,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
--echo "configure:6168: checking for pthread_create in -lpthreads" >&5
-+echo "configure:6287: checking for pthread_create in -lpthreads" >&5
- ac_lib_var=`echo pthreads'_'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
-@@ -6172,7 +6292,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpthreads $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6176 "configure"
-+#line 6295 "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
-@@ -6183,7 +6303,7 @@
- pthread_create()
- ; return 0; }
- EOF
--if { (eval echo configure:6187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6306: \"$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
-@@ -6202,7 +6322,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:6206: checking for pthread_create in -lc_r" >&5
-+echo "configure:6325: checking for pthread_create in -lc_r" >&5
- ac_lib_var=`echo c_r'_'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
-@@ -6210,7 +6330,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lc_r $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6214 "configure"
-+#line 6333 "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
-@@ -6221,7 +6341,7 @@
- pthread_create()
- ; return 0; }
- EOF
--if { (eval echo configure:6225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6344: \"$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
-@@ -6240,7 +6360,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __pthread_attr_init_system in -lpthread""... $ac_c" 1>&6
--echo "configure:6244: checking for __pthread_attr_init_system in -lpthread" >&5
-+echo "configure:6363: checking for __pthread_attr_init_system in -lpthread" >&5
- ac_lib_var=`echo pthread'_'__pthread_attr_init_system | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6248,7 +6368,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpthread $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6252 "configure"
-+#line 6371 "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
-@@ -6259,7 +6379,7 @@
- __pthread_attr_init_system()
- ; return 0; }
- EOF
--if { (eval echo configure:6263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6382: \"$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
-@@ -6278,12 +6398,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
--echo "configure:6282: checking for pthread_create" >&5
-+echo "configure:6401: checking for pthread_create" >&5
- if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6287 "configure"
-+#line 6406 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pthread_create(); below. */
-@@ -6306,7 +6426,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:6310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_pthread_create=yes"
- else
-@@ -6391,7 +6511,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:6395: checking for $ac_word" >&5
-+echo "configure:6514: 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
-@@ -6426,7 +6546,7 @@
-
- min_gtk_version=1.2.0
- echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
--echo "configure:6430: checking for GTK - version >= $min_gtk_version" >&5
-+echo "configure:6549: checking for GTK - version >= $min_gtk_version" >&5
- no_gtk=""
- if test "$GTK_CONFIG" = "no" ; then
- no_gtk=yes
-@@ -6449,7 +6569,7 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat > conftest.$ac_ext <<EOF
--#line 6453 "configure"
-+#line 6572 "configure"
- #include "confdefs.h"
-
- #include <gtk/gtk.h>
-@@ -6527,7 +6647,7 @@
- }
-
- EOF
--if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -6561,7 +6681,7 @@
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6565 "configure"
-+#line 6684 "configure"
- #include "confdefs.h"
-
- #include <gtk/gtk.h>
-@@ -6571,7 +6691,7 @@
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
- ; return 0; }
- EOF
--if { (eval echo configure:6575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6694: \"$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"
-@@ -6630,7 +6750,7 @@
- ;;
- *)
- echo $ac_n "checking for SmcSaveYourselfDone in -lSM""... $ac_c" 1>&6
--echo "configure:6634: checking for SmcSaveYourselfDone in -lSM" >&5
-+echo "configure:6753: checking for SmcSaveYourselfDone in -lSM" >&5
- ac_lib_var=`echo SM'_'SmcSaveYourselfDone | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6638,7 +6758,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lSM $x_libs -lICE $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6642 "configure"
-+#line 6761 "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
-@@ -6649,7 +6769,7 @@
- SmcSaveYourselfDone()
- ; return 0; }
- EOF
--if { (eval echo configure:6653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6772: \"$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
-@@ -6678,17 +6798,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6682: checking for $ac_hdr" >&5
-+echo "configure:6801: 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 6687 "configure"
-+#line 6806 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6811: \"$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*
-@@ -6726,7 +6846,7 @@
-
- XPM_LIBS=""
- echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
--echo "configure:6730: checking for XpmFreeXpmImage in -lXpm" >&5
-+echo "configure:6849: checking for XpmFreeXpmImage in -lXpm" >&5
- ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6734,7 +6854,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lXpm $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6738 "configure"
-+#line 6857 "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
-@@ -6745,7 +6865,7 @@
- XpmFreeXpmImage()
- ; return 0; }
- EOF
--if { (eval echo configure:6749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6868: \"$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
-@@ -6774,7 +6894,7 @@
-
-
- echo $ac_n "checking for new_pspell_manager in -lpspell""... $ac_c" 1>&6
--echo "configure:6778: checking for new_pspell_manager in -lpspell" >&5
-+echo "configure:6897: checking for new_pspell_manager in -lpspell" >&5
- ac_lib_var=`echo pspell'_'new_pspell_manager | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6782,7 +6902,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6786 "configure"
-+#line 6905 "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
-@@ -6793,7 +6913,7 @@
- new_pspell_manager()
- ; return 0; }
- EOF
--if { (eval echo configure:6797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6916: \"$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
-@@ -6830,7 +6950,7 @@
-
-
- echo $ac_n "checking for gnome-libs version >= 1.2.13""... $ac_c" 1>&6
--echo "configure:6834: checking for gnome-libs version >= 1.2.13" >&5
-+echo "configure:6953: checking for gnome-libs version >= 1.2.13" >&5
- vers=`gnome-config --version gnome-libs | sed 's/^gnome-libs //'`
- case $vers in
- 1.0.*|1.2.0-9)
-@@ -6847,17 +6967,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6851: checking for $ac_hdr" >&5
-+echo "configure:6970: 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 6856 "configure"
-+#line 6975 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6980: \"$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*
-@@ -6889,17 +7009,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6893: checking for $ac_hdr" >&5
-+echo "configure:7012: 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 6898 "configure"
-+#line 7017 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7022: \"$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*
-@@ -6935,7 +7055,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:6939: checking for $ac_word" >&5
-+echo "configure:7058: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6972,7 +7092,7 @@
- echo "$ac_t""gnome-config is missing" 1>&6
- else
- echo $ac_n "checking for GNOME-PRINT - version >= $min_version""... $ac_c" 1>&6
--echo "configure:6976: checking for GNOME-PRINT - version >= $min_version" >&5
-+echo "configure:7095: checking for GNOME-PRINT - version >= $min_version" >&5
- if `$GNOME_CONFIG --libs print > /dev/null 2>&1`; then
- rqmajor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
- rqminor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
-@@ -7052,7 +7172,7 @@
-
-
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:7056: checking for crypt in -lcrypt" >&5
-+echo "configure:7175: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7060,7 +7180,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7064 "configure"
-+#line 7183 "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
-@@ -7071,7 +7191,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7194: \"$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
-@@ -7101,16 +7221,16 @@
-
-
- echo $ac_n "checking for isblank""... $ac_c" 1>&6
--echo "configure:7105: checking for isblank" >&5
-+echo "configure:7224: checking for isblank" >&5
- cat > conftest.$ac_ext <<EOF
--#line 7107 "configure"
-+#line 7226 "configure"
- #include "confdefs.h"
- #include <ctype.h>
+@@ -8920,7 +8921,7 @@
+ extern int *_nl_domain_bindings;
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+ ; return 0; }
+ EOF
+ if { (eval echo configure:8927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9306,7 +9307,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -9314,7 +9315,7 @@
+ const char *_nl_expand_alias ();
int main() {
- return isblank('a');
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:9321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9334,7 +9335,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -9342,7 +9343,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0)
; return 0; }
EOF
--if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- echo "$ac_t""yes" 1>&6
- else
-@@ -7151,7 +7271,7 @@
-
-
- echo $ac_n "checking whether to use threads""... $ac_c" 1>&6
--echo "configure:7155: checking whether to use threads" >&5
-+echo "configure:7274: checking whether to use threads" >&5
- if test x"$use_threads" = xyes ; then
- echo "$ac_t""yes" 1>&6
- if test ! -z `$GLIB_CONFIG --help 2>&1 |grep 'gthread'` ; then
-@@ -7180,11 +7300,11 @@
-
-
- echo $ac_n "checking whether to use Gnome-VFS""... $ac_c" 1>&6
--echo "configure:7184: checking whether to use Gnome-VFS" >&5
-+echo "configure:7303: checking whether to use Gnome-VFS" >&5
- if test x"$use_gnome_vfs" = xyes ; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking whether Gnome-VFS is available""... $ac_c" 1>&6
--echo "configure:7188: checking whether Gnome-VFS is available" >&5
-+echo "configure:7307: checking whether Gnome-VFS is available" >&5
- if gnome-config --libs vfs > /dev/null 2>&1; then
- echo "$ac_t""yes" 1>&6
- gnome_libs="$gnome_libs vfs oaf"
-@@ -7204,7 +7324,7 @@
- fi
-
- echo $ac_n "checking whether to GdkPixbuf is available""... $ac_c" 1>&6
--echo "configure:7208: checking whether to GdkPixbuf is available" >&5
-+echo "configure:7327: checking whether to GdkPixbuf is available" >&5
- if gnome-config --libs gdk_pixbuf > /dev/null 2>&1; then
- gnome_libs="$gnome_libs gdk_pixbuf"
- echo "$ac_t""yes" 1>&6
-@@ -7227,7 +7347,7 @@
-
-
- echo $ac_n "checking whether to use GtkHTML""... $ac_c" 1>&6
--echo "configure:7231: checking whether to use GtkHTML" >&5
-+echo "configure:7350: checking whether to use GtkHTML" >&5
- if test x"$check_gtkhtml" = xyes ; then
- if gnome-config --libs gtkhtml > /dev/null 2>&1; then
- vers=`gnome-config --modversion gtkhtml | sed 's/^gtkhtml-//'`
-@@ -7275,7 +7395,7 @@
-
-
- echo $ac_n "checking whether to install into Gnome's prefix""... $ac_c" 1>&6
--echo "configure:7279: checking whether to install into Gnome's prefix" >&5
-+echo "configure:7398: checking whether to install into Gnome's prefix" >&5
- if test x"$use_system_install" = xyes ; then
- echo "$ac_t""yes" 1>&6
- gnomedatadir=`${GNOME_CONFIG} --datadir`
-@@ -7296,12 +7416,12 @@
- GNOME_LIB_PREFIX=`${GNOME_CONFIG} --libdir`
- GNOME_DATA_PREFIX=`${GNOME_CONFIG} --datadir`
-
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in mawk gawk nawk awk
- 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:7305: checking for $ac_word" >&5
-+echo "configure:7424: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7378,19 +7498,19 @@
- fi
-
- echo $ac_n "checking whether to use LDAP""... $ac_c" 1>&6
--echo "configure:7382: checking whether to use LDAP" >&5
-+echo "configure:7501: checking whether to use LDAP" >&5
- if test x"$use_ldap" = xyes ; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
--echo "configure:7386: checking for ldap_search in -lldap" >&5
-+echo "configure:7505: checking for ldap_search in -lldap" >&5
- ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ if { (eval echo configure:9349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9847,7 +9848,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lldap -llber -lresolv $LIBS"
+LIBS="-lldap -llber $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 7394 "configure"
-+#line 7513 "configure"
+ #line 9853 "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
-@@ -7401,7 +7521,7 @@
- ldap_search()
- ; return 0; }
- EOF
--if { (eval echo configure:7405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7524: \"$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
-@@ -7420,7 +7540,7 @@
+@@ -9879,7 +9880,7 @@
#define ENABLE_LDAP 1
EOF
@@ -1894,2734 +71,3 @@ can be consolidated down balsa-1.3.6's patch-configure.
else
echo "$ac_t""no" 1>&6
{ echo "configure: error: *** You enabled LDAP but ldap library is not found." 1>&2; exit 1; }
-@@ -7446,12 +7566,12 @@
-
-
- echo $ac_n "checking whether to build ESMTP support""... $ac_c" 1>&6
--echo "configure:7450: checking whether to build ESMTP support" >&5
-+echo "configure:7569: checking whether to build ESMTP support" >&5
- if test "x$with_esmtp" != xno ; then
- echo "$ac_t""yes" 1>&6
- test "$with_esmtp" != yes && LIBS="$LIBS -L$with_esmtp/lib"
- echo $ac_n "checking for smtp_start_session in -lesmtp""... $ac_c" 1>&6
--echo "configure:7455: checking for smtp_start_session in -lesmtp" >&5
-+echo "configure:7574: checking for smtp_start_session in -lesmtp" >&5
- ac_lib_var=`echo esmtp'_'smtp_start_session | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7459,7 +7579,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lesmtp $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7463 "configure"
-+#line 7582 "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
-@@ -7470,7 +7590,7 @@
- smtp_start_session()
- ; return 0; }
- EOF
--if { (eval echo configure:7474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7593: \"$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
-@@ -7492,7 +7612,7 @@
- fi
-
- echo $ac_n "checking for smtp_option_require_all_recipients in -lesmtp""... $ac_c" 1>&6
--echo "configure:7496: checking for smtp_option_require_all_recipients in -lesmtp" >&5
-+echo "configure:7615: checking for smtp_option_require_all_recipients in -lesmtp" >&5
- ac_lib_var=`echo esmtp'_'smtp_option_require_all_recipients | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7500,7 +7620,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lesmtp $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7504 "configure"
-+#line 7623 "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
-@@ -7511,7 +7631,7 @@
- smtp_option_require_all_recipients()
- ; return 0; }
- EOF
--if { (eval echo configure:7515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7634: \"$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
-@@ -7539,7 +7659,7 @@
- fi
-
- echo $ac_n "checking for smtp_starttls_set_password_cb in -lesmtp""... $ac_c" 1>&6
--echo "configure:7543: checking for smtp_starttls_set_password_cb in -lesmtp" >&5
-+echo "configure:7662: checking for smtp_starttls_set_password_cb in -lesmtp" >&5
- ac_lib_var=`echo esmtp'_'smtp_starttls_set_password_cb | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7547,7 +7667,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lesmtp $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7551 "configure"
-+#line 7670 "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
-@@ -7558,7 +7678,7 @@
- smtp_starttls_set_password_cb()
- ; return 0; }
- EOF
--if { (eval echo configure:7562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7681: \"$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
-@@ -7583,17 +7703,17 @@
-
- ac_safe=`echo "libesmtp.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libesmtp.h""... $ac_c" 1>&6
--echo "configure:7587: checking for libesmtp.h" >&5
-+echo "configure:7706: checking for libesmtp.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 7592 "configure"
-+#line 7711 "configure"
- #include "confdefs.h"
- #include <libesmtp.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7716: \"$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*
-@@ -7638,7 +7758,7 @@
-
-
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:7642: checking for iconv_open in -liconv" >&5
-+echo "configure:7761: checking for iconv_open in -liconv" >&5
- ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7646,7 +7766,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7650 "configure"
-+#line 7769 "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
-@@ -7657,7 +7777,7 @@
- iconv_open()
- ; return 0; }
- EOF
--if { (eval echo configure:7661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7780: \"$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
-@@ -7684,12 +7804,12 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for iconv_open""... $ac_c" 1>&6
--echo "configure:7688: checking for iconv_open" >&5
-+echo "configure:7807: checking for iconv_open" >&5
- if eval "test \"`echo '$''{'ac_cv_func_iconv_open'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 7693 "configure"
-+#line 7812 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char iconv_open(); below. */
-@@ -7712,7 +7832,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_iconv_open=yes"
- else
-@@ -7752,7 +7872,7 @@
-
-
- echo $ac_n "checking whether to use PCRE""... $ac_c" 1>&6
--echo "configure:7756: checking whether to use PCRE" >&5
-+echo "configure:7875: checking whether to use PCRE" >&5
- if test x"$check_pcre" = xyes ; then
- if pcre-config --libs-posix > /dev/null 2>&1; then
- vers=`pcre-config --version`
-@@ -7808,20 +7928,20 @@
-
-
- echo $ac_n "checking whether to build SSL support""... $ac_c" 1>&6
--echo "configure:7812: checking whether to build SSL support" >&5
-+echo "configure:7931: checking whether to build SSL support" >&5
- if test "x$with_ssl" != xno ; then
- if test -d $with_ssl && test -f "$with_ssl/include/openssl/ssl.h" ; then
- ssldir=$with_ssl
- else
- cat > conftest.$ac_ext <<EOF
--#line 7818 "configure"
-+#line 7937 "configure"
- #include "confdefs.h"
- #include <openssl/ssl.h>
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ssldir=default
- else
-@@ -7875,7 +7995,7 @@
- # Extract the first word of "jw", so it can be a program name with args.
- set dummy jw; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:7879: checking for $ac_word" >&5
-+echo "configure:7998: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_JW'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7940,16 +8060,16 @@
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- echo $ac_n "checking whether gcc understands $option""... $ac_c" 1>&6
--echo "configure:7944: checking whether gcc understands $option" >&5
-+echo "configure:8063: checking whether gcc understands $option" >&5
- cat > conftest.$ac_ext <<EOF
--#line 7946 "configure"
-+#line 8065 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:7953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- has_option=yes
- else
-@@ -7980,23 +8100,50 @@
- CFLAGS=`echo $CFLAGS | sed 's,-I/usr/include ,,g'`
-
- echo $ac_n "checking for CVS information""... $ac_c" 1>&6
--echo "configure:7984: checking for CVS information" >&5
-+echo "configure:8103: checking for CVS information" >&5
- echo "$ac_t""$BALSA_FROM_CVS" 1>&6
-
--if test "$USE_INCLUDED_LIBINTL" = "" ; then
-- USE_INCLUDED_LIBINTL=no
-- BUILD_INCLUDED_LIBINTL=no
-- INTLLIBS=""
--fi
--
--
-
-+ if test "X$prefix" = "XNONE"; then
-+ acl_final_prefix="$ac_default_prefix"
-+ else
-+ acl_final_prefix="$prefix"
-+ fi
-+ if test "X$exec_prefix" = "XNONE"; then
-+ acl_final_exec_prefix='${prefix}'
-+ else
-+ acl_final_exec_prefix="$exec_prefix"
-+ fi
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-+ prefix="$acl_save_prefix"
-
-
--if test "$USE_NLS" = ""; then
-- USE_NLS=no
-+ echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-+echo "configure:8124: checking for shared library run path origin" >&5
-+if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+
-+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+ . ./conftest.sh
-+ rm -f ./conftest.sh
-+ acl_cv_rpath=done
-+
- fi
-
-+echo "$ac_t""$acl_cv_rpath" 1>&6
-+ wl="$acl_cv_wl"
-+ libext="$acl_cv_libext"
-+ shlibext="$acl_cv_shlibext"
-+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-+ hardcode_direct="$acl_cv_hardcode_direct"
-+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
-+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-
-
- MKINSTALLDIRS=
-@@ -8008,177 +8155,2291 @@
- fi
-
-
--
--
--
-- # Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
-+# Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:8018: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-+echo "configure:8161: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+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
-+ if test -n "$RANLIB"; then
-+ ac_cv_prog_RANLIB="$RANLIB" # 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
-- if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-- break
-- fi
-+ ac_cv_prog_RANLIB="ranlib"
-+ break
- fi
- done
- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-- ;;
--esac
-+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
- fi
--MSGFMT="$ac_cv_path_MSGFMT"
--if test "$MSGFMT" != ":"; then
-- echo "$ac_t""$MSGFMT" 1>&6
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+ echo "$ac_t""$RANLIB" 1>&6
- else
- echo "$ac_t""no" 1>&6
- fi
-
-- # 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:8053: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:8189: 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
-- 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
-+ cat > conftest.$ac_ext <<EOF
-+#line 8194 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+/* Ultrix mips cc rejects this. */
-+typedef int charset[2]; const charset x;
-+/* SunOS 4.1.1 cc rejects this. */
-+char const *const *ccp;
-+char **p;
-+/* NEC SVR4.0.2 mips cc rejects this. */
-+struct point {int x, y;};
-+static struct point const zero = {0,0};
-+/* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in an arm
-+ of an if-expression whose if-part is not a constant expression */
-+const char *g = "string";
-+ccp = &g + (g ? g-g : 0);
-+/* HPUX 7.0 cc rejects these. */
-+++ccp;
-+p = (char**) ccp;
-+ccp = (char const *const *) p;
-+{ /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+ *t++ = 0;
-+}
-+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+}
-+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+}
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+}
-+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+}
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:8243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ rm -rf conftest*
-+ ac_cv_c_const=yes
- else
-- echo "$ac_t""no" 1>&6
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ ac_cv_c_const=no
- fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_c_const" 1>&6
-+if test $ac_cv_c_const = no; then
-+ cat >> confdefs.h <<\EOF
-+#define const
-+EOF
-
-+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:8090: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-+echo $ac_n "checking for inline""... $ac_c" 1>&6
-+echo "configure:8264: checking for inline" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_inline'+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 $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-- (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); 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 "$XGETTEXT" != ":"; then
-- echo "$ac_t""$XGETTEXT" 1>&6
-+ ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+ cat > conftest.$ac_ext <<EOF
-+#line 8271 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+} $ac_kw foo() {
-+; return 0; }
-+EOF
-+if { (eval echo configure:8278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ rm -rf conftest*
-+ ac_cv_c_inline=$ac_kw; break
- else
-- echo "$ac_t""no" 1>&6
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- fi
-+rm -f conftest*
-+done
-
-- rm -f messages.po
-+fi
-
-- # Extract the first word of "msgmerge", so it can be a program name with args.
--set dummy msgmerge; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:8127: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
-+echo "$ac_t""$ac_cv_c_inline" 1>&6
-+case "$ac_cv_c_inline" in
-+ inline | yes) ;;
-+ no) cat >> confdefs.h <<\EOF
-+#define inline
-+EOF
-+ ;;
-+ *) cat >> confdefs.h <<EOF
-+#define inline $ac_cv_c_inline
-+EOF
-+ ;;
-+esac
-+
-+echo $ac_n "checking for off_t""... $ac_c" 1>&6
-+echo "configure:8304: 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
-- case "$MSGMERGE" in
-- /*)
-- ac_cv_path_MSGMERGE="$MSGMERGE" # 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 $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-+ cat > conftest.$ac_ext <<EOF
-+#line 8309 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ac_cv_type_off_t=yes
-+else
-+ rm -rf conftest*
-+ ac_cv_type_off_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$ac_t""$ac_cv_type_off_t" 1>&6
-+if test $ac_cv_type_off_t = no; then
-+ cat >> confdefs.h <<\EOF
-+#define off_t long
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for size_t""... $ac_c" 1>&6
-+echo "configure:8337: 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 8342 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ac_cv_type_size_t=yes
-+else
-+ rm -rf conftest*
-+ ac_cv_type_size_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$ac_t""$ac_cv_type_size_t" 1>&6
-+if test $ac_cv_type_size_t = no; then
-+ cat >> confdefs.h <<\EOF
-+#define size_t unsigned
-+EOF
-+
-+fi
-+
-+# 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:8372: 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 8377 "configure"
-+#include "confdefs.h"
-+#include <alloca.h>
-+int main() {
-+char *p = alloca(2 * sizeof(int));
-+; return 0; }
-+EOF
-+if { (eval echo configure:8384: \"$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
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ ac_cv_header_alloca_h=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-+if test $ac_cv_header_alloca_h = yes; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ALLOCA_H 1
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for alloca""... $ac_c" 1>&6
-+echo "configure:8405: 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 8410 "configure"
-+#include "confdefs.h"
-+
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+# include <malloc.h>
-+# define alloca _alloca
-+# else
-+# if HAVE_ALLOCA_H
-+# include <alloca.h>
-+# else
-+# ifdef _AIX
-+ #pragma alloca
-+# else
-+# ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+int main() {
-+char *p = (char *) alloca(1);
-+; return 0; }
-+EOF
-+if { (eval echo configure:8438: \"$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
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ ac_cv_func_alloca_works=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-+if test $ac_cv_func_alloca_works = yes; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ALLOCA 1
-+EOF
-+
-+fi
-+
-+if test $ac_cv_func_alloca_works = no; then
-+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+ # that cause trouble. Some versions do not even contain alloca or
-+ # contain a buggy version. If you still want to use their alloca,
-+ # use ar to extract alloca.o from them instead of compiling alloca.c.
-+ ALLOCA=alloca.${ac_objext}
-+ cat >> confdefs.h <<\EOF
-+#define C_ALLOCA 1
-+EOF
-+
-+
-+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-+echo "configure:8470: 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 8475 "configure"
-+#include "confdefs.h"
-+#if defined(CRAY) && ! defined(CRAY2)
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "webecray" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ac_cv_os_cray=yes
-+else
-+ rm -rf conftest*
-+ ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_os_cray" 1>&6
-+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:8500: 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 8505 "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:8528: \"$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
-+ cat >> confdefs.h <<EOF
-+#define CRAY_STACKSEG_END $ac_func
-+EOF
-+
-+ break
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+done
-+fi
-+
-+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-+echo "configure:8555: 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
-+ if test "$cross_compiling" = yes; then
-+ ac_cv_c_stack_direction=0
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 8563 "configure"
-+#include "confdefs.h"
-+find_stack_direction ()
-+{
-+ static char *addr = 0;
-+ auto char dummy;
-+ if (addr == 0)
-+ {
-+ addr = &dummy;
-+ return find_stack_direction ();
-+ }
-+ else
-+ return (&dummy > addr) ? 1 : -1;
-+}
-+main ()
-+{
-+ exit (find_stack_direction() < 0);
-+}
-+EOF
-+if { (eval echo configure:8582: \"$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
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
-+ ac_cv_c_stack_direction=-1
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-+cat >> confdefs.h <<EOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+EOF
-+
-+fi
-+
-+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:8607: 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 8612 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:8617: \"$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
-+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in getpagesize
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:8646: 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 8651 "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:8674: \"$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
-+
-+echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-+echo "configure:8699: 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
-+ if test "$cross_compiling" = yes; then
-+ ac_cv_func_mmap_fixed_mapped=no
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 8707 "configure"
-+#include "confdefs.h"
-+
-+/* Thanks to Mike Haertel and Jim Avera for this test.
-+ Here is a matrix of mmap possibilities:
-+ mmap private not fixed
-+ mmap private fixed at somewhere currently unmapped
-+ mmap private fixed at somewhere already mapped
-+ mmap shared not fixed
-+ mmap shared fixed at somewhere currently unmapped
-+ mmap shared fixed at somewhere already mapped
-+ For private mappings, we should verify that changes cannot be read()
-+ back from the file, nor mmap's back from the file at a different
-+ address. (There have been systems where private was not correctly
-+ implemented like the infamous i386 svr4.0, and systems where the
-+ VM page cache was not coherent with the filesystem buffer cache
-+ like early versions of FreeBSD and possibly contemporary NetBSD.)
-+ For shared mappings, we should conversely verify that changes get
-+ propogated back to all the places they're supposed to be.
-+
-+ Grep wants private fixed already mapped.
-+ The main things grep needs to know about mmap are:
-+ * does it exist and is it safe to write into the mmap'd area
-+ * how to use it (BSD variants) */
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <sys/mman.h>
-+
-+/* This mess was copied from the GNU getpagesize.h. */
-+#ifndef HAVE_GETPAGESIZE
-+# ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+# endif
-+
-+/* Assume that all systems that can run configure have sys/param.h. */
-+# ifndef HAVE_SYS_PARAM_H
-+# define HAVE_SYS_PARAM_H 1
-+# endif
-+
-+# ifdef _SC_PAGESIZE
-+# define getpagesize() sysconf(_SC_PAGESIZE)
-+# else /* no _SC_PAGESIZE */
-+# ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+# ifdef EXEC_PAGESIZE
-+# define getpagesize() EXEC_PAGESIZE
-+# else /* no EXEC_PAGESIZE */
-+# ifdef NBPG
-+# define getpagesize() NBPG * CLSIZE
-+# ifndef CLSIZE
-+# define CLSIZE 1
-+# endif /* no CLSIZE */
-+# else /* no NBPG */
-+# ifdef NBPC
-+# define getpagesize() NBPC
-+# else /* no NBPC */
-+# ifdef PAGESIZE
-+# define getpagesize() PAGESIZE
-+# endif /* PAGESIZE */
-+# endif /* no NBPC */
-+# endif /* no NBPG */
-+# endif /* no EXEC_PAGESIZE */
-+# else /* no HAVE_SYS_PARAM_H */
-+# define getpagesize() 8192 /* punt totally */
-+# endif /* no HAVE_SYS_PARAM_H */
-+# endif /* no _SC_PAGESIZE */
-+
-+#endif /* no HAVE_GETPAGESIZE */
-+
-+#ifdef __cplusplus
-+extern "C" { void *malloc(unsigned); }
-+#else
-+char *malloc();
-+#endif
-+
-+int
-+main()
-+{
-+ char *data, *data2, *data3;
-+ int i, pagesize;
-+ int fd;
-+
-+ pagesize = getpagesize();
-+
-+ /*
-+ * First, make a file with some known garbage in it.
-+ */
-+ data = malloc(pagesize);
-+ if (!data)
-+ exit(1);
-+ for (i = 0; i < pagesize; ++i)
-+ *(data + i) = rand();
-+ umask(0);
-+ fd = creat("conftestmmap", 0600);
-+ if (fd < 0)
-+ exit(1);
-+ if (write(fd, data, pagesize) != pagesize)
-+ exit(1);
-+ close(fd);
-+
-+ /*
-+ * Next, try to mmap the file at a fixed address which
-+ * already has something else allocated at it. If we can,
-+ * also make sure that we see the same garbage.
-+ */
-+ fd = open("conftestmmap", O_RDWR);
-+ if (fd < 0)
-+ exit(1);
-+ data2 = malloc(2 * pagesize);
-+ if (!data2)
-+ exit(1);
-+ data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-+ if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
-+ exit(1);
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data2 + i))
-+ exit(1);
-+
-+ /*
-+ * Finally, make sure that changes to the mapped area
-+ * do not percolate back to the file as seen by read().
-+ * (This is a bug on some variants of i386 svr4.0.)
-+ */
-+ for (i = 0; i < pagesize; ++i)
-+ *(data2 + i) = *(data2 + i) + 1;
-+ data3 = malloc(pagesize);
-+ if (!data3)
-+ exit(1);
-+ if (read(fd, data3, pagesize) != pagesize)
-+ exit(1);
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data3 + i))
-+ exit(1);
-+ close(fd);
-+ unlink("conftestmmap");
-+ exit(0);
-+}
-+
-+EOF
-+if { (eval echo configure:8847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+ ac_cv_func_mmap_fixed_mapped=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
-+ ac_cv_func_mmap_fixed_mapped=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-+if test $ac_cv_func_mmap_fixed_mapped = yes; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_MMAP 1
-+EOF
-+
-+fi
-+
-+
-+ echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-+echo "configure:8871: 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 8876 "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"
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ use_additional=yes
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-+if test "${with_libiconv_prefix+set}" = set; then
-+ withval="$with_libiconv_prefix"
-+
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
-+ else
-+ if test "X$withval" = "X"; then
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+
-+fi
-+
-+ LIBICONV=
-+ LTLIBICONV=
-+ INCICONV=
-+ rpathdirs=
-+ ltrpathdirs=
-+ names_already_handled=
-+ names_next_round='iconv '
-+ while test -n "$names_next_round"; do
-+ names_this_round="$names_next_round"
-+ names_next_round=
-+ for name in $names_this_round; do
-+ already_handled=
-+ for n in $names_already_handled; do
-+ if test "$n" = "$name"; then
-+ already_handled=yes
-+ break
-+ fi
-+ done
-+ if test -z "$already_handled"; then
-+ names_already_handled="$names_already_handled $name"
-+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+ eval value=\"\$HAVE_LIB$uppername\"
-+ if test -n "$value"; then
-+ if test "$value" = yes; then
-+ eval value=\"\$LIB$uppername\"
-+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-+ eval value=\"\$LTLIB$uppername\"
-+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-+ else
-+ :
-+ fi
-+ else
-+ found_dir=
-+ found_la=
-+ found_so=
-+ found_a=
-+ if test $use_additional = yes; then
-+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+ found_dir="$additional_libdir"
-+ found_so="$additional_libdir/lib$name.$shlibext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$additional_libdir/lib$name.$libext"; then
-+ found_dir="$additional_libdir"
-+ found_a="$additional_libdir/lib$name.$libext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test "X$found_dir" = "X"; then
-+ for x in $LDFLAGS $LTLIBICONV; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ case "$x" in
-+ -L*)
-+ dir=`echo "X$x" | sed -e 's/^X-L//'`
-+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+ found_dir="$dir"
-+ found_so="$dir/lib$name.$shlibext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$dir/lib$name.$libext"; then
-+ found_dir="$dir"
-+ found_a="$dir/lib$name.$libext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ if test "X$found_dir" != "X"; then
-+ break
-+ fi
-+ done
-+ fi
-+ if test "X$found_dir" != "X"; then
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-+ if test "X$found_so" != "X"; then
-+ if test "X$found_dir" = "X/usr/lib"; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+ else
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $found_dir"
-+ fi
-+ if test "$hardcode_direct" = yes; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+ else
-+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $found_dir"
-+ fi
-+ else
-+ haveit=
-+ for x in $LDFLAGS $LIBICONV; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-+ fi
-+ if test "$hardcode_minus_L" != no; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+ else
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ fi
-+ else
-+ if test "X$found_a" != "X"; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-+ else
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-+ fi
-+ fi
-+ additional_includedir=
-+ case "$found_dir" in
-+ */lib | */lib/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+ additional_includedir="$basedir/include"
-+ ;;
-+ esac
-+ if test "X$additional_includedir" != "X"; then
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ for x in $CPPFLAGS $INCICONV; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test -n "$found_la"; then
-+ save_libdir="$libdir"
-+ case "$found_la" in
-+ */* | *\\*) . "$found_la" ;;
-+ *) . "./$found_la" ;;
-+ esac
-+ libdir="$save_libdir"
-+ for dep in $dependency_libs; do
-+ case "$dep" in
-+ -L*)
-+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ haveit=
-+ for x in $LDFLAGS $LIBICONV; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ haveit=
-+ for x in $LDFLAGS $LTLIBICONV; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ ;;
-+ -l*)
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+ ;;
-+ *.la)
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+ ;;
-+ *)
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-+ ;;
-+ esac
-+ done
-+ fi
-+ else
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ done
-+ done
-+ if test "X$rpathdirs" != "X"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ alldirs=
-+ for found_dir in $rpathdirs; do
-+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+ done
-+ acl_save_libdir="$libdir"
-+ libdir="$alldirs"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-+ else
-+ for found_dir in $rpathdirs; do
-+ acl_save_libdir="$libdir"
-+ libdir="$found_dir"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-+ done
-+ fi
-+ fi
-+ if test "X$ltrpathdirs" != "X"; then
-+ for found_dir in $ltrpathdirs; do
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-+ done
-+ fi
-+
-+
-+ am_save_CPPFLAGS="$CPPFLAGS"
-+
-+ for element in $INCICONV; do
-+ haveit=
-+ for x in $CPPFLAGS; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X$element"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-+ fi
-+ done
-+
-+
-+ echo $ac_n "checking for iconv""... $ac_c" 1>&6
-+echo "configure:9291: checking for iconv" >&5
-+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+
-+ am_cv_func_iconv="no, consider installing GNU libiconv"
-+ am_cv_lib_iconv=no
-+ cat > conftest.$ac_ext <<EOF
-+#line 9299 "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:9309: \"$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 $LIBICONV"
-+ cat > conftest.$ac_ext <<EOF
-+#line 9321 "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:9331: \"$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
-+
-+ fi
-+ if test "$am_cv_lib_iconv" = yes; then
-+ echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6
-+echo "configure:9354: checking how to link with libiconv" >&5
-+ echo "$ac_t""$LIBICONV" 1>&6
-+ else
-+ CPPFLAGS="$am_save_CPPFLAGS"
-+ LIBICONV=
-+ LTLIBICONV=
-+ fi
-+
-+
-+
-+
-+
-+
-+ # 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:9370: 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 $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); 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=":"
-+ ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test "$MSGFMT" != ":"; then
-+ echo "$ac_t""$MSGFMT" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ # 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:9405: 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:9442: 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 $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); 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 "$XGETTEXT" != ":"; then
-+ echo "$ac_t""$XGETTEXT" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ rm -f messages.po
-+
-+ # Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:9479: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ case "$MSGMERGE" in
-+ /*)
-+ ac_cv_path_MSGMERGE="$MSGMERGE" # 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 $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
- ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-- ;;
--esac
-+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-+ ;;
-+esac
-+fi
-+MSGMERGE="$ac_cv_path_MSGMERGE"
-+if test "$MSGMERGE" != ":"; then
-+ echo "$ac_t""$MSGMERGE" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+ if test "$GMSGFMT" != ":"; then
-+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+ echo "$ac_t""found $GMSGFMT program is not GNU msgfmt; ignore it" 1>&6
-+ GMSGFMT=":"
-+ fi
-+ fi
-+
-+ if test "$XGETTEXT" != ":"; then
-+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
-+ XGETTEXT=":"
-+ fi
-+ rm -f messages.po
-+ fi
-+
-+
-+
-+
-+
-+ 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
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:9542: 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 9547 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:9552: \"$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
-+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+ for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:9583: 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 9588 "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:9611: \"$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
-+
-+
-+
-+
-+ if test "$am_cv_func_iconv" = yes; then
-+ echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-+echo "configure:9640: 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 9646 "configure"
-+#include "confdefs.h"
-+
-+#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);
-+#else
-+size_t iconv();
-+#endif
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:9665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ rm -rf conftest*
-+ am_cv_proto_iconv_arg1=""
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ am_cv_proto_iconv_arg1="const"
-+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
-+
-+
-+ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-+echo "configure:9689: 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 9694 "configure"
-+#include "confdefs.h"
-+#include <langinfo.h>
-+int main() {
-+char* cs = nl_langinfo(CODESET);
-+; return 0; }
-+EOF
-+if { (eval echo configure:9701: \"$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*
-+
-+fi
-+
-+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
-+EOF
-+
-+ fi
-+
-+ if test $ac_cv_header_locale_h = yes; then
-+ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-+echo "configure:9724: 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 9729 "configure"
-+#include "confdefs.h"
-+#include <locale.h>
-+int main() {
-+return LC_MESSAGES
-+; return 0; }
-+EOF
-+if { (eval echo configure:9736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ am_cv_val_LC_MESSAGES=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ am_cv_val_LC_MESSAGES=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_LC_MESSAGES 1
-+EOF
-+
-+ fi
-+ 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:9762: 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
--MSGMERGE="$ac_cv_path_MSGMERGE"
--if test "$MSGMERGE" != ":"; then
-- echo "$ac_t""$MSGMERGE" 1>&6
-+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 "$GMSGFMT" != ":"; then
-- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-- : ;
-+ if test -z "$INTLBISON"; then
-+ ac_verc_fail=yes
-+ else
-+ echo $ac_n "checking version of bison""... $ac_c" 1>&6
-+echo "configure:9795: 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=:
-+ fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-+echo "configure:9822: checking whether NLS is requested" >&5
-+ # Check whether --enable-nls or --disable-nls was given.
-+if test "${enable_nls+set}" = set; then
-+ enableval="$enable_nls"
-+ USE_NLS=$enableval
-+else
-+ USE_NLS=yes
-+fi
-+
-+ echo "$ac_t""$USE_NLS" 1>&6
-+
-+
-+
-+ BUILD_INCLUDED_LIBINTL=no
-+ USE_INCLUDED_LIBINTL=no
-+
-+ LIBINTL=
-+ LTLIBINTL=
-+ POSUB=
-+
-+ if test "$USE_NLS" = "yes"; then
-+ gt_use_preinstalled_gnugettext=no
-+
-+ echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-+echo "configure:9846: checking whether included gettext is requested" >&5
-+ # Check whether --with-included-gettext or --without-included-gettext was given.
-+if test "${with_included_gettext+set}" = set; then
-+ withval="$with_included_gettext"
-+ nls_cv_force_use_gnu_gettext=$withval
-+else
-+ nls_cv_force_use_gnu_gettext=no
-+fi
-+
-+ echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
-+
-+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+
-+
-+
-+
-+
-+
-+ echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-+echo "configure:9866: checking for GNU gettext in libc" >&5
-+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 9871 "configure"
-+#include "confdefs.h"
-+#include <libintl.h>
-+extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;
-+int main() {
-+bindtextdomain ("", "");
-+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+; return 0; }
-+EOF
-+if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ gt_cv_func_gnugettext1_libc=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ gt_cv_func_gnugettext1_libc=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
-+
-+ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-+
-+
-+
-+ use_additional=yes
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
-+if test "${with_libintl_prefix+set}" = set; then
-+ withval="$with_libintl_prefix"
-+
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
- else
-- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-- echo "$ac_t""found $GMSGFMT program is not GNU msgfmt; ignore it" 1>&6
-- GMSGFMT=":"
-+ if test "X$withval" = "X"; then
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+
-+fi
-+
-+ LIBINTL=
-+ LTLIBINTL=
-+ INCINTL=
-+ rpathdirs=
-+ ltrpathdirs=
-+ names_already_handled=
-+ names_next_round='intl '
-+ while test -n "$names_next_round"; do
-+ names_this_round="$names_next_round"
-+ names_next_round=
-+ for name in $names_this_round; do
-+ already_handled=
-+ for n in $names_already_handled; do
-+ if test "$n" = "$name"; then
-+ already_handled=yes
-+ break
-+ fi
-+ done
-+ if test -z "$already_handled"; then
-+ names_already_handled="$names_already_handled $name"
-+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+ eval value=\"\$HAVE_LIB$uppername\"
-+ if test -n "$value"; then
-+ if test "$value" = yes; then
-+ eval value=\"\$LIB$uppername\"
-+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-+ eval value=\"\$LTLIB$uppername\"
-+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-+ else
-+ :
-+ fi
-+ else
-+ found_dir=
-+ found_la=
-+ found_so=
-+ found_a=
-+ if test $use_additional = yes; then
-+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+ found_dir="$additional_libdir"
-+ found_so="$additional_libdir/lib$name.$shlibext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$additional_libdir/lib$name.$libext"; then
-+ found_dir="$additional_libdir"
-+ found_a="$additional_libdir/lib$name.$libext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test "X$found_dir" = "X"; then
-+ for x in $LDFLAGS $LTLIBINTL; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ case "$x" in
-+ -L*)
-+ dir=`echo "X$x" | sed -e 's/^X-L//'`
-+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+ found_dir="$dir"
-+ found_so="$dir/lib$name.$shlibext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$dir/lib$name.$libext"; then
-+ found_dir="$dir"
-+ found_a="$dir/lib$name.$libext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ if test "X$found_dir" != "X"; then
-+ break
-+ fi
-+ done
-+ fi
-+ if test "X$found_dir" != "X"; then
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-+ if test "X$found_so" != "X"; then
-+ if test "X$found_dir" = "X/usr/lib"; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+ else
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $found_dir"
-+ fi
-+ if test "$hardcode_direct" = yes; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+ else
-+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $found_dir"
-+ fi
-+ else
-+ haveit=
-+ for x in $LDFLAGS $LIBINTL; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-+ fi
-+ if test "$hardcode_minus_L" != no; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+ else
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ fi
-+ else
-+ if test "X$found_a" != "X"; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-+ else
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-+ fi
-+ fi
-+ additional_includedir=
-+ case "$found_dir" in
-+ */lib | */lib/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+ additional_includedir="$basedir/include"
-+ ;;
-+ esac
-+ if test "X$additional_includedir" != "X"; then
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ for x in $CPPFLAGS $INCINTL; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test -n "$found_la"; then
-+ save_libdir="$libdir"
-+ case "$found_la" in
-+ */* | *\\*) . "$found_la" ;;
-+ *) . "./$found_la" ;;
-+ esac
-+ libdir="$save_libdir"
-+ for dep in $dependency_libs; do
-+ case "$dep" in
-+ -L*)
-+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ haveit=
-+ for x in $LDFLAGS $LIBINTL; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ haveit=
-+ for x in $LDFLAGS $LTLIBINTL; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ ;;
-+ -l*)
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+ ;;
-+ *.la)
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+ ;;
-+ *)
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-+ ;;
-+ esac
-+ done
-+ fi
-+ else
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ done
-+ done
-+ if test "X$rpathdirs" != "X"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ alldirs=
-+ for found_dir in $rpathdirs; do
-+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+ done
-+ acl_save_libdir="$libdir"
-+ libdir="$alldirs"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-+ else
-+ for found_dir in $rpathdirs; do
-+ acl_save_libdir="$libdir"
-+ libdir="$found_dir"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-+ done
- fi
- fi
-+ if test "X$ltrpathdirs" != "X"; then
-+ for found_dir in $ltrpathdirs; do
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-+ done
-+ fi
-+
-+ echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-+echo "configure:10251: checking for GNU gettext in libintl" >&5
-+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ gt_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $INCINTL"
-+ gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBINTL"
-+ cat > conftest.$ac_ext <<EOF
-+#line 10260 "configure"
-+#include "confdefs.h"
-+#include <libintl.h>
-+extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();
-+int main() {
-+bindtextdomain ("", "");
-+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
-+; return 0; }
-+EOF
-+if { (eval echo configure:10275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ gt_cv_func_gnugettext1_libintl=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ gt_cv_func_gnugettext1_libintl=no
-+fi
-+rm -f conftest*
-+ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
-+ LIBS="$LIBS $LIBICONV"
-+ cat > conftest.$ac_ext <<EOF
-+#line 10288 "configure"
-+#include "confdefs.h"
-+#include <libintl.h>
-+extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();
-+int main() {
-+bindtextdomain ("", "");
-+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
-+; return 0; }
-+EOF
-+if { (eval echo configure:10303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ LIBINTL="$LIBINTL $LIBICONV"
-+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+ gt_cv_func_gnugettext1_libintl=yes
-+
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+ fi
-+ CPPFLAGS="$gt_save_CPPFLAGS"
-+ LIBS="$gt_save_LIBS"
-+fi
-+
-+echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
-+ fi
-+
-+ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-+ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
-+ && test "$PACKAGE" != gettext; }; then
-+ gt_use_preinstalled_gnugettext=yes
-+ else
-+ LIBINTL=
-+ LTLIBINTL=
-+ INCINTL=
-+ fi
-+
-+
-+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+ nls_cv_use_gnu_gettext=yes
-+ fi
-+ fi
-+
-+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ INTLOBJS="\$(GETTOBJS)"
-+ BUILD_INCLUDED_LIBINTL=yes
-+ USE_INCLUDED_LIBINTL=yes
-+ LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
-+ LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
-+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+ fi
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ CATOBJEXT=.gmo
-+ fi
-+
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ cat >> confdefs.h <<\EOF
-+#define ENABLE_NLS 1
-+EOF
-
-- if test "$XGETTEXT" != ":"; then
-- if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-- (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-- : ;
- else
-- echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
-- XGETTEXT=":"
-+ USE_NLS=no
- fi
-- rm -f messages.po
-+ fi
-+
-+ if test "$USE_NLS" = "yes"; then
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-+ echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6
-+echo "configure:10369: checking how to link with libintl" >&5
-+ echo "$ac_t""$LIBINTL" 1>&6
-+
-+ for element in $INCINTL; do
-+ haveit=
-+ for x in $CPPFLAGS; do
-+
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ eval x=\"$x\"
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+
-+ if test "X$x" = "X$element"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-+ fi
-+ done
-+
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_GETTEXT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_DCGETTEXT 1
-+EOF
-+
-+ fi
-+
-+ POSUB=po
- fi
-
-
--
-+ if test "$PACKAGE" = gettext; then
-+ BUILD_INCLUDED_LIBINTL=yes
-+ fi
-+
-+
-+
-+
-+
-+
-+ nls_cv_header_intl=
-+ nls_cv_header_libgt=
-+
-+ DATADIRNAME=share
-+
-+
-+ INSTOBJEXT=.mo
-+
-+
-+ GENCAT=gencat
-+
-+
-+ INTL_LIBTOOL_SUFFIX_PREFIX=
-+
-+
-+
-+ INTLLIBS="$LIBINTL"
-+
-+
-+
-+
-+
-+
-+
-
- trap '' 1 2 15
- cat > confcache <<\EOF
-@@ -8411,15 +10672,29 @@
- s%@HAVE_JW_TRUE@%$HAVE_JW_TRUE%g
- s%@HAVE_JW_FALSE@%$HAVE_JW_FALSE%g
- s%@HAVE_JW@%$HAVE_JW%g
--s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
--s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
--s%@INTLLIBS@%$INTLLIBS%g
--s%@USE_NLS@%$USE_NLS%g
- s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
- s%@MSGFMT@%$MSGFMT%g
- s%@GMSGFMT@%$GMSGFMT%g
- s%@XGETTEXT@%$XGETTEXT%g
- s%@MSGMERGE@%$MSGMERGE%g
-+s%@ALLOCA@%$ALLOCA%g
-+s%@GLIBC21@%$GLIBC21%g
-+s%@LIBICONV@%$LIBICONV%g
-+s%@LTLIBICONV@%$LTLIBICONV%g
-+s%@INTLBISON@%$INTLBISON%g
-+s%@USE_NLS@%$USE_NLS%g
-+s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
-+s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
-+s%@CATOBJEXT@%$CATOBJEXT%g
-+s%@INTLOBJS@%$INTLOBJS%g
-+s%@DATADIRNAME@%$DATADIRNAME%g
-+s%@INSTOBJEXT@%$INSTOBJEXT%g
-+s%@GENCAT@%$GENCAT%g
-+s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
-+s%@INTLLIBS@%$INTLLIBS%g
-+s%@LIBINTL@%$LIBINTL%g
-+s%@LTLIBINTL@%$LTLIBINTL%g
-+s%@POSUB@%$POSUB%g
-
- CEOF
- EOF
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 8af6f8ab64f1..62f6e74d3e45 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -95,6 +95,7 @@ share/locale/sl/LC_MESSAGES/balsa.mo
share/locale/sv/LC_MESSAGES/balsa.mo
share/locale/tr/LC_MESSAGES/balsa.mo
share/locale/uk/LC_MESSAGES/balsa.mo
+share/locale/vi/LC_MESSAGES/balsa.mo
share/locale/wa/LC_MESSAGES/balsa.mo
share/locale/zh_CN/LC_MESSAGES/balsa.mo
share/locale/zh_TW/LC_MESSAGES/balsa.mo
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 12:33:49 +0000