tconfigure test added for graphical server; now works on Unix also - vaccinewar… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 165b0b7bf612481f1b0424a609367c49ab8f94ed | |
parent 118b9d08742be23909ab43e0016cdbec8517152c | |
Author: Ben Webb <[email protected]> | |
Date: Sat, 28 Apr 2001 18:09:42 +0000 | |
configure test added for graphical server; now works on Unix also | |
Diffstat: | |
M acconfig.h | 3 +++ | |
M config.h.in | 3 +++ | |
M configure | 398 ++++++++++++++++-------------… | |
M configure.in | 16 ++++++++++++++++ | |
M src/dopewars.c | 12 ++++++++++++ | |
M src/serverside.c | 2 +- | |
6 files changed, 244 insertions(+), 190 deletions(-) | |
--- | |
diff --git a/acconfig.h b/acconfig.h | |
t@@ -14,6 +14,9 @@ | |
/* Use the Win32 client? */ | |
#undef WIN32_CLIENT | |
+/* Use a graphical server? */ | |
+#undef GUI_SERVER | |
+ | |
#undef ENABLE_NLS | |
#undef HAVE_CATGETS | |
#undef HAVE_GETTEXT | |
diff --git a/config.h.in b/config.h.in | |
t@@ -72,6 +72,9 @@ | |
/* Use the (n)curses client? */ | |
#undef CURSES_CLIENT | |
+/* Use a graphical server? */ | |
+#undef GUI_SERVER | |
+ | |
#undef ENABLE_NLS | |
#undef HAVE_CATGETS | |
#undef HAVE_GETTEXT | |
diff --git a/configure b/configure | |
t@@ -30,6 +30,8 @@ ac_help="$ac_help | |
ac_help="$ac_help | |
--disable-gtktest Do not try to compile and run a test GTK program" | |
ac_help="$ac_help | |
+ --enable-gui-server use a simple GTK+/Win32 GUI for the server" | |
+ac_help="$ac_help | |
--enable-networking dopewars will use TCP/IP to connect to servers" | |
# Initialize some variables set by options. | |
t@@ -573,7 +575,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus… | |
# 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:577: checking for a BSD compatible install" >&5 | |
+echo "configure:579: 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 | |
t@@ -626,7 +628,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PRO… | |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 | |
-echo "configure:630: checking whether build environment is sane" >&5 | |
+echo "configure:632: checking whether build environment is sane" >&5 | |
# Just in case | |
sleep 1 | |
echo timestamp > conftestfile | |
t@@ -683,7 +685,7 @@ test "$program_suffix" != NONE && | |
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:687: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
+echo "configure:689: 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"; t… | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -729,7 +731,7 @@ EOF | |
missing_dir=`cd $ac_aux_dir && pwd` | |
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 | |
-echo "configure:733: checking for working aclocal" >&5 | |
+echo "configure:735: 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. | |
t@@ -742,7 +744,7 @@ else | |
fi | |
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 | |
-echo "configure:746: checking for working autoconf" >&5 | |
+echo "configure:748: 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. | |
t@@ -755,7 +757,7 @@ else | |
fi | |
echo $ac_n "checking for working automake""... $ac_c" 1>&6 | |
-echo "configure:759: checking for working automake" >&5 | |
+echo "configure:761: 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. | |
t@@ -768,7 +770,7 @@ else | |
fi | |
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 | |
-echo "configure:772: checking for working autoheader" >&5 | |
+echo "configure:774: 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. | |
t@@ -781,7 +783,7 @@ else | |
fi | |
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 | |
-echo "configure:785: checking for working makeinfo" >&5 | |
+echo "configure:787: 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. | |
t@@ -802,7 +804,7 @@ fi | |
# 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:806: checking for $ac_word" >&5 | |
+echo "configure:808: 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 | |
t@@ -832,7 +834,7 @@ if test -z "$CC"; then | |
# 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:836: checking for $ac_word" >&5 | |
+echo "configure:838: 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 | |
t@@ -883,7 +885,7 @@ fi | |
# 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:887: checking for $ac_word" >&5 | |
+echo "configure:889: 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 | |
t@@ -915,7 +917,7 @@ fi | |
fi | |
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... … | |
-echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) wo… | |
+echo "configure:921: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) wo… | |
ac_ext=c | |
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
t@@ -926,12 +928,12 @@ cross_compiling=$ac_cv_prog_cc_cross | |
cat > conftest.$ac_ext << EOF | |
-#line 930 "configure" | |
+#line 932 "configure" | |
#include "confdefs.h" | |
main(){return(0);} | |
EOF | |
-if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && … | |
+if { (eval echo configure:937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && … | |
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 | |
t@@ -957,12 +959,12 @@ if test $ac_cv_prog_cc_works = no; then | |
{ echo "configure: error: installation or configuration problem: C compiler … | |
fi | |
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-… | |
-echo "configure:961: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is… | |
+echo "configure:963: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is… | |
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:966: checking whether we are using GNU C" >&5 | |
+echo "configure:968: 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 | |
t@@ -971,7 +973,7 @@ else | |
yes; | |
#endif | |
EOF | |
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\")… | |
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:977: \"$ac_try\")… | |
ac_cv_prog_gcc=yes | |
else | |
ac_cv_prog_gcc=no | |
t@@ -990,7 +992,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | |
ac_save_CFLAGS="$CFLAGS" | |
CFLAGS= | |
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
-echo "configure:994: checking whether ${CC-cc} accepts -g" >&5 | |
+echo "configure:996: 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 | |
t@@ -1033,7 +1035,7 @@ fi | |
# 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:1037: checking for a BSD compatible install" >&5 | |
+echo "configure:1039: 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 | |
t@@ -1088,7 +1090,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 6… | |
ALL_LINGUAS="de pl pt_BR" | |
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | |
-echo "configure:1092: checking how to run the C preprocessor" >&5 | |
+echo "configure:1094: checking how to run the C preprocessor" >&5 | |
# On Suns, sometimes $CPP names a directory. | |
if test -n "$CPP" && test -d "$CPP"; then | |
CPP= | |
t@@ -1103,13 +1105,13 @@ else | |
# On the NeXT, cc -E runs the code through the compiler's parser, | |
# not just through cpp. | |
cat > conftest.$ac_ext <<EOF | |
-#line 1107 "configure" | |
+#line 1109 "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:1113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1115: \"$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 | |
: | |
t@@ -1120,13 +1122,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -E -traditional-cpp" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1124 "configure" | |
+#line 1126 "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:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1132: \"$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 | |
: | |
t@@ -1137,13 +1139,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -nologo -E" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1141 "configure" | |
+#line 1143 "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:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1149: \"$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 | |
: | |
t@@ -1170,7 +1172,7 @@ echo "$ac_t""$CPP" 1>&6 | |
# 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:1174: checking for $ac_word" >&5 | |
+echo "configure:1176: 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@@ -1198,7 +1200,7 @@ else | |
fi | |
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 | |
-echo "configure:1202: checking for POSIXized ISC" >&5 | |
+echo "configure:1204: checking for POSIXized ISC" >&5 | |
if test -d /etc/conf/kconfig.d && | |
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 | |
then | |
t@@ -1219,12 +1221,12 @@ else | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:1223: checking for ANSI C header files" >&5 | |
+echo "configure:1225: 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 1228 "configure" | |
+#line 1230 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -1232,7 +1234,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1238: \"$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@@ -1249,7 +1251,7 @@ rm -f conftest* | |
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 1253 "configure" | |
+#line 1255 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -1267,7 +1269,7 @@ fi | |
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 1271 "configure" | |
+#line 1273 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -1288,7 +1290,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1292 "configure" | |
+#line 1294 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -1299,7 +1301,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -1323,12 +1325,12 @@ EOF | |
fi | |
echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
-echo "configure:1327: checking for working const" >&5 | |
+echo "configure:1329: 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 1332 "configure" | |
+#line 1334 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -1377,7 +1379,7 @@ ccp = (char const *const *) p; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_const=yes | |
else | |
t@@ -1398,21 +1400,21 @@ EOF | |
fi | |
echo $ac_n "checking for inline""... $ac_c" 1>&6 | |
-echo "configure:1402: checking for inline" >&5 | |
+echo "configure:1404: 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 1409 "configure" | |
+#line 1411 "configure" | |
#include "confdefs.h" | |
int main() { | |
} $ac_kw foo() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_inline=$ac_kw; break | |
else | |
t@@ -1438,12 +1440,12 @@ EOF | |
esac | |
echo $ac_n "checking for off_t""... $ac_c" 1>&6 | |
-echo "configure:1442: checking for off_t" >&5 | |
+echo "configure:1444: 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 1447 "configure" | |
+#line 1449 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -1471,12 +1473,12 @@ EOF | |
fi | |
echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
-echo "configure:1475: checking for size_t" >&5 | |
+echo "configure:1477: 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 1480 "configure" | |
+#line 1482 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -1506,19 +1508,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:1510: checking for working alloca.h" >&5 | |
+echo "configure:1512: 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 1515 "configure" | |
+#line 1517 "configure" | |
#include "confdefs.h" | |
#include <alloca.h> | |
int main() { | |
char *p = alloca(2 * sizeof(int)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_header_alloca_h=yes | |
else | |
t@@ -1539,12 +1541,12 @@ EOF | |
fi | |
echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
-echo "configure:1543: checking for alloca" >&5 | |
+echo "configure:1545: 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 1548 "configure" | |
+#line 1550 "configure" | |
#include "confdefs.h" | |
#ifdef __GNUC__ | |
t@@ -1572,7 +1574,7 @@ int main() { | |
char *p = (char *) alloca(1); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_func_alloca_works=yes | |
else | |
t@@ -1604,12 +1606,12 @@ EOF | |
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
-echo "configure:1608: checking whether alloca needs Cray hooks" >&5 | |
+echo "configure:1610: 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 1613 "configure" | |
+#line 1615 "configure" | |
#include "confdefs.h" | |
#if defined(CRAY) && ! defined(CRAY2) | |
webecray | |
t@@ -1634,12 +1636,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:1638: checking for $ac_func" >&5 | |
+echo "configure:1640: 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 1643 "configure" | |
+#line 1645 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -1662,7 +1664,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -1689,7 +1691,7 @@ done | |
fi | |
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
-echo "configure:1693: checking stack direction for C alloca" >&5 | |
+echo "configure:1695: 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@@ -1697,7 +1699,7 @@ else | |
ac_cv_c_stack_direction=0 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1701 "configure" | |
+#line 1703 "configure" | |
#include "confdefs.h" | |
find_stack_direction () | |
{ | |
t@@ -1716,7 +1718,7 @@ main () | |
exit (find_stack_direction() < 0); | |
} | |
EOF | |
-if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_c_stack_direction=1 | |
else | |
t@@ -1741,17 +1743,17 @@ 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:1745: checking for $ac_hdr" >&5 | |
+echo "configure:1747: 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 1750 "configure" | |
+#line 1752 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1757: \"$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@@ -1780,12 +1782,12 @@ done | |
for ac_func in getpagesize | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:1784: checking for $ac_func" >&5 | |
+echo "configure:1786: 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 1789 "configure" | |
+#line 1791 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -1808,7 +1810,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -1833,7 +1835,7 @@ fi | |
done | |
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 | |
-echo "configure:1837: checking for working mmap" >&5 | |
+echo "configure:1839: 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@@ -1841,7 +1843,7 @@ else | |
ac_cv_func_mmap_fixed_mapped=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1845 "configure" | |
+#line 1847 "configure" | |
#include "confdefs.h" | |
/* Thanks to Mike Haertel and Jim Avera for this test. | |
t@@ -1981,7 +1983,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_mmap_fixed_mapped=yes | |
else | |
t@@ -2009,17 +2011,17 @@ 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:2013: checking for $ac_hdr" >&5 | |
+echo "configure:2015: 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 2018 "configure" | |
+#line 2020 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:2025: \"$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@@ -2049,12 +2051,12 @@ done | |
strdup __argz_count __argz_stringify __argz_next | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2053: checking for $ac_func" >&5 | |
+echo "configure:2055: 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 2058 "configure" | |
+#line 2060 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2077,7 +2079,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2106,12 +2108,12 @@ done | |
for ac_func in stpcpy | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2110: checking for $ac_func" >&5 | |
+echo "configure:2112: 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 2115 "configure" | |
+#line 2117 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2134,7 +2136,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2168,19 +2170,19 @@ EOF | |
if test $ac_cv_header_locale_h = yes; then | |
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | |
-echo "configure:2172: checking for LC_MESSAGES" >&5 | |
+echo "configure:2174: 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 2177 "configure" | |
+#line 2179 "configure" | |
#include "confdefs.h" | |
#include <locale.h> | |
int main() { | |
return LC_MESSAGES | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_val_LC_MESSAGES=yes | |
else | |
t@@ -2201,7 +2203,7 @@ EOF | |
fi | |
fi | |
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
-echo "configure:2205: checking whether NLS is requested" >&5 | |
+echo "configure:2207: 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@@ -2221,7 +2223,7 @@ fi | |
EOF | |
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1… | |
-echo "configure:2225: checking whether included gettext is requested" >&5 | |
+echo "configure:2227: 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@@ -2240,17 +2242,17 @@ fi | |
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 | |
-echo "configure:2244: checking for libintl.h" >&5 | |
+echo "configure:2246: 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 2249 "configure" | |
+#line 2251 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:2256: \"$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@@ -2267,19 +2269,19 @@ fi | |
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
echo "$ac_t""yes" 1>&6 | |
echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 | |
-echo "configure:2271: checking for gettext in libc" >&5 | |
+echo "configure:2273: checking for gettext in libc" >&5 | |
if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2276 "configure" | |
+#line 2278 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
int main() { | |
return (int) gettext ("") | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gettext_libc=yes | |
else | |
t@@ -2295,7 +2297,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 | |
if test "$gt_cv_func_gettext_libc" != "yes"; then | |
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 | |
-echo "configure:2299: checking for bindtextdomain in -lintl" >&5 | |
+echo "configure:2301: checking for bindtextdomain in -lintl" >&5 | |
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2303,7 +2305,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2307 "configure" | |
+#line 2309 "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@@ -2314,7 +2316,7 @@ int main() { | |
bindtextdomain() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2330,12 +2332,12 @@ fi | |
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
echo "$ac_t""yes" 1>&6 | |
echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 | |
-echo "configure:2334: checking for gettext in libintl" >&5 | |
+echo "configure:2336: checking for gettext in libintl" >&5 | |
if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 | |
-echo "configure:2339: checking for gettext in -lintl" >&5 | |
+echo "configure:2341: checking for gettext in -lintl" >&5 | |
ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2343,7 +2345,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2347 "configure" | |
+#line 2349 "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@@ -2354,7 +2356,7 @@ int main() { | |
gettext() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2393,7 +2395,7 @@ EOF | |
# Extract the first word of "msgfmt", so it can be a program nam… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2397: checking for $ac_word" >&5 | |
+echo "configure:2399: 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@@ -2427,12 +2429,12 @@ fi | |
for ac_func in dcgettext | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2431: checking for $ac_func" >&5 | |
+echo "configure:2433: 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 2436 "configure" | |
+#line 2438 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2455,7 +2457,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2482,7 +2484,7 @@ done | |
# Extract the first word of "gmsgfmt", so it can be a program … | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2486: checking for $ac_word" >&5 | |
+echo "configure:2488: 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@@ -2518,7 +2520,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a program… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2522: checking for $ac_word" >&5 | |
+echo "configure:2524: 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@@ -2550,7 +2552,7 @@ else | |
fi | |
cat > conftest.$ac_ext <<EOF | |
-#line 2554 "configure" | |
+#line 2556 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -2558,7 +2560,7 @@ extern int _nl_msg_cat_cntr; | |
return _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
CATOBJEXT=.gmo | |
DATADIRNAME=share | |
t@@ -2581,7 +2583,7 @@ fi | |
if test "$CATOBJEXT" = "NONE"; then | |
echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 | |
-echo "configure:2585: checking whether catgets can be used" >&5 | |
+echo "configure:2587: checking whether catgets can be used" >&5 | |
# Check whether --with-catgets or --without-catgets was given. | |
if test "${with_catgets+set}" = set; then | |
withval="$with_catgets" | |
t@@ -2594,7 +2596,7 @@ fi | |
if test "$nls_cv_use_catgets" = "yes"; then | |
echo $ac_n "checking for main in -li""... $ac_c" 1>&6 | |
-echo "configure:2598: checking for main in -li" >&5 | |
+echo "configure:2600: checking for main in -li" >&5 | |
ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2602,14 +2604,14 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-li $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2606 "configure" | |
+#line 2608 "configure" | |
#include "confdefs.h" | |
int main() { | |
main() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2637,12 +2639,12 @@ else | |
fi | |
echo $ac_n "checking for catgets""... $ac_c" 1>&6 | |
-echo "configure:2641: checking for catgets" >&5 | |
+echo "configure:2643: checking for catgets" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2646 "configure" | |
+#line 2648 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char catgets(); below. */ | |
t@@ -2665,7 +2667,7 @@ catgets(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_catgets=yes" | |
else | |
t@@ -2687,7 +2689,7 @@ EOF | |
# Extract the first word of "gencat", so it can be a program na… | |
set dummy gencat; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2691: checking for $ac_word" >&5 | |
+echo "configure:2693: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2723,7 +2725,7 @@ fi | |
# Extract the first word of "gmsgfmt", so it can be a program… | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2727: checking for $ac_word" >&5 | |
+echo "configure:2729: 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@@ -2760,7 +2762,7 @@ fi | |
# Extract the first word of "msgfmt", so it can be a progra… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2764: checking for $ac_word" >&5 | |
+echo "configure:2766: 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@@ -2795,7 +2797,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a progra… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2799: checking for $ac_word" >&5 | |
+echo "configure:2801: 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@@ -2853,7 +2855,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:2857: checking for $ac_word" >&5 | |
+echo "configure:2859: 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@@ -2887,7 +2889,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:2891: checking for $ac_word" >&5 | |
+echo "configure:2893: 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@@ -2923,7 +2925,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:2927: checking for $ac_word" >&5 | |
+echo "configure:2929: 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@@ -3016,7 +3018,7 @@ fi | |
LINGUAS= | |
else | |
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 | |
-echo "configure:3020: checking for catalogs to be installed" >&5 | |
+echo "configure:3022: checking for catalogs to be installed" >&5 | |
NEW_LINGUAS= | |
for lang in ${LINGUAS=$ALL_LINGUAS}; do | |
case "$ALL_LINGUAS" in | |
t@@ -3044,17 +3046,17 @@ echo "configure:3020: checking for catalogs to be inst… | |
if test "$CATOBJEXT" = ".cat"; then | |
ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 | |
-echo "configure:3048: checking for linux/version.h" >&5 | |
+echo "configure:3050: checking for linux/version.h" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3053 "configure" | |
+#line 3055 "configure" | |
#include "confdefs.h" | |
#include <linux/version.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3060: \"$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@@ -3148,12 +3150,12 @@ WIN_RES="" | |
WIN_MAKE_RES="/dev/null" | |
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | |
-echo "configure:3152: checking for Cygwin environment" >&5 | |
+echo "configure:3154: 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 3157 "configure" | |
+#line 3159 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -3164,7 +3166,7 @@ int main() { | |
return __CYGWIN__; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_cygwin=yes | |
else | |
t@@ -3203,11 +3205,13 @@ EOF | |
fi | |
LDFLAGS="$LDFLAGS -lglib-1.3" | |
+ | |
+ GUI_SERVER="yes" | |
else | |
echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
if test "$CURSES_CLIENT" = "yes" ; then | |
echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:3211: checking for initscr in -lncurses" >&5 | |
+echo "configure:3215: checking for initscr in -lncurses" >&5 | |
ac_lib_var=`echo ncurses'_'initscr | 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@@ -3215,7 +3219,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3219 "configure" | |
+#line 3223 "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@@ -3226,7 +3230,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3255,7 +3259,7 @@ fi | |
if test "$ac_cv_lib_ncurses_initscr" = "no" ; then | |
echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 | |
-echo "configure:3259: checking for initscr in -lcurses" >&5 | |
+echo "configure:3263: checking for initscr in -lcurses" >&5 | |
ac_lib_var=`echo curses'_'initscr | 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@@ -3263,7 +3267,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3267 "configure" | |
+#line 3271 "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@@ -3274,7 +3278,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3303,7 +3307,7 @@ fi | |
if test "$ac_cv_lib_curses_initscr" = "no" ; then | |
echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 | |
-echo "configure:3307: checking for initscr in -lcur_colr" >&5 | |
+echo "configure:3311: checking for initscr in -lcur_colr" >&5 | |
ac_lib_var=`echo cur_colr'_'initscr | 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@@ -3311,7 +3315,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3315 "configure" | |
+#line 3319 "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@@ -3322,7 +3326,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3408,7 +3412,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:3412: checking for $ac_word" >&5 | |
+echo "configure:3416: 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@@ -3443,7 +3447,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:3447: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:3451: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -3466,7 +3470,7 @@ echo "configure:3447: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3470 "configure" | |
+#line 3474 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3544,7 +3548,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3578,7 +3582,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3582 "configure" | |
+#line 3586 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3588,7 +3592,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3596: \"$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@@ -3641,6 +3645,8 @@ EOF | |
CFLAGS="$CFLAGS `glib-config --cflags`" | |
LDFLAGS="$LDFLAGS `glib-config --libs`" | |
+ | |
+ GUI_SERVER="no" | |
fi | |
if test "$CURSES_CLIENT" = "yes" ; then | |
t@@ -3654,13 +3660,27 @@ if test "$CURSES_CLIENT" = "no" -a "$GUI_CLIENT" = "no… | |
echo "configure: warning: No clients will be compiled - binary will be serv… | |
fi | |
+# Check whether --enable-gui-server or --disable-gui-server was given. | |
+if test "${enable_gui_server+set}" = set; then | |
+ enableval="$enable_gui_server" | |
+ GUI_SERVER="$enableval" | |
+fi | |
+ | |
+ | |
+if test "$GUI_SERVER" = "yes" ; then | |
+ cat >> confdefs.h <<\EOF | |
+#define GUI_SERVER 1 | |
+EOF | |
+ | |
+fi | |
+ | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:3659: checking for ANSI C header files" >&5 | |
+echo "configure:3679: 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 3664 "configure" | |
+#line 3684 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -3668,7 +3688,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3692: \"$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@@ -3685,7 +3705,7 @@ rm -f conftest* | |
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 3689 "configure" | |
+#line 3709 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -3703,7 +3723,7 @@ fi | |
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 3707 "configure" | |
+#line 3727 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -3724,7 +3744,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3728 "configure" | |
+#line 3748 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -3735,7 +3755,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:3739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3759,12 +3779,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:3763: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:3783: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3768 "configure" | |
+#line 3788 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -3780,7 +3800,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -3804,17 +3824,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h stdlib.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:3808: checking for $ac_hdr" >&5 | |
+echo "configure:3828: 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 3813 "configure" | |
+#line 3833 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3838: \"$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@@ -3842,12 +3862,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:3846: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:3866: checking whether time.h and sys/time.h may both be inclu… | |
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3851 "configure" | |
+#line 3871 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -3856,7 +3876,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -3877,12 +3897,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:3881: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:3901: checking whether struct tm is in sys/time.h or time.h" >… | |
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3886 "configure" | |
+#line 3906 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -3890,7 +3910,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -3912,7 +3932,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:3916: checking size of long long" >&5 | |
+echo "configure:3936: 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@@ -3920,7 +3940,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3924 "configure" | |
+#line 3944 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -3931,7 +3951,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -3952,7 +3972,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:3956: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:3976: 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@@ -3960,7 +3980,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3964 "configure" | |
+#line 3984 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -3970,7 +3990,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:3974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -3988,7 +4008,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:3992: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4012: 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@@ -3996,7 +4016,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4000 "configure" | |
+#line 4020 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4010,7 +4030,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4034,12 +4054,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4038: checking for strftime" >&5 | |
+echo "configure:4058: 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 4043 "configure" | |
+#line 4063 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4062,7 +4082,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4084,7 +4104,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:4088: checking for strftime in -lintl" >&5 | |
+echo "configure:4108: 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@@ -4092,7 +4112,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4096 "configure" | |
+#line 4116 "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@@ -4103,7 +4123,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4132,12 +4152,12 @@ fi | |
for ac_func in strdup strstr | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4136: checking for $ac_func" >&5 | |
+echo "configure:4156: 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 4141 "configure" | |
+#line 4161 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4160,7 +4180,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4191,14 +4211,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4195: checking for library containing socket" >&5 | |
+echo "configure:4215: 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 4202 "configure" | |
+#line 4222 "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@@ -4209,7 +4229,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4220,7 +4240,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 4224 "configure" | |
+#line 4244 "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@@ -4231,7 +4251,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4253,14 +4273,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4257: checking for library containing gethostbyname" >&5 | |
+echo "configure:4277: 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 4264 "configure" | |
+#line 4284 "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@@ -4271,7 +4291,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4282,7 +4302,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 4286 "configure" | |
+#line 4306 "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@@ -4293,7 +4313,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4316,12 +4336,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4320: checking for $ac_func" >&5 | |
+echo "configure:4340: 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 4325 "configure" | |
+#line 4345 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4344,7 +4364,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4368: \"$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@@ -53,6 +53,9 @@ if test "$CYGWIN" = "yes" ; then | |
dnl Glib stuff | |
LDFLAGS="$LDFLAGS -lglib-1.3" | |
+ | |
+ dnl Use graphical server by default | |
+ GUI_SERVER="yes" | |
else | |
AC_MSG_RESULT("Configuring for Unix binary") | |
dnl On true Unix systems, test for valid curses-like libraries | |
t@@ -86,6 +89,9 @@ else | |
dnl Glib stuff | |
CFLAGS="$CFLAGS `glib-config --cflags`" | |
LDFLAGS="$LDFLAGS `glib-config --libs`" | |
+ | |
+ dnl Use console server by default | |
+ GUI_SERVER="no" | |
fi | |
if test "$CURSES_CLIENT" = "yes" ; then | |
t@@ -96,6 +102,16 @@ if test "$CURSES_CLIENT" = "no" -a "$GUI_CLIENT" = "no" ; … | |
AC_MSG_WARN(No clients will be compiled - binary will be server/AI only!) | |
fi | |
+dnl Let the user override the server interface with the | |
+dnl --enable-gui-server option | |
+AC_ARG_ENABLE(gui-server, | |
+[ --enable-gui-server use a simple GTK+/Win32 GUI for the server], | |
+[ GUI_SERVER="$enableval" ]) | |
+ | |
+if test "$GUI_SERVER" = "yes" ; then | |
+ AC_DEFINE(GUI_SERVER) | |
+fi | |
+ | |
dnl Checks for header files. | |
AC_HEADER_STDC | |
AC_HEADER_SYS_WAIT | |
diff --git a/src/dopewars.c b/src/dopewars.c | |
t@@ -43,6 +43,12 @@ | |
#include "tstring.h" | |
#include "AIPlayer.h" | |
+#ifdef GUI_SERVER | |
+#ifndef CYGWIN | |
+#include "gtkport.h" | |
+#endif | |
+#endif | |
+ | |
int ClientSock,ListenSock; | |
char Network,Client,Server,NotifyMetaServer,AIPlayer; | |
/* dopewars acting as standalone TCP server: | |
t@@ -1703,7 +1709,13 @@ int main(int argc,char *argv[]) { | |
} else { | |
StartNetworking(); | |
if (Server) { | |
+#ifdef GUI_SERVER | |
+ gtk_set_locale(); | |
+ gtk_init(&argc,&argv); | |
+ GuiServerLoop(); | |
+#else | |
ServerLoop(); | |
+#endif | |
} else if (AIPlayer) { | |
AIPlayerLoop(); | |
} else switch(WantedClient) { | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -479,7 +479,7 @@ void PrintHelpTo(FILE *fp) { | |
void ServerHelp() { | |
/* Displays a simple help screen listing the server commands and options */ | |
int i; | |
-#ifdef CYGWIN | |
+#if CYGWIN || GUI_SERVER | |
int Lines; | |
GString *VarName; | |
VarName=g_string_new(""); |