tAccelerators now use Alt/Meta in some dialogs; try to avoid using GTK+2 with G… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 0879e757649f4d5d80f54ba4bf94682ac15f0b07 | |
parent 8323c45839c5d8210cdf3ac01559c87d51b7963f | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 25 Mar 2002 16:47:25 +0000 | |
Accelerators now use Alt/Meta in some dialogs; try to avoid using GTK+2 | |
with GLIB1 (or vice versa); workaround for different g_strsplit behaviour | |
between GLIB1 and GLIB2. | |
Diffstat: | |
M acconfig.h | 4 ++-- | |
M config.h.in | 4 ++-- | |
M configure | 299 ++++++++++++++++-------------… | |
M configure.in | 10 +++++++--- | |
M src/network.c | 12 ++++++++++++ | |
5 files changed, 174 insertions(+), 155 deletions(-) | |
--- | |
diff --git a/acconfig.h b/acconfig.h | |
t@@ -24,5 +24,5 @@ | |
(i.e. >= 1.2.10) */ | |
#undef HAVE_FIXED_GTK | |
-/* Do we have GTK+ 2.0 ? */ | |
-#undef HAVE_GTK2 | |
+/* Do we have GLIB 2.0 ? */ | |
+#undef HAVE_GLIB2 | |
diff --git a/config.h.in b/config.h.in | |
t@@ -79,8 +79,8 @@ | |
(i.e. >= 1.2.10) */ | |
#undef HAVE_FIXED_GTK | |
-/* Do we have GTK+ 2.0 ? */ | |
-#undef HAVE_GTK2 | |
+/* Do we have GLIB 2.0 ? */ | |
+#undef HAVE_GLIB2 | |
/* The number of bytes in a long long. */ | |
#undef SIZEOF_LONG_LONG | |
diff --git a/configure b/configure | |
t@@ -1918,6 +1918,10 @@ rm -f conftest* | |
rm -f conf.glibtest | |
+ cat >> confdefs.h <<\EOF | |
+#define HAVE_GLIB2 1 | |
+EOF | |
+ | |
fi | |
if test "$glib2_found" = "no" ; then | |
# Check whether --with-glib-prefix or --without-glib-prefix was given. | |
t@@ -1973,7 +1977,7 @@ fi | |
# Extract the first word of "glib-config", so it can be a program name with … | |
set dummy glib-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:1977: checking for $ac_word" >&5 | |
+echo "configure:1981: 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 | |
t@@ -2008,7 +2012,7 @@ fi | |
min_glib_version=1.2.0 | |
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
-echo "configure:2012: checking for GLIB - version >= $min_glib_version" >&5 | |
+echo "configure:2016: checking for GLIB - version >= $min_glib_version" >&5 | |
no_glib="" | |
if test "$GLIB_CONFIG" = "no" ; then | |
no_glib=yes | |
t@@ -2031,7 +2035,7 @@ echo "configure:2012: checking for GLIB - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2035 "configure" | |
+#line 2039 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -2107,7 +2111,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -2141,7 +2145,7 @@ fi | |
CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
LIBS="$LIBS $GLIB_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2145 "configure" | |
+#line 2149 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -2151,7 +2155,7 @@ int main() { | |
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
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 th… | |
t@@ -2193,7 +2197,7 @@ rm -f conftest* | |
if test "$CURSES_CLIENT" != "no" ; then | |
echo $ac_n "checking for newterm in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:2197: checking for newterm in -lncurses" >&5 | |
+echo "configure:2201: checking for newterm in -lncurses" >&5 | |
ac_lib_var=`echo ncurses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2201,7 +2205,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2205 "configure" | |
+#line 2209 "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 | |
t@@ -2212,7 +2216,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2241,7 +2245,7 @@ fi | |
if test "$ac_cv_lib_ncurses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcurses""... $ac_c" 1>&6 | |
-echo "configure:2245: checking for newterm in -lcurses" >&5 | |
+echo "configure:2249: checking for newterm in -lcurses" >&5 | |
ac_lib_var=`echo curses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2249,7 +2253,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2253 "configure" | |
+#line 2257 "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 | |
t@@ -2260,7 +2264,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2289,7 +2293,7 @@ fi | |
if test "$ac_cv_lib_curses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcur_colr""... $ac_c" 1>&6 | |
-echo "configure:2293: checking for newterm in -lcur_colr" >&5 | |
+echo "configure:2297: checking for newterm in -lcur_colr" >&5 | |
ac_lib_var=`echo cur_colr'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2297,7 +2301,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2301 "configure" | |
+#line 2305 "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 | |
t@@ -2308,7 +2312,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2348,7 +2352,7 @@ fi | |
fi | |
if test "$GUI_CLIENT" != "no" -o "$GUI_SERVER" != "no"; then | |
- gtk2_found="no" | |
+ gtk2_found="no" | |
if test "$USE_GLIB2" = "yes" ; then | |
# Check whether --enable-gtktest or --disable-gtktest was given. | |
if test "${enable_gtktest+set}" = set; then | |
t@@ -2374,7 +2378,7 @@ fi | |
# Extract the first word of "pkg-config", so it can be a program name with a… | |
set dummy pkg-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2378: checking for $ac_word" >&5 | |
+echo "configure:2382: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2422,7 +2426,7 @@ fi | |
min_gtk_version=2.0.0 | |
echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:2426: checking for GTK+ - version >= $min_gtk_version" >&5 | |
+echo "configure:2430: checking for GTK+ - version >= $min_gtk_version" >&5 | |
if test x$PKG_CONFIG != xno ; then | |
## don't try to run the test against uninstalled libtool libs | |
t@@ -2457,7 +2461,7 @@ echo "configure:2426: checking for GTK+ - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2461 "configure" | |
+#line 2465 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2532,7 +2536,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -2564,7 +2568,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2568 "configure" | |
+#line 2572 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2574,7 +2578,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
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 th… | |
t@@ -2610,12 +2614,10 @@ rm -f conftest* | |
fi | |
if test "$gtk2_found" = "yes" ; then | |
HAVE_FIXED_GTK="yes" | |
- cat >> confdefs.h <<\EOF | |
-#define HAVE_GTK2 1 | |
-EOF | |
- | |
else | |
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given. | |
+ gtk_found="no" | |
+ if test "$glib2_found" = "no" ; then | |
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given. | |
if test "${with_gtk_prefix+set}" = set; then | |
withval="$with_gtk_prefix" | |
gtk_config_prefix="$withval" | |
t@@ -2665,7 +2667,7 @@ fi | |
# Extract the first word of "gtk-config", so it can be a program name with a… | |
set dummy gtk-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2669: checking for $ac_word" >&5 | |
+echo "configure:2671: 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 | |
t@@ -2700,7 +2702,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:2704: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:2706: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -2723,7 +2725,7 @@ echo "configure:2704: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2727 "configure" | |
+#line 2729 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2801,7 +2803,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:2805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -2835,7 +2837,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2839 "configure" | |
+#line 2841 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2845,7 +2847,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
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… | |
t@@ -2877,12 +2879,13 @@ rm -f conftest* | |
fi | |
GTK_CFLAGS="" | |
GTK_LIBS="" | |
- gtk_found="no" | |
+ : | |
fi | |
rm -f conf.gtktest | |
+ fi | |
if test "$gtk_found" = "no" ; then | |
if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
{ echo "configure: error: Cannot find GTK+" 1>&2; exit 1; } | |
t@@ -2893,7 +2896,7 @@ rm -f conftest* | |
fi | |
else | |
echo $ac_n "checking for non-buggy GTK+ ( >= 1.2.10 )""... $ac_c" 1… | |
-echo "configure:2897: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
+echo "configure:2900: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
if test "$gtk_config_major_version" -gt 1 ; then | |
HAVE_FIXED_GTK="yes" | |
elif test "$gtk_config_major_version" -eq 1 ; then | |
t@@ -2914,9 +2917,9 @@ echo "configure:2897: checking for non-buggy GTK+ ( >= 1… | |
fi | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:2918: checking for socklen_t data type" >&5 | |
+echo "configure:2921: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 2920 "configure" | |
+#line 2923 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -2924,7 +2927,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:2931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -2951,7 +2954,7 @@ ALL_LINGUAS="de pl pt_BR fr" | |
# 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:2955: checking for $ac_word" >&5 | |
+echo "configure:2958: 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 | |
t@@ -2979,12 +2982,12 @@ else | |
fi | |
echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
-echo "configure:2983: checking for working const" >&5 | |
+echo "configure:2986: checking for working const" >&5 | |
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2988 "configure" | |
+#line 2991 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -3033,7 +3036,7 @@ ccp = (char const *const *) p; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_const=yes | |
else | |
t@@ -3054,21 +3057,21 @@ EOF | |
fi | |
echo $ac_n "checking for inline""... $ac_c" 1>&6 | |
-echo "configure:3058: checking for inline" >&5 | |
+echo "configure:3061: checking for inline" >&5 | |
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_cv_c_inline=no | |
for ac_kw in inline __inline__ __inline; do | |
cat > conftest.$ac_ext <<EOF | |
-#line 3065 "configure" | |
+#line 3068 "configure" | |
#include "confdefs.h" | |
int main() { | |
} $ac_kw foo() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_inline=$ac_kw; break | |
else | |
t@@ -3094,12 +3097,12 @@ EOF | |
esac | |
echo $ac_n "checking for off_t""... $ac_c" 1>&6 | |
-echo "configure:3098: checking for off_t" >&5 | |
+echo "configure:3101: checking for off_t" >&5 | |
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3103 "configure" | |
+#line 3106 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -3127,12 +3130,12 @@ EOF | |
fi | |
echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
-echo "configure:3131: checking for size_t" >&5 | |
+echo "configure:3134: 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 3136 "configure" | |
+#line 3139 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -3162,19 +3165,19 @@ 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:3166: checking for working alloca.h" >&5 | |
+echo "configure:3169: 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 3171 "configure" | |
+#line 3174 "configure" | |
#include "confdefs.h" | |
#include <alloca.h> | |
int main() { | |
char *p = alloca(2 * sizeof(int)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_header_alloca_h=yes | |
else | |
t@@ -3195,12 +3198,12 @@ EOF | |
fi | |
echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
-echo "configure:3199: checking for alloca" >&5 | |
+echo "configure:3202: 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 3204 "configure" | |
+#line 3207 "configure" | |
#include "confdefs.h" | |
#ifdef __GNUC__ | |
t@@ -3228,7 +3231,7 @@ int main() { | |
char *p = (char *) alloca(1); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_func_alloca_works=yes | |
else | |
t@@ -3260,12 +3263,12 @@ EOF | |
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
-echo "configure:3264: checking whether alloca needs Cray hooks" >&5 | |
+echo "configure:3267: 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 3269 "configure" | |
+#line 3272 "configure" | |
#include "confdefs.h" | |
#if defined(CRAY) && ! defined(CRAY2) | |
webecray | |
t@@ -3290,12 +3293,12 @@ 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:3294: checking for $ac_func" >&5 | |
+echo "configure:3297: 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 3299 "configure" | |
+#line 3302 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -3318,7 +3321,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -3345,7 +3348,7 @@ done | |
fi | |
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
-echo "configure:3349: checking stack direction for C alloca" >&5 | |
+echo "configure:3352: 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 | |
t@@ -3353,7 +3356,7 @@ else | |
ac_cv_c_stack_direction=0 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3357 "configure" | |
+#line 3360 "configure" | |
#include "confdefs.h" | |
find_stack_direction () | |
{ | |
t@@ -3372,7 +3375,7 @@ main () | |
exit (find_stack_direction() < 0); | |
} | |
EOF | |
-if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_c_stack_direction=1 | |
else | |
t@@ -3397,17 +3400,17 @@ for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:3401: checking for $ac_hdr" >&5 | |
+echo "configure:3404: 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 3406 "configure" | |
+#line 3409 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3414: \"$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* | |
t@@ -3436,12 +3439,12 @@ done | |
for ac_func in getpagesize | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:3440: checking for $ac_func" >&5 | |
+echo "configure:3443: 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 3445 "configure" | |
+#line 3448 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -3464,7 +3467,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -3489,7 +3492,7 @@ fi | |
done | |
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 | |
-echo "configure:3493: checking for working mmap" >&5 | |
+echo "configure:3496: 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 | |
t@@ -3497,7 +3500,7 @@ else | |
ac_cv_func_mmap_fixed_mapped=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3501 "configure" | |
+#line 3504 "configure" | |
#include "confdefs.h" | |
/* Thanks to Mike Haertel and Jim Avera for this test. | |
t@@ -3650,7 +3653,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_mmap_fixed_mapped=yes | |
else | |
t@@ -3674,12 +3677,12 @@ fi | |
echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""… | |
-echo "configure:3678: checking whether we are using the GNU C Library 2.1 or n… | |
+echo "configure:3681: checking whether we are using the GNU C Library 2.1 or n… | |
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 3683 "configure" | |
+#line 3686 "configure" | |
#include "confdefs.h" | |
#include <features.h> | |
t@@ -3715,17 +3718,17 @@ 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:3719: checking for $ac_hdr" >&5 | |
+echo "configure:3722: 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 3724 "configure" | |
+#line 3727 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3732: \"$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* | |
t@@ -3756,12 +3759,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale s… | |
strdup strtoul tsearch __argz_count __argz_stringify __argz_next | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:3760: checking for $ac_func" >&5 | |
+echo "configure:3763: 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 3765 "configure" | |
+#line 3768 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -3784,7 +3787,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -3824,7 +3827,7 @@ fi | |
echo $ac_n "checking for iconv""... $ac_c" 1>&6 | |
-echo "configure:3828: checking for iconv" >&5 | |
+echo "configure:3831: checking for iconv" >&5 | |
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3832,7 +3835,7 @@ else | |
am_cv_func_iconv="no, consider installing GNU libiconv" | |
am_cv_lib_iconv=no | |
cat > conftest.$ac_ext <<EOF | |
-#line 3836 "configure" | |
+#line 3839 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <iconv.h> | |
t@@ -3842,7 +3845,7 @@ iconv_t cd = iconv_open("",""); | |
iconv_close(cd); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_func_iconv=yes | |
else | |
t@@ -3854,7 +3857,7 @@ rm -f conftest* | |
am_save_LIBS="$LIBS" | |
LIBS="$LIBS -liconv" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3858 "configure" | |
+#line 3861 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <iconv.h> | |
t@@ -3864,7 +3867,7 @@ iconv_t cd = iconv_open("",""); | |
iconv_close(cd); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_lib_iconv=yes | |
am_cv_func_iconv=yes | |
t@@ -3885,13 +3888,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 | |
EOF | |
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 | |
-echo "configure:3889: checking for iconv declaration" >&5 | |
+echo "configure:3892: 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 3895 "configure" | |
+#line 3898 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
t@@ -3910,7 +3913,7 @@ int main() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
am_cv_proto_iconv_arg1="" | |
else | |
t@@ -3939,19 +3942,19 @@ EOF | |
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 | |
-echo "configure:3943: checking for nl_langinfo and CODESET" >&5 | |
+echo "configure:3946: 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 3948 "configure" | |
+#line 3951 "configure" | |
#include "confdefs.h" | |
#include <langinfo.h> | |
int main() { | |
char* cs = nl_langinfo(CODESET); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_langinfo_codeset=yes | |
else | |
t@@ -3974,19 +3977,19 @@ EOF | |
if test $ac_cv_header_locale_h = yes; then | |
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | |
-echo "configure:3978: checking for LC_MESSAGES" >&5 | |
+echo "configure:3981: 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 3983 "configure" | |
+#line 3986 "configure" | |
#include "confdefs.h" | |
#include <locale.h> | |
int main() { | |
return LC_MESSAGES | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_val_LC_MESSAGES=yes | |
else | |
t@@ -4007,7 +4010,7 @@ EOF | |
fi | |
fi | |
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
-echo "configure:4011: checking whether NLS is requested" >&5 | |
+echo "configure:4014: 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" | |
t@@ -4029,7 +4032,7 @@ fi | |
EOF | |
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1… | |
-echo "configure:4033: checking whether included gettext is requested" >&5 | |
+echo "configure:4036: checking whether included gettext is requested" >&5 | |
# Check whether --with-included-gettext or --without-included-gettext wa… | |
if test "${with_included_gettext+set}" = set; then | |
withval="$with_included_gettext" | |
t@@ -4049,17 +4052,17 @@ fi | |
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 | |
-echo "configure:4053: checking for libintl.h" >&5 | |
+echo "configure:4056: checking for libintl.h" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4058 "configure" | |
+#line 4061 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4066: \"$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* | |
t@@ -4076,12 +4079,12 @@ fi | |
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
echo "$ac_t""yes" 1>&6 | |
echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 | |
-echo "configure:4080: checking for GNU gettext in libc" >&5 | |
+echo "configure:4083: 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 4085 "configure" | |
+#line 4088 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
extern int _nl_msg_cat_cntr; | |
t@@ -4090,7 +4093,7 @@ bindtextdomain ("", ""); | |
return (int) gettext ("") + _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gnugettext1_libc=yes | |
else | |
t@@ -4106,14 +4109,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 | |
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then | |
echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 | |
-echo "configure:4110: checking for GNU gettext in libintl" >&5 | |
+echo "configure:4113: checking for GNU gettext in libintl" >&5 | |
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; t… | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
gt_save_LIBS="$LIBS" | |
LIBS="$LIBS -lintl $LIBICONV" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4117 "configure" | |
+#line 4120 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
extern int _nl_msg_cat_cntr; | |
t@@ -4122,7 +4125,7 @@ bindtextdomain ("", ""); | |
return (int) gettext ("") + _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gnugettext1_libintl=yes | |
else | |
t@@ -4155,12 +4158,12 @@ EOF | |
for ac_func in dcgettext | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4159: checking for $ac_func" >&5 | |
+echo "configure:4162: 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 4164 "configure" | |
+#line 4167 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4183,7 +4186,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4212,7 +4215,7 @@ done | |
# Extract the first word of "msgfmt", so it can be a program name… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4216: checking for $ac_word" >&5 | |
+echo "configure:4219: 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 | |
t@@ -4246,7 +4249,7 @@ fi | |
# Extract the first word of "gmsgfmt", so it can be a program n… | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4250: checking for $ac_word" >&5 | |
+echo "configure:4253: 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 | |
t@@ -4284,7 +4287,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a program na… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4288: checking for $ac_word" >&5 | |
+echo "configure:4291: 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 | |
t@@ -4334,7 +4337,7 @@ fi | |
# Extract the first word of "msgfmt", so it can be a program name with… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4338: checking for $ac_word" >&5 | |
+echo "configure:4341: 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 | |
t@@ -4368,7 +4371,7 @@ fi | |
# Extract the first word of "gmsgfmt", so it can be a program name wit… | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4372: checking for $ac_word" >&5 | |
+echo "configure:4375: 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 | |
t@@ -4404,7 +4407,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a program name wi… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:4408: checking for $ac_word" >&5 | |
+echo "configure:4411: 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 | |
t@@ -4466,7 +4469,7 @@ 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:4470: checking for $ac_word" >&5 | |
+echo "configure:4473: 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 | |
t@@ -4499,7 +4502,7 @@ done | |
ac_verc_fail=yes | |
else | |
echo $ac_n "checking version of bison""... $ac_c" 1>&6 | |
-echo "configure:4503: checking version of bison" >&5 | |
+echo "configure:4506: checking version of bison" >&5 | |
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \… | |
case $ac_prog_version in | |
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | |
t@@ -4546,7 +4549,7 @@ echo "configure:4503: checking version of bison" >&5 | |
LINGUAS= | |
else | |
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 | |
-echo "configure:4550: checking for catalogs to be installed" >&5 | |
+echo "configure:4553: checking for catalogs to be installed" >&5 | |
NEW_LINGUAS= | |
for presentlang in $ALL_LINGUAS; do | |
useit=no | |
t@@ -4621,7 +4624,7 @@ EOF | |
fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4625: checking size of long long" >&5 | |
+echo "configure:4628: checking size of long long" >&5 | |
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4629,7 +4632,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4633 "configure" | |
+#line 4636 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
int main() | |
t@@ -4640,7 +4643,7 @@ int main() | |
return(0); | |
} | |
EOF | |
-if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4661,7 +4664,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4665: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4668: checking for 8-bit clean memcmp" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4669,7 +4672,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4673 "configure" | |
+#line 4676 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4679,7 +4682,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4697,7 +4700,7 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 | |
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" | |
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 | |
-echo "configure:4701: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4704: checking whether setvbuf arguments are reversed" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4705,7 +4708,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4709 "configure" | |
+#line 4712 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4719,7 +4722,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4743,12 +4746,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4747: checking for strftime" >&5 | |
+echo "configure:4750: checking for strftime" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4752 "configure" | |
+#line 4755 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4771,7 +4774,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4793,7 +4796,7 @@ else | |
echo "$ac_t""no" 1>&6 | |
# strftime is in -lintl on SCO UNIX. | |
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 | |
-echo "configure:4797: checking for strftime in -lintl" >&5 | |
+echo "configure:4800: checking for strftime in -lintl" >&5 | |
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -4801,7 +4804,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4805 "configure" | |
+#line 4808 "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 | |
t@@ -4812,7 +4815,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4841,12 +4844,12 @@ fi | |
for ac_func in strdup strstr getopt getopt_long fork | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4845: checking for $ac_func" >&5 | |
+echo "configure:4848: 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 4850 "configure" | |
+#line 4853 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4869,7 +4872,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4900,14 +4903,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4904: checking for library containing socket" >&5 | |
+echo "configure:4907: checking for library containing socket" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_socket="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4911 "configure" | |
+#line 4914 "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 | |
t@@ -4918,7 +4921,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4929,7 +4932,7 @@ rm -f conftest* | |
test "$ac_cv_search_socket" = "no" && for i in socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4933 "configure" | |
+#line 4936 "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 | |
t@@ -4940,7 +4943,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4962,14 +4965,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4966: checking for library containing gethostbyname" >&5 | |
+echo "configure:4969: checking for library containing gethostbyname" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_gethostbyname="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4973 "configure" | |
+#line 4976 "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 | |
t@@ -4980,7 +4983,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4991,7 +4994,7 @@ rm -f conftest* | |
test "$ac_cv_search_gethostbyname" = "no" && for i in nsl socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4995 "configure" | |
+#line 4998 "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 | |
t@@ -5002,7 +5005,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:5006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:5009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -5025,12 +5028,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:5029: checking for $ac_func" >&5 | |
+echo "configure:5032: 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 5034 "configure" | |
+#line 5037 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -5053,7 +5056,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
diff --git a/configure.in b/configure.in | |
t@@ -92,6 +92,7 @@ else | |
glib2_found="no" | |
if test "$USE_GLIB2" = "yes" ; then | |
AM_PATH_GLIB_2_0(2.0.0, glib2_found="yes") | |
+ AC_DEFINE(HAVE_GLIB2) | |
fi | |
if test "$glib2_found" = "no" ; then | |
AM_PATH_GLIB(1.2.0, , [AC_MSG_ERROR(Cannot find glib - aborting)]) | |
t@@ -117,16 +118,19 @@ else | |
fi | |
if test "$GUI_CLIENT" != "no" -o "$GUI_SERVER" != "no"; then | |
- dnl Tests for GTK | |
+ dnl Tests for GTK; N.B. bad things will happen if we use GTK+2 but | |
+ dnl GLIB1, or vice versa, so we try to stop that from happening. | |
gtk2_found="no" | |
if test "$USE_GLIB2" = "yes" ; then | |
AM_PATH_GTK_2_0(2.0.0,gtk2_found="yes") | |
fi | |
if test "$gtk2_found" = "yes" ; then | |
HAVE_FIXED_GTK="yes" | |
- AC_DEFINE(HAVE_GTK2) | |
else | |
- AM_PATH_GTK(1.2.0,gtk_found="yes",gtk_found="no") | |
+ gtk_found="no" | |
+ if test "$glib2_found" = "no" ; then | |
+ AM_PATH_GTK(1.2.0,gtk_found="yes") | |
+ fi | |
if test "$gtk_found" = "no" ; then | |
if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
AC_MSG_ERROR(Cannot find GTK+) | |
diff --git a/src/network.c b/src/network.c | |
t@@ -1334,7 +1334,11 @@ static void StartHttpAuth(HttpConnection *conn, gboolea… | |
if (!conn->authfunc) | |
return; | |
+#ifdef HAVE_GLIB2 | |
+ split = g_strsplit(header, " ", 2); | |
+#else | |
split = g_strsplit(header, " ", 1); | |
+#endif | |
if (split[0] && split[1] && g_strcasecmp(split[0], "Basic") == 0 && | |
g_strncasecmp(split[1], "realm=", 6) == 0 && strlen(split[1]) > 6) { | |
t@@ -1355,7 +1359,11 @@ static void ParseHtmlHeader(gchar *line, HttpConnection… | |
gchar **split, *host, *query; | |
unsigned port; | |
+#ifdef HAVE_GLIB2 | |
+ split = g_strsplit(line, " ", 2); | |
+#else | |
split = g_strsplit(line, " ", 1); | |
+#endif | |
if (split[0] && split[1]) { | |
if (g_strcasecmp(split[0], "Location:") == 0 && | |
(conn->StatusCode == HEC_MOVETEMP | |
t@@ -1393,7 +1401,11 @@ gchar *ReadHttpResponse(HttpConnection *conn, gboolean … | |
switch (conn->Status) { | |
case HS_CONNECTING: /* OK, we should have the HTTP status line */ | |
conn->Status = HS_READHEADERS; | |
+#ifdef HAVE_GLIB2 | |
+ split = g_strsplit(msg, " ", 3); | |
+#else | |
split = g_strsplit(msg, " ", 2); | |
+#endif | |
if (split[0] && split[1]) { | |
conn->StatusCode = atoi(split[1]); | |
} else { |