tFight timeout bug fixed; documentation updates; explicit test for glib added t… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit bc6b11e2dfe46a2ff4058c81fb68b1cec283a7cc | |
parent 2906fbe9700b52dac3b589d2f0957e42708ffc74 | |
Author: Ben Webb <[email protected]> | |
Date: Sun, 29 Apr 2001 01:35:32 +0000 | |
Fight timeout bug fixed; documentation updates; explicit test for glib added | |
tto configure script | |
Diffstat: | |
M Makefile.in | 3 +++ | |
M aclocal.m4 | 197 +++++++++++++++++++++++++++++… | |
M configure | 665 ++++++++++++++++++++++-------… | |
M configure.in | 11 +++++++++++ | |
M doc/Makefile.in | 3 +++ | |
M doc/clientplay.html | 13 ++++++++++--- | |
M doc/commandline.html | 15 ++++++++++++++- | |
M doc/credits.html | 2 +- | |
M doc/developer.html | 2 +- | |
M doc/i18n.html | 8 ++++---- | |
M doc/index.html | 6 +++--- | |
M doc/installation.html | 24 ++++++++++++------------ | |
M doc/windows.html | 42 ++++++++++++++++-------------… | |
M src/Makefile.in | 3 +++ | |
M src/serverside.c | 19 ++++++++++++++++--- | |
15 files changed, 776 insertions(+), 237 deletions(-) | |
--- | |
diff --git a/Makefile.in b/Makefile.in | |
t@@ -62,6 +62,9 @@ CATOBJEXT = @CATOBJEXT@ | |
CC = @CC@ | |
DATADIRNAME = @DATADIRNAME@ | |
GENCAT = @GENCAT@ | |
+GLIB_CFLAGS = @GLIB_CFLAGS@ | |
+GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
diff --git a/aclocal.m4 b/aclocal.m4 | |
t@@ -509,6 +509,203 @@ AC_DEFUN(AM_LC_MESSAGES, | |
fi | |
fi]) | |
+# Configure paths for GLIB | |
+# Owen Taylor 97-11-3 | |
+ | |
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, … | |
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or | |
+dnl gthread is specified in MODULES, pass to glib-config | |
+dnl | |
+AC_DEFUN(AM_PATH_GLIB, | |
+[dnl | |
+dnl Get the cflags and libraries from the glib-config script | |
+dnl | |
+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is insta… | |
+ glib_config_prefix="$withval", glib_config_prefix="") | |
+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where … | |
+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") | |
+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and … | |
+ , enable_glibtest=yes) | |
+ | |
+ if test x$glib_config_exec_prefix != x ; then | |
+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefi… | |
+ if test x${GLIB_CONFIG+set} != xset ; then | |
+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config | |
+ fi | |
+ fi | |
+ if test x$glib_config_prefix != x ; then | |
+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" | |
+ if test x${GLIB_CONFIG+set} != xset ; then | |
+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config | |
+ fi | |
+ fi | |
+ | |
+ for module in . $4 | |
+ do | |
+ case "$module" in | |
+ gmodule) | |
+ glib_config_args="$glib_config_args gmodule" | |
+ ;; | |
+ gthread) | |
+ glib_config_args="$glib_config_args gthread" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) | |
+ min_glib_version=ifelse([$1], ,0.99.7,$1) | |
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | |
+ no_glib="" | |
+ if test "$GLIB_CONFIG" = "no" ; then | |
+ no_glib=yes | |
+ else | |
+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` | |
+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` | |
+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
+ if test "x$enable_glibtest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$GLIB_LIBS $LIBS" | |
+dnl | |
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity | |
+dnl checks the results of glib-config to some extent | |
+dnl | |
+ rm -f conf.glibtest | |
+ AC_TRY_RUN([ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.glibtest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_glib_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_glib_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((glib_major_version != $glib_config_major_version) || | |
+ (glib_minor_version != $glib_config_minor_version) || | |
+ (glib_micro_version != $glib_config_micro_version)) | |
+ { | |
+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d… | |
+ $glib_config_major_version, $glib_config_minor_version, $glib_con… | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf ("*** was found! If glib-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GLIB. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If glib-config was wrong, set the environment variable GLIB_… | |
+ printf("*** to point to the correct copy of glib-config, and remove the … | |
+ printf("*** before re-running configure\n"); | |
+ } | |
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || | |
+ (glib_minor_version != GLIB_MINOR_VERSION) || | |
+ (glib_micro_version != GLIB_MICRO_VERSION)) | |
+ { | |
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", | |
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((glib_major_version > major) || | |
+ ((glib_major_version == major) && (glib_minor_version > minor)) || | |
+ ((glib_major_version == major) && (glib_minor_version == minor) && (gl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the glib-config shel… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment … | |
+ printf("*** correct copy of glib-config. (In this case, you will have … | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_glib" = x ; then | |
+ AC_MSG_RESULT(yes) | |
+ ifelse([$2], , :, [$2]) | |
+ else | |
+ AC_MSG_RESULT(no) | |
+ if test "$GLIB_CONFIG" = "no" ; then | |
+ echo "*** The glib-config script installed by GLIB could not be found" | |
+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" | |
+ echo "*** your path, or set the GLIB_CONFIG environment variable to the" | |
+ echo "*** full path to glib-config." | |
+ else | |
+ if test -f conf.glibtest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GLIB test program, checking why..." | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$LIBS $GLIB_LIBS" | |
+ AC_TRY_LINK([ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_… | |
+ [ echo "*** The test program compiled, but did not run. This usually m… | |
+ echo "*** that the run-time linker is not finding GLIB or finding th… | |
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ echo "***" | |
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK… | |
+ echo "*** came with the system with the command" | |
+ echo "***" | |
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], | |
+ [ echo "*** The test program failed to compile or link. See the file c… | |
+ echo "*** exact error that occured. This usually means GLIB was inco… | |
+ echo "*** or that you have moved GLIB since it was installed. In the… | |
+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GLIB_CFLAGS="" | |
+ GLIB_LIBS="" | |
+ ifelse([$3], , :, [$3]) | |
+ fi | |
+ AC_SUBST(GLIB_CFLAGS) | |
+ AC_SUBST(GLIB_LIBS) | |
+ rm -f conf.glibtest | |
+]) | |
+ | |
# Configure paths for GTK+ | |
# Owen Taylor 97-11-3 | |
diff --git a/configure b/configure | |
t@@ -22,6 +22,12 @@ ac_help="$ac_help | |
ac_help="$ac_help | |
--enable-curses-client include curses client" | |
ac_help="$ac_help | |
+ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" | |
+ac_help="$ac_help | |
+ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)" | |
+ac_help="$ac_help | |
+ --disable-glibtest Do not try to compile and run a test GLIB program" | |
+ac_help="$ac_help | |
--enable-nativewin32 build a native Win32 binary under Cygwin" | |
ac_help="$ac_help | |
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)" | |
t@@ -575,7 +581,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:579: checking for a BSD compatible install" >&5 | |
+echo "configure:585: 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@@ -628,7 +634,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:632: checking whether build environment is sane" >&5 | |
+echo "configure:638: checking whether build environment is sane" >&5 | |
# Just in case | |
sleep 1 | |
echo timestamp > conftestfile | |
t@@ -685,7 +691,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:689: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
+echo "configure:695: 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@@ -731,7 +737,7 @@ EOF | |
missing_dir=`cd $ac_aux_dir && pwd` | |
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 | |
-echo "configure:735: checking for working aclocal" >&5 | |
+echo "configure:741: 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@@ -744,7 +750,7 @@ else | |
fi | |
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 | |
-echo "configure:748: checking for working autoconf" >&5 | |
+echo "configure:754: 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@@ -757,7 +763,7 @@ else | |
fi | |
echo $ac_n "checking for working automake""... $ac_c" 1>&6 | |
-echo "configure:761: checking for working automake" >&5 | |
+echo "configure:767: 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@@ -770,7 +776,7 @@ else | |
fi | |
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 | |
-echo "configure:774: checking for working autoheader" >&5 | |
+echo "configure:780: 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@@ -783,7 +789,7 @@ else | |
fi | |
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 | |
-echo "configure:787: checking for working makeinfo" >&5 | |
+echo "configure:793: 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@@ -804,7 +810,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:808: checking for $ac_word" >&5 | |
+echo "configure:814: 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@@ -834,7 +840,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:838: checking for $ac_word" >&5 | |
+echo "configure:844: 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@@ -885,7 +891,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:889: checking for $ac_word" >&5 | |
+echo "configure:895: 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@@ -917,7 +923,7 @@ fi | |
fi | |
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... … | |
-echo "configure:921: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) wo… | |
+echo "configure:927: 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@@ -928,12 +934,12 @@ cross_compiling=$ac_cv_prog_cc_cross | |
cat > conftest.$ac_ext << EOF | |
-#line 932 "configure" | |
+#line 938 "configure" | |
#include "confdefs.h" | |
main(){return(0);} | |
EOF | |
-if { (eval echo configure:937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && … | |
+if { (eval echo configure:943: \"$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@@ -959,12 +965,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:963: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is… | |
+echo "configure:969: 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:968: checking whether we are using GNU C" >&5 | |
+echo "configure:974: 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@@ -973,7 +979,7 @@ else | |
yes; | |
#endif | |
EOF | |
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:977: \"$ac_try\")… | |
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:983: \"$ac_try\")… | |
ac_cv_prog_gcc=yes | |
else | |
ac_cv_prog_gcc=no | |
t@@ -992,7 +998,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:996: checking whether ${CC-cc} accepts -g" >&5 | |
+echo "configure:1002: 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@@ -1035,7 +1041,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:1039: checking for a BSD compatible install" >&5 | |
+echo "configure:1045: 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@@ -1090,7 +1096,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:1094: checking how to run the C preprocessor" >&5 | |
+echo "configure:1100: 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@@ -1105,13 +1111,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 1109 "configure" | |
+#line 1115 "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:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1121: \"$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@@ -1122,13 +1128,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -E -traditional-cpp" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1126 "configure" | |
+#line 1132 "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:1132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1138: \"$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@@ -1139,13 +1145,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -nologo -E" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1143 "configure" | |
+#line 1149 "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:1149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1155: \"$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@@ -1172,7 +1178,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:1176: checking for $ac_word" >&5 | |
+echo "configure:1182: 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@@ -1200,7 +1206,7 @@ else | |
fi | |
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 | |
-echo "configure:1204: checking for POSIXized ISC" >&5 | |
+echo "configure:1210: 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@@ -1221,12 +1227,12 @@ else | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:1225: checking for ANSI C header files" >&5 | |
+echo "configure:1231: 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 1230 "configure" | |
+#line 1236 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -1234,7 +1240,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1244: \"$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@@ -1251,7 +1257,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 1255 "configure" | |
+#line 1261 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -1269,7 +1275,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 1273 "configure" | |
+#line 1279 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -1290,7 +1296,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1294 "configure" | |
+#line 1300 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -1301,7 +1307,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -1325,12 +1331,12 @@ EOF | |
fi | |
echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
-echo "configure:1329: checking for working const" >&5 | |
+echo "configure:1335: 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 1334 "configure" | |
+#line 1340 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -1379,7 +1385,7 @@ ccp = (char const *const *) p; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_const=yes | |
else | |
t@@ -1400,21 +1406,21 @@ EOF | |
fi | |
echo $ac_n "checking for inline""... $ac_c" 1>&6 | |
-echo "configure:1404: checking for inline" >&5 | |
+echo "configure:1410: 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 1411 "configure" | |
+#line 1417 "configure" | |
#include "confdefs.h" | |
int main() { | |
} $ac_kw foo() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_inline=$ac_kw; break | |
else | |
t@@ -1440,12 +1446,12 @@ EOF | |
esac | |
echo $ac_n "checking for off_t""... $ac_c" 1>&6 | |
-echo "configure:1444: checking for off_t" >&5 | |
+echo "configure:1450: 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 1449 "configure" | |
+#line 1455 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -1473,12 +1479,12 @@ EOF | |
fi | |
echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
-echo "configure:1477: checking for size_t" >&5 | |
+echo "configure:1483: 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 1482 "configure" | |
+#line 1488 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -1508,19 +1514,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:1512: checking for working alloca.h" >&5 | |
+echo "configure:1518: 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 1517 "configure" | |
+#line 1523 "configure" | |
#include "confdefs.h" | |
#include <alloca.h> | |
int main() { | |
char *p = alloca(2 * sizeof(int)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_header_alloca_h=yes | |
else | |
t@@ -1541,12 +1547,12 @@ EOF | |
fi | |
echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
-echo "configure:1545: checking for alloca" >&5 | |
+echo "configure:1551: 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 1550 "configure" | |
+#line 1556 "configure" | |
#include "confdefs.h" | |
#ifdef __GNUC__ | |
t@@ -1574,7 +1580,7 @@ int main() { | |
char *p = (char *) alloca(1); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_func_alloca_works=yes | |
else | |
t@@ -1606,12 +1612,12 @@ EOF | |
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
-echo "configure:1610: checking whether alloca needs Cray hooks" >&5 | |
+echo "configure:1616: 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 1615 "configure" | |
+#line 1621 "configure" | |
#include "confdefs.h" | |
#if defined(CRAY) && ! defined(CRAY2) | |
webecray | |
t@@ -1636,12 +1642,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:1640: checking for $ac_func" >&5 | |
+echo "configure:1646: 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 1645 "configure" | |
+#line 1651 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -1664,7 +1670,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -1691,7 +1697,7 @@ done | |
fi | |
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
-echo "configure:1695: checking stack direction for C alloca" >&5 | |
+echo "configure:1701: 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@@ -1699,7 +1705,7 @@ else | |
ac_cv_c_stack_direction=0 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1703 "configure" | |
+#line 1709 "configure" | |
#include "confdefs.h" | |
find_stack_direction () | |
{ | |
t@@ -1718,7 +1724,7 @@ main () | |
exit (find_stack_direction() < 0); | |
} | |
EOF | |
-if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_c_stack_direction=1 | |
else | |
t@@ -1743,17 +1749,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:1747: checking for $ac_hdr" >&5 | |
+echo "configure:1753: 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 1752 "configure" | |
+#line 1758 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1763: \"$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@@ -1782,12 +1788,12 @@ done | |
for ac_func in getpagesize | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:1786: checking for $ac_func" >&5 | |
+echo "configure:1792: 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 1791 "configure" | |
+#line 1797 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -1810,7 +1816,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -1835,7 +1841,7 @@ fi | |
done | |
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 | |
-echo "configure:1839: checking for working mmap" >&5 | |
+echo "configure:1845: 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@@ -1843,7 +1849,7 @@ else | |
ac_cv_func_mmap_fixed_mapped=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1847 "configure" | |
+#line 1853 "configure" | |
#include "confdefs.h" | |
/* Thanks to Mike Haertel and Jim Avera for this test. | |
t@@ -1983,7 +1989,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_mmap_fixed_mapped=yes | |
else | |
t@@ -2011,17 +2017,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:2015: checking for $ac_hdr" >&5 | |
+echo "configure:2021: 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 2020 "configure" | |
+#line 2026 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:2025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:2031: \"$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@@ -2051,12 +2057,12 @@ done | |
strdup __argz_count __argz_stringify __argz_next | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2055: checking for $ac_func" >&5 | |
+echo "configure:2061: 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 2060 "configure" | |
+#line 2066 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2079,7 +2085,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2108,12 +2114,12 @@ done | |
for ac_func in stpcpy | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2112: checking for $ac_func" >&5 | |
+echo "configure:2118: 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 2117 "configure" | |
+#line 2123 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2136,7 +2142,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2170,19 +2176,19 @@ EOF | |
if test $ac_cv_header_locale_h = yes; then | |
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | |
-echo "configure:2174: checking for LC_MESSAGES" >&5 | |
+echo "configure:2180: 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 2179 "configure" | |
+#line 2185 "configure" | |
#include "confdefs.h" | |
#include <locale.h> | |
int main() { | |
return LC_MESSAGES | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_val_LC_MESSAGES=yes | |
else | |
t@@ -2203,7 +2209,7 @@ EOF | |
fi | |
fi | |
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
-echo "configure:2207: checking whether NLS is requested" >&5 | |
+echo "configure:2213: 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@@ -2223,7 +2229,7 @@ fi | |
EOF | |
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1… | |
-echo "configure:2227: checking whether included gettext is requested" >&5 | |
+echo "configure:2233: 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@@ -2242,17 +2248,17 @@ fi | |
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 | |
-echo "configure:2246: checking for libintl.h" >&5 | |
+echo "configure:2252: 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 2251 "configure" | |
+#line 2257 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:2256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:2262: \"$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@@ -2269,19 +2275,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:2273: checking for gettext in libc" >&5 | |
+echo "configure:2279: 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 2278 "configure" | |
+#line 2284 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
int main() { | |
return (int) gettext ("") | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gettext_libc=yes | |
else | |
t@@ -2297,7 +2303,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:2301: checking for bindtextdomain in -lintl" >&5 | |
+echo "configure:2307: 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@@ -2305,7 +2311,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2309 "configure" | |
+#line 2315 "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@@ -2316,7 +2322,7 @@ int main() { | |
bindtextdomain() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2332,12 +2338,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:2336: checking for gettext in libintl" >&5 | |
+echo "configure:2342: 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:2341: checking for gettext in -lintl" >&5 | |
+echo "configure:2347: 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@@ -2345,7 +2351,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2349 "configure" | |
+#line 2355 "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@@ -2356,7 +2362,7 @@ int main() { | |
gettext() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2395,7 +2401,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:2399: checking for $ac_word" >&5 | |
+echo "configure:2405: 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@@ -2429,12 +2435,12 @@ fi | |
for ac_func in dcgettext | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2433: checking for $ac_func" >&5 | |
+echo "configure:2439: 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 2438 "configure" | |
+#line 2444 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2457,7 +2463,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2484,7 +2490,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:2488: checking for $ac_word" >&5 | |
+echo "configure:2494: 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@@ -2520,7 +2526,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:2524: checking for $ac_word" >&5 | |
+echo "configure:2530: 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@@ -2552,7 +2558,7 @@ else | |
fi | |
cat > conftest.$ac_ext <<EOF | |
-#line 2556 "configure" | |
+#line 2562 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -2560,7 +2566,7 @@ extern int _nl_msg_cat_cntr; | |
return _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
CATOBJEXT=.gmo | |
DATADIRNAME=share | |
t@@ -2583,7 +2589,7 @@ fi | |
if test "$CATOBJEXT" = "NONE"; then | |
echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 | |
-echo "configure:2587: checking whether catgets can be used" >&5 | |
+echo "configure:2593: 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@@ -2596,7 +2602,7 @@ fi | |
if test "$nls_cv_use_catgets" = "yes"; then | |
echo $ac_n "checking for main in -li""... $ac_c" 1>&6 | |
-echo "configure:2600: checking for main in -li" >&5 | |
+echo "configure:2606: 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@@ -2604,14 +2610,14 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-li $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2608 "configure" | |
+#line 2614 "configure" | |
#include "confdefs.h" | |
int main() { | |
main() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2639,12 +2645,12 @@ else | |
fi | |
echo $ac_n "checking for catgets""... $ac_c" 1>&6 | |
-echo "configure:2643: checking for catgets" >&5 | |
+echo "configure:2649: 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 2648 "configure" | |
+#line 2654 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char catgets(); below. */ | |
t@@ -2667,7 +2673,7 @@ catgets(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_catgets=yes" | |
else | |
t@@ -2689,7 +2695,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:2693: checking for $ac_word" >&5 | |
+echo "configure:2699: 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@@ -2725,7 +2731,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:2729: checking for $ac_word" >&5 | |
+echo "configure:2735: 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@@ -2762,7 +2768,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:2766: checking for $ac_word" >&5 | |
+echo "configure:2772: 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@@ -2797,7 +2803,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:2801: checking for $ac_word" >&5 | |
+echo "configure:2807: 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@@ -2855,7 +2861,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:2859: checking for $ac_word" >&5 | |
+echo "configure:2865: 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@@ -2889,7 +2895,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:2893: checking for $ac_word" >&5 | |
+echo "configure:2899: 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@@ -2925,7 +2931,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:2929: checking for $ac_word" >&5 | |
+echo "configure:2935: 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@@ -3018,7 +3024,7 @@ fi | |
LINGUAS= | |
else | |
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 | |
-echo "configure:3022: checking for catalogs to be installed" >&5 | |
+echo "configure:3028: checking for catalogs to be installed" >&5 | |
NEW_LINGUAS= | |
for lang in ${LINGUAS=$ALL_LINGUAS}; do | |
case "$ALL_LINGUAS" in | |
t@@ -3046,17 +3052,17 @@ echo "configure:3022: 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:3050: checking for linux/version.h" >&5 | |
+echo "configure:3056: 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 3055 "configure" | |
+#line 3061 "configure" | |
#include "confdefs.h" | |
#include <linux/version.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3066: \"$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@@ -3145,17 +3151,287 @@ else | |
fi | |
+# Check whether --with-glib-prefix or --without-glib-prefix was given. | |
+if test "${with_glib_prefix+set}" = set; then | |
+ withval="$with_glib_prefix" | |
+ glib_config_prefix="$withval" | |
+else | |
+ glib_config_prefix="" | |
+fi | |
+ | |
+# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was give… | |
+if test "${with_glib_exec_prefix+set}" = set; then | |
+ withval="$with_glib_exec_prefix" | |
+ glib_config_exec_prefix="$withval" | |
+else | |
+ glib_config_exec_prefix="" | |
+fi | |
+ | |
+# Check whether --enable-glibtest or --disable-glibtest was given. | |
+if test "${enable_glibtest+set}" = set; then | |
+ enableval="$enable_glibtest" | |
+ : | |
+else | |
+ enable_glibtest=yes | |
+fi | |
+ | |
+ | |
+ if test x$glib_config_exec_prefix != x ; then | |
+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefi… | |
+ if test x${GLIB_CONFIG+set} != xset ; then | |
+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config | |
+ fi | |
+ fi | |
+ if test x$glib_config_prefix != x ; then | |
+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" | |
+ if test x${GLIB_CONFIG+set} != xset ; then | |
+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config | |
+ fi | |
+ fi | |
+ | |
+ for module in . | |
+ do | |
+ case "$module" in | |
+ gmodule) | |
+ glib_config_args="$glib_config_args gmodule" | |
+ ;; | |
+ gthread) | |
+ glib_config_args="$glib_config_args gthread" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ # 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:3208: 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 | |
+ case "$GLIB_CONFIG" in | |
+ /*) | |
+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with … | |
+ ;; | |
+ ?:/*) | |
+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with … | |
+ ;; | |
+ *) | |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
+ ac_dummy="$PATH" | |
+ for ac_dir in $ac_dummy; do | |
+ test -z "$ac_dir" && ac_dir=. | |
+ if test -f $ac_dir/$ac_word; then | |
+ ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" | |
+ break | |
+ fi | |
+ done | |
+ IFS="$ac_save_ifs" | |
+ test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" | |
+ ;; | |
+esac | |
+fi | |
+GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG" | |
+if test -n "$GLIB_CONFIG"; then | |
+ echo "$ac_t""$GLIB_CONFIG" 1>&6 | |
+else | |
+ echo "$ac_t""no" 1>&6 | |
+fi | |
+ | |
+ min_glib_version=1.2.0 | |
+ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
+echo "configure:3243: checking for GLIB - version >= $min_glib_version" >&5 | |
+ no_glib="" | |
+ if test "$GLIB_CONFIG" = "no" ; then | |
+ no_glib=yes | |
+ else | |
+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` | |
+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` | |
+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` | |
+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` | |
+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` | |
+ if test "x$enable_glibtest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$GLIB_LIBS $LIBS" | |
+ rm -f conf.glibtest | |
+ if test "$cross_compiling" = yes; then | |
+ echo $ac_n "cross compiling; assumed OK... $ac_c" | |
+else | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 3266 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.glibtest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_glib_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_glib_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((glib_major_version != $glib_config_major_version) || | |
+ (glib_minor_version != $glib_config_minor_version) || | |
+ (glib_micro_version != $glib_config_micro_version)) | |
+ { | |
+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d… | |
+ $glib_config_major_version, $glib_config_minor_version, $glib_con… | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf ("*** was found! If glib-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GLIB. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If glib-config was wrong, set the environment variable GLIB_… | |
+ printf("*** to point to the correct copy of glib-config, and remove the … | |
+ printf("*** before re-running configure\n"); | |
+ } | |
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || | |
+ (glib_minor_version != GLIB_MINOR_VERSION) || | |
+ (glib_micro_version != GLIB_MICRO_VERSION)) | |
+ { | |
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", | |
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((glib_major_version > major) || | |
+ ((glib_major_version == major) && (glib_minor_version > minor)) || | |
+ ((glib_major_version == major) && (glib_minor_version == minor) && (gl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the glib-config shel… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment … | |
+ printf("*** correct copy of glib-config. (In this case, you will have … | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+ | |
+EOF | |
+if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+then | |
+ : | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -fr conftest* | |
+ no_glib=yes | |
+fi | |
+rm -fr conftest* | |
+fi | |
+ | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_glib" = x ; then | |
+ echo "$ac_t""yes" 1>&6 | |
+ : | |
+ else | |
+ echo "$ac_t""no" 1>&6 | |
+ if test "$GLIB_CONFIG" = "no" ; then | |
+ echo "*** The glib-config script installed by GLIB could not be found" | |
+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" | |
+ echo "*** your path, or set the GLIB_CONFIG environment variable to the" | |
+ echo "*** full path to glib-config." | |
+ else | |
+ if test -f conf.glibtest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GLIB test program, checking why..." | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$LIBS $GLIB_LIBS" | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 3376 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+ | |
+int main() { | |
+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:3386: \"$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… | |
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ echo "***" | |
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK… | |
+ echo "*** came with the system with the command" | |
+ echo "***" | |
+ echo "*** rpm --erase --nodeps gtk gtk-devel" | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -rf conftest* | |
+ echo "*** The test program failed to compile or link. See the file config.l… | |
+ echo "*** exact error that occured. This usually means GLIB was inco… | |
+ echo "*** or that you have moved GLIB since it was installed. In the… | |
+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" | |
+fi | |
+rm -f conftest* | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GLIB_CFLAGS="" | |
+ GLIB_LIBS="" | |
+ { echo "configure: error: Cannot find glib - aborting" 1>&2; exit 1; } | |
+ fi | |
+ | |
+ | |
+ rm -f conf.glibtest | |
+ | |
+ | |
WIN_RC="" | |
WIN_RES="" | |
WIN_MAKE_RES="/dev/null" | |
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | |
-echo "configure:3154: checking for Cygwin environment" >&5 | |
+echo "configure:3430: 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 3159 "configure" | |
+#line 3435 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -3166,7 +3442,7 @@ int main() { | |
return __CYGWIN__; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_cygwin=yes | |
else | |
t@@ -3211,7 +3487,7 @@ 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:3215: checking for initscr in -lncurses" >&5 | |
+echo "configure:3491: 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@@ -3219,7 +3495,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3223 "configure" | |
+#line 3499 "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@@ -3230,7 +3506,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3259,7 +3535,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:3263: checking for initscr in -lcurses" >&5 | |
+echo "configure:3539: 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@@ -3267,7 +3543,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3271 "configure" | |
+#line 3547 "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@@ -3278,7 +3554,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3307,7 +3583,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:3311: checking for initscr in -lcur_colr" >&5 | |
+echo "configure:3587: 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@@ -3315,7 +3591,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3319 "configure" | |
+#line 3595 "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@@ -3326,7 +3602,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3412,7 +3688,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:3416: checking for $ac_word" >&5 | |
+echo "configure:3692: 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@@ -3447,7 +3723,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:3451: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:3727: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -3470,7 +3746,7 @@ echo "configure:3451: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3474 "configure" | |
+#line 3750 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3548,7 +3824,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3582,7 +3858,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3586 "configure" | |
+#line 3862 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3592,7 +3868,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3872: \"$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@@ -3649,7 +3925,12 @@ EOF | |
GUI_SERVER="no" | |
fi | |
+if test "$GUI_CLIENT" = "yes" ; then | |
+ echo "$ac_t""Compiling in graphical client" 1>&6 | |
+fi | |
+ | |
if test "$CURSES_CLIENT" = "yes" ; then | |
+ echo "$ac_t""Compiling in text mode - curses - client" 1>&6 | |
cat >> confdefs.h <<\EOF | |
#define CURSES_CLIENT 1 | |
EOF | |
t@@ -3668,19 +3949,22 @@ fi | |
if test "$GUI_SERVER" = "yes" ; then | |
+ echo "$ac_t""Using graphical server" 1>&6 | |
cat >> confdefs.h <<\EOF | |
#define GUI_SERVER 1 | |
EOF | |
+else | |
+ echo "$ac_t""Using text-mode server" 1>&6 | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:3679: checking for ANSI C header files" >&5 | |
+echo "configure:3963: 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 3684 "configure" | |
+#line 3968 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -3688,7 +3972,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3976: \"$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@@ -3705,7 +3989,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 3709 "configure" | |
+#line 3993 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -3723,7 +4007,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 3727 "configure" | |
+#line 4011 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -3744,7 +4028,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3748 "configure" | |
+#line 4032 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -3755,7 +4039,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3779,12 +4063,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:3783: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4067: 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 3788 "configure" | |
+#line 4072 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -3800,7 +4084,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -3824,17 +4108,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:3828: checking for $ac_hdr" >&5 | |
+echo "configure:4112: 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 3833 "configure" | |
+#line 4117 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4122: \"$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@@ -3862,12 +4146,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:3866: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4150: 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 3871 "configure" | |
+#line 4155 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -3876,7 +4160,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -3897,12 +4181,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:3901: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4185: 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 3906 "configure" | |
+#line 4190 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -3910,7 +4194,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -3932,7 +4216,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:3936: checking size of long long" >&5 | |
+echo "configure:4220: 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@@ -3940,7 +4224,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3944 "configure" | |
+#line 4228 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -3951,7 +4235,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -3972,7 +4256,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:3976: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4260: 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@@ -3980,7 +4264,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3984 "configure" | |
+#line 4268 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -3990,7 +4274,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4008,7 +4292,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:4012: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4296: 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@@ -4016,7 +4300,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4020 "configure" | |
+#line 4304 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4030,7 +4314,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4054,12 +4338,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4058: checking for strftime" >&5 | |
+echo "configure:4342: 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 4063 "configure" | |
+#line 4347 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4082,7 +4366,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4104,7 +4388,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:4108: checking for strftime in -lintl" >&5 | |
+echo "configure:4392: 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@@ -4112,7 +4396,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4116 "configure" | |
+#line 4400 "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@@ -4123,7 +4407,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4152,12 +4436,12 @@ fi | |
for ac_func in strdup strstr | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4156: checking for $ac_func" >&5 | |
+echo "configure:4440: 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 4161 "configure" | |
+#line 4445 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4180,7 +4464,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4211,14 +4495,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4215: checking for library containing socket" >&5 | |
+echo "configure:4499: 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 4222 "configure" | |
+#line 4506 "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@@ -4229,7 +4513,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4240,7 +4524,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 4244 "configure" | |
+#line 4528 "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@@ -4251,7 +4535,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4273,14 +4557,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4277: checking for library containing gethostbyname" >&5 | |
+echo "configure:4561: 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 4284 "configure" | |
+#line 4568 "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@@ -4291,7 +4575,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4302,7 +4586,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 4306 "configure" | |
+#line 4590 "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@@ -4313,7 +4597,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4336,12 +4620,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4340: checking for $ac_func" >&5 | |
+echo "configure:4624: 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 4345 "configure" | |
+#line 4629 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4364,7 +4648,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4595,6 +4879,9 @@ s%@GT_YES@%$GT_YES%g | |
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g | |
s%@l@%$l%g | |
s%@localedir@%$localedir%g | |
+s%@GLIB_CONFIG@%$GLIB_CONFIG%g | |
+s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g | |
+s%@GLIB_LIBS@%$GLIB_LIBS%g | |
s%@GTK_CONFIG@%$GTK_CONFIG%g | |
s%@GTK_CFLAGS@%$GTK_CFLAGS%g | |
s%@GTK_LIBS@%$GTK_LIBS%g | |
diff --git a/configure.in b/configure.in | |
t@@ -31,6 +31,9 @@ AC_ARG_ENABLE(curses-client, | |
[ --enable-curses-client include curses client], | |
[ CURSES_CLIENT="$enableval" ],[ CURSES_CLIENT="yes" ]) | |
+dnl We NEED glib - so test for it first | |
+AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR(Cannot find glib - aborting)]) | |
+ | |
WIN_RC="" | |
WIN_RES="" | |
WIN_MAKE_RES="/dev/null" | |
t@@ -94,7 +97,12 @@ else | |
GUI_SERVER="no" | |
fi | |
+if test "$GUI_CLIENT" = "yes" ; then | |
+ AC_MSG_RESULT(Compiling in graphical client) | |
+fi | |
+ | |
if test "$CURSES_CLIENT" = "yes" ; then | |
+ AC_MSG_RESULT(Compiling in text mode - curses - client) | |
AC_DEFINE(CURSES_CLIENT) | |
fi | |
t@@ -109,7 +117,10 @@ AC_ARG_ENABLE(gui-server, | |
[ GUI_SERVER="$enableval" ]) | |
if test "$GUI_SERVER" = "yes" ; then | |
+ AC_MSG_RESULT(Using graphical server) | |
AC_DEFINE(GUI_SERVER) | |
+else | |
+ AC_MSG_RESULT(Using text-mode server) | |
fi | |
dnl Checks for header files. | |
diff --git a/doc/Makefile.in b/doc/Makefile.in | |
t@@ -62,6 +62,9 @@ CATOBJEXT = @CATOBJEXT@ | |
CC = @CC@ | |
DATADIRNAME = @DATADIRNAME@ | |
GENCAT = @GENCAT@ | |
+GLIB_CFLAGS = @GLIB_CFLAGS@ | |
+GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
diff --git a/doc/clientplay.html b/doc/clientplay.html | |
t@@ -16,6 +16,8 @@ available, a "virtual" server will be run by the client to e… | |
single-player game to be played).<p> | |
A brief description of using the client and playing dopewars is given here. | |
+These instructions apply to the old-style text-mode client, but the basic | |
+game play is similar for the newer graphical client. | |
Bear in mind that both the client and the server you are connecting to can | |
be configured by means of the dopewars <a href="configfile.html"> | |
configuration files</a>, and so the game may differ radically from what is | |
t@@ -161,13 +163,18 @@ offer to "sew you up" (i.e. restore your health to 100) … | |
If, after killing Officer Hardass, you are unlucky enough to meet the cops | |
again later on, they will be lead by his replacement, Officer Bob, who is | |
-unfortunately immortal. You can kill him and ransack his corpse as before, | |
-but that doesn't stop him from returning later on...<p> | |
+tougher. If you then kill him too, you'll meet tougher opposition in future - | |
+so it's often wise to run from the cops!<p> | |
If you lose bitches, or simply want to acquire more, you can visit the pub | |
in the Ghetto to hire them, or they may offer their services to you at | |
bargain rates randomly.<p> | |
+Some locations are more heavily policed than others. In addition to being | |
+attacked on your travels, you also run a high risk of being shot at by the | |
+cops if you drop drugs (dispose of drugs that you can't get any cash for) | |
+or if you attack other players.<p> | |
+ | |
<a name="multiplayer"><h2>Multiplayer: interacting with other players</h2></a> | |
If you log on to a dopewars server, there is the possibility of meeting other | |
t@@ -228,6 +235,6 @@ bitch or player was carrying.<p> | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>11-10-99</b> | |
+Last update: <b>29-04-2001</b> | |
</body> | |
</html> | |
diff --git a/doc/commandline.html b/doc/commandline.html | |
t@@ -105,6 +105,19 @@ server and join in the multiplayer game going on there. W… | |
finishes the game (or is eliminated by the other players or the server) the | |
program finishes. | |
+<a name="gui-client"><dt><b>-w</b></a> | |
+<dd>If running a dopewars client, then this forces the use of a graphical | |
+user interface. Under Microsoft Windows, this is an "ordinary" window, while | |
+under Unix, this uses GTK+. If a suitable environment is not present (e.g. | |
+the binary was compiled without graphical support, or - in the case of GTK+ - | |
+you are not running X) then dopewars will quit with an error. By default, | |
+if neither -w or -t are specified, then a graphical user interface will be | |
+used where available, falling back to a text-mode client in case of error. | |
+ | |
+<a name="text-client"><dt><b>-t</b></a> | |
+<dd>When running a dopewars client, forces the use of a text-mode (curses | |
+or console mode) interface, even if graphics are available. | |
+ | |
<dt><b>-h</b> | |
<dd>Displays a brief description of the available command line options, and | |
contact details. | |
t@@ -118,6 +131,6 @@ contact details. | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>06-05-2000</b> | |
+Last update: <b>29-04-2001</b> | |
</body> | |
</html> | |
diff --git a/doc/credits.html b/doc/credits.html | |
t@@ -46,6 +46,6 @@ proxies.<p> | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>11-10-99</b> | |
+Last update: <b>11-10-1999</b> | |
</body> | |
</html> | |
diff --git a/doc/developer.html b/doc/developer.html | |
t@@ -32,6 +32,6 @@ I might possibly even know the answers!<p> | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>30-9-99</b> | |
+Last update: <b>30-9-1999</b> | |
</body> | |
</html> | |
diff --git a/doc/i18n.html b/doc/i18n.html | |
t@@ -158,20 +158,20 @@ contributed to the main dopewars distribution!<p> | |
<li>German (<tt>de.po</tt>) | |
<ul> | |
<li>Maintained by: <a href="mailto:[email protected]">Tobias Mathes</a> | |
-<li>Version required: <b>1.4.8-devel</b> or CVS | |
+<li>Version required: <b>1.5.0beta1</b> or CVS | |
</ul> | |
<li>Polish (<tt>pl.po</tt>) | |
<ul> | |
<li>Maintained by: <a href="mailto:[email protected]">Slawomir | |
Molenda</a> | |
-<li>Version required: <b>1.4.8-devel</b> or CVS | |
+<li>Version required: <b>1.5.0beta1</b> or CVS | |
</ul> | |
<li>Portuguese (Brazil) (<tt>pt_BR.po</tt>) | |
<ul> | |
<li>Maintained by: <a href="mailto:[email protected]">Hugo Cisneiros</a> | |
-<li>Version required: <b>1.4.8-devel</b> or CVS | |
+<li>Version required: <b>1.5.0beta1</b> or CVS | |
</ul> | |
</ul> | |
t@@ -179,7 +179,7 @@ Molenda</a> | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>07-04-2001</b> | |
+Last update: <b>29-04-2001</b> | |
</body> | |
</html> | |
diff --git a/doc/index.html b/doc/index.html | |
t@@ -1,10 +1,10 @@ | |
<html> | |
<head> | |
-<title>dopewars 1.4.8: Main Index</title> | |
+<title>dopewars 1.5.0: Main Index</title> | |
</head> | |
<body> | |
-<h1>dopewars 1.4.8: Main Index</h1> | |
+<h1>dopewars 1.5.0: Main Index</h1> | |
<table> | |
t@@ -49,6 +49,6 @@ For more information on the current state of dopewars, check… | |
<p> | |
<hr> | |
-Last update: <b>09-09-2000</b> | |
+Last update: <b>29-04-2001</b> | |
</body> | |
</html> | |
diff --git a/doc/installation.html b/doc/installation.html | |
t@@ -40,9 +40,9 @@ faults due to library conflicts. | |
<ol> | |
<li>Download the | |
-<a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars-1.4.8-1.alpha.rp… | |
+<a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars-1.5.0-1.alpha.rp… | |
Alpha</a> or | |
-<a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars-1.4.8-1.i386.rpm… | |
+<a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars-1.5.0-1.i386.rpm… | |
i386 (Intel)</a> RPM with your web browser. (If your browser is incorrectly set | |
up, it may try and display the file, in which case tell it explicitly to save | |
the file - Shift+Mouse button 1 in Netscape.) | |
t@@ -51,10 +51,10 @@ probably not be able to use RPM installation, depending on… | |
up). | |
<li>Change to the directory containing the dopewars rpm, and install it with | |
the command <br> | |
-<b>rpm -i dopewars-1.4.8-1.<i>xxx</i>.rpm</b><br> | |
+<b>rpm -i dopewars-1.5.0-1.<i>xxx</i>.rpm</b><br> | |
(where <b><i>xxx</i></b> is i386 or alpha). If you have a previous version | |
of dopewars installed, upgrade it instead with<br> | |
-<b>rpm -U dopewars-1.4.8-1.<i>xxx</i>.rpm</b> | |
+<b>rpm -U dopewars-1.5.0-1.<i>xxx</i>.rpm</b> | |
</ol> | |
<a name="rpmsource"><h2>RPM source installation</h2></a> | |
t@@ -64,18 +64,18 @@ for example). It involves obtaining the RPM of the source … | |
building the binaries from it on your system. | |
<ol> | |
-<li>Download the <a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars… | |
+<li>Download the <a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars… | |
<li>Become root and change to the directory containing the new rpm. | |
<li>Build a binary rpm with the command<br> | |
-<b>rpm --rebuild dopewars-1.4.8-1.src.rpm</b> | |
+<b>rpm --rebuild dopewars-1.5.0-1.src.rpm</b> | |
<li>Change to the directory which the binary rpm has been written to (check | |
the output of the above - usually /usr/src/redhat/RPMS/<i>xxx</i>, where | |
<i>xxx</i> is your machine type - for example, "i386" on Intel machines, | |
"alpha" on Alphas) | |
<li>Install the binary rpm with the command<br> | |
-<b>rpm -i dopewars-1.4.8-1.<i>xxx</i>.rpm</b><br> | |
+<b>rpm -i dopewars-1.5.0-1.<i>xxx</i>.rpm</b><br> | |
or upgrade an existing version with<br> | |
-<b>rpm -U dopewars-1.4.8-1.<i>xxx</i>.rpm</b><br> | |
+<b>rpm -U dopewars-1.5.0-1.<i>xxx</i>.rpm</b><br> | |
</ol> | |
<a name="tarball"><h2>Tarball installation</h2></a> | |
t@@ -85,12 +85,12 @@ is also usually a necessity if you cannot become root (the… | |
Unix box. | |
<ol> | |
-<li>Download the <a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars… | |
+<li>Download the <a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/dopewars… | |
<li>Change to the directory containing the tarball and extract the contents | |
with the command <br> | |
-<b>tar -xvzf dopewars-1.4.8.tar.gz</b><br> | |
+<b>tar -xvzf dopewars-1.5.0.tar.gz</b><br> | |
(or similar). | |
-<li>Change into the dopewars-1.4.8 directory, and read all the important | |
+<li>Change into the dopewars-1.5.0 directory, and read all the important | |
documentation in there ;) | |
<li>Build the binary with the commands<br> | |
<b>./configure</b><br> | |
t@@ -102,7 +102,7 @@ should compile cleanly. If you are running the Cygwin tool… | |
Windows, the script should detect this and allow you to build a native | |
Windows binary; this will then run on any Win32 system, even one without Cygwin | |
installed. The configure script supports a number of configurable options; for | |
-more details, read the INSTALL file in the dopewars-1.4.8 directory.<p> | |
+more details, read the INSTALL file in the dopewars-1.5.0 directory.<p> | |
If you cannot become root, run the configure script specifying directories for | |
which you have write access for both the dopewars binary and high score file | |
diff --git a/doc/windows.html b/doc/windows.html | |
t@@ -6,39 +6,41 @@ | |
<body> | |
<h1>dopewars and Microsoft Windows</h1> | |
-dopewars now runs natively on Win32 systems (95, 98, NT). It runs as a console | |
-application, so if you want a pretty pointy-clicky dopewars client, you'll have | |
-to write your own - but feel free to | |
-<a href="mailto:[email protected]">email me</a> if you want to tackle | |
-such a project!<p> | |
+dopewars now runs natively on Win32 systems (95, 98, NT, 2000). It runs by | |
+default as a dopewars client, using the familiar Windows interface. However, | |
+if you prefer the "original look" text mode interface, this is still | |
+available; just right click on a shortcut to dopewars, and add <tt>-t</tt> to | |
+the end of the command line. To run a dopewars server, add <tt>-s</tt> | |
+instead.<p> | |
Binaries can be obtained from the main | |
<a href="http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/download.html">download | |
site</a>, or dopewars will compile with the free | |
<a href="http://sourceware.cygnus.com/cygwin/">Cygwin</a> tools under Win32. | |
-The installation procedure is the same as <a href="installation.html">that for | |
-Unix systems</a> - download the tarball, extract the files, change into the | |
-created directory, run the <b>configure</b> script, and then <b>make</b>. This | |
-builds a native Win32 binary, which does not need the Cygwin libraries to | |
-run.<p> | |
+dopewars uses the <a href="http://www.gtk.org/">GLib</a> library, which can | |
+be obtained for Windows from <a href="http://user.sgic.fi/~tml/gimp/win32/"> | |
+http://user.sgic.fi/~tml/gimp/win32/</a>. The installation procedure is the | |
+same as <a href="installation.html">that for Unix systems</a> - download the | |
+tarball, extract the files, change into the created directory, run the | |
+<b>configure</b> script, and then <b>make</b>. This builds a native Win32 | |
+binary, which does not need the Cygwin libraries to run.<p> | |
In virtually all respects, the Unix and Win32 versions of dopewars should be | |
identical. Both will accept the same command line parameters and configuration | |
-options. Be aware that unless you change the directories with configure before | |
-you build, however, the Win32 port will attempt to locate the high score file | |
-in its standard Unix location, which will almost certainly fail to be found on… | |
-Windows machine. The dopewars configuration file will still be read from | |
-$HOME/.dopewars or /etc/dopewars, so one can still be used under Windows by | |
-creating a file "C:\etc\dopewars" (or similar - but take care that Windows | |
-doesn't helpfully add a ".txt" extension to it for you; create it from a DOS | |
-prompt to be sure) or by setting the environment variable HOME to a sensible | |
-directory and placing a configuration file ".dopewars" within that directory.<… | |
+options. However, since the standard Unix paths for the high score file and | |
+configuration files do not translate well to Windows, by default the program | |
+will look for both the configuration file <b>dopewars-config.txt</b> and the | |
+high score file <b>dopewars.sco</b> in the current directory. (N.B. The | |
+standard Unix-like configuration files \Etc\Dopewars and $HOME\.Dopewars will | |
+be read before dopewars-config.txt if they are present, and if you build | |
+the program by hand, you'll need to use --datadir="." as an option to | |
+configure in order to get this behaviour for the high score file.)<p> | |
<hr><br> | |
<ul> | |
<li><a href="index.html">Main index</a> | |
</ul> | |
-Last update: <b>09-07-2000</b> | |
+Last update: <b>29-04-2001</b> | |
</body> | |
</html> | |
diff --git a/src/Makefile.in b/src/Makefile.in | |
t@@ -62,6 +62,9 @@ CATOBJEXT = @CATOBJEXT@ | |
CC = @CC@ | |
DATADIRNAME = @DATADIRNAME@ | |
GENCAT = @GENCAT@ | |
+GLIB_CFLAGS = @GLIB_CFLAGS@ | |
+GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -1215,6 +1215,7 @@ void SendEvent(Player *To) { | |
SendServerMessage(NULL,C_NONE,C_SUBWAYFLASH,To,NULL); | |
break; | |
case E_OFFOBJECT: | |
+ To->OnBehalfOf=NULL; | |
for (i=0;i<To->TipList.Number;i++) { | |
g_message(_("%s: Tipoff from %s"),GetPlayerName(To), | |
GetPlayerName(To->TipList.Data[i].Play)); | |
t@@ -1224,6 +1225,8 @@ void SendEvent(Player *To) { | |
} | |
for (i=0;i<To->SpyList.Number;i++) { | |
if (To->SpyList.Data[i].Turns<0) { | |
+ g_message(_("%s: Spy offered by %s"),GetPlayerName(To), | |
+ GetPlayerName(To->SpyList.Data[i].Play)); | |
To->OnBehalfOf=To->SpyList.Data[i].Play; | |
SendCopOffer(To,FORCEBITCH); | |
return; | |
t@@ -1581,6 +1584,7 @@ void RunFromCombat(Player *Play,int ToLocation) { | |
} else { | |
SendFightMessage(Play,NULL,0,F_FAILFLEE,FALSE,TRUE,NULL); | |
AllowNextShooter(Play); | |
+ if (FightTimeout) SetFightTimeout(Play); | |
DoReturnFire(Play); | |
} | |
} | |
t@@ -1723,21 +1727,30 @@ gboolean CanRunHere(Player *Play) { | |
} | |
Player *GetNextShooter(Player *Play) { | |
+/* To avoid boring waits, return the player who is next in line to be */ | |
+/* able to shoot (i.e. with the smallest FightTimeout) so that this */ | |
+/* player can be allowed to shoot immediately. If a player is already */ | |
+/* eligible to shoot, or there is a tie for "first place" then do */ | |
+/* nothing (i.e. return NULL) */ | |
Player *MinPlay,*Defend; | |
time_t MinTimeout; | |
int ArrayInd; | |
+ gboolean Tie=FALSE; | |
if (!FightTimeout) return NULL; | |
MinPlay=NULL; MinTimeout=0; | |
for (ArrayInd=0;ArrayInd<Play->FightArray->len;ArrayInd++) { | |
Defend=(Player *)g_ptr_array_index(Play->FightArray,ArrayInd); | |
- if (Defend!=Play && | |
- (MinTimeout==0 || Defend->FightTimeout<MinTimeout)) { | |
+ if (Defend==Play) continue; | |
+ if (Defend->FightTimeout==0) return NULL; | |
+ if (MinTimeout==0 || Defend->FightTimeout<=MinTimeout) { | |
+ Tie = (Defend->FightTimeout==MinTimeout); | |
MinPlay=Defend; MinTimeout=Defend->FightTimeout; | |
} | |
} | |
- return MinPlay; | |
+ | |
+ return (Tie ? NULL : MinPlay); | |
} | |
void ResolveTipoff(Player *Play) { |