tClarified the "buggy GTK+" test at the end of the configure script - vaccinewa… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 6eb190e4c48912a8ff521f3733823fd76543e054 | |
parent 852f447fc36effb14f4c6d0ecf6717adfb8f4927 | |
Author: Ben Webb <[email protected]> | |
Date: Tue, 9 Oct 2001 22:11:36 +0000 | |
Clarified the "buggy GTK+" test at the end of the configure script | |
Diffstat: | |
M configure | 201 ++++++++++++++++-------------… | |
M configure.in | 35 ++++++++++++++++++++++-------… | |
2 files changed, 129 insertions(+), 107 deletions(-) | |
--- | |
diff --git a/configure b/configure | |
t@@ -3159,6 +3159,8 @@ if test "$gt_cv_func_gettext_libintl" = "yes"; then | |
LIBS="-lintl $LIBS" | |
fi | |
+HAVE_FIXED_GTK="no" | |
+ | |
localedir=${datadir}/locale | |
t@@ -3181,12 +3183,12 @@ fi | |
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | |
-echo "configure:3185: checking for Cygwin environment" >&5 | |
+echo "configure:3187: 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 3190 "configure" | |
+#line 3192 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -3197,7 +3199,7 @@ int main() { | |
return __CYGWIN__; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_cygwin=yes | |
else | |
t@@ -3236,6 +3238,8 @@ EOF | |
WNDRES="dopewars.res" | |
+ HAVE_FIXED_GTK="yes" | |
+ | |
GUI_SERVER="yes" | |
else | |
echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
t@@ -3293,7 +3297,7 @@ fi | |
# Extract the first word of "glib-config", so it can be a program name with … | |
set dummy glib-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3297: checking for $ac_word" >&5 | |
+echo "configure:3301: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3328,7 +3332,7 @@ fi | |
min_glib_version=1.2.0 | |
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
-echo "configure:3332: checking for GLIB - version >= $min_glib_version" >&5 | |
+echo "configure:3336: checking for GLIB - version >= $min_glib_version" >&5 | |
no_glib="" | |
if test "$GLIB_CONFIG" = "no" ; then | |
no_glib=yes | |
t@@ -3351,7 +3355,7 @@ echo "configure:3332: checking for GLIB - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3355 "configure" | |
+#line 3359 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3427,7 +3431,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3461,7 +3465,7 @@ fi | |
CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
LIBS="$LIBS $GLIB_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3465 "configure" | |
+#line 3469 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3471,7 +3475,7 @@ int main() { | |
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
echo "*** The test program compiled, but did not run. This usually means" | |
echo "*** that the run-time linker is not finding GLIB or finding th… | |
t@@ -3512,7 +3516,7 @@ rm -f conftest* | |
if test "$CURSES_CLIENT" = "yes" ; then | |
echo $ac_n "checking for newterm in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:3516: checking for newterm in -lncurses" >&5 | |
+echo "configure:3520: checking for newterm in -lncurses" >&5 | |
ac_lib_var=`echo ncurses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3520,7 +3524,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3524 "configure" | |
+#line 3528 "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@@ -3531,7 +3535,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3560,7 +3564,7 @@ fi | |
if test "$ac_cv_lib_ncurses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcurses""... $ac_c" 1>&6 | |
-echo "configure:3564: checking for newterm in -lcurses" >&5 | |
+echo "configure:3568: checking for newterm in -lcurses" >&5 | |
ac_lib_var=`echo curses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3568,7 +3572,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3572 "configure" | |
+#line 3576 "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@@ -3579,7 +3583,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3608,7 +3612,7 @@ fi | |
if test "$ac_cv_lib_curses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcur_colr""... $ac_c" 1>&6 | |
-echo "configure:3612: checking for newterm in -lcur_colr" >&5 | |
+echo "configure:3616: checking for newterm in -lcur_colr" >&5 | |
ac_lib_var=`echo cur_colr'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3616,7 +3620,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3620 "configure" | |
+#line 3624 "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@@ -3627,7 +3631,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3713,7 +3717,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:3717: checking for $ac_word" >&5 | |
+echo "configure:3721: 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@@ -3748,7 +3752,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:3752: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:3756: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -3771,7 +3775,7 @@ echo "configure:3752: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3775 "configure" | |
+#line 3779 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3849,7 +3853,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3883,7 +3887,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3887 "configure" | |
+#line 3891 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3893,7 +3897,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3901: \"$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@@ -3936,33 +3940,18 @@ rm -f conftest* | |
GUI_CLIENT="no" | |
else | |
echo $ac_n "checking for non-buggy GTK+ ( >= 1.2.10 )""... $ac_c" 1>&6 | |
-echo "configure:3940: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
+echo "configure:3944: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
if test "$gtk_config_major_version" -gt 1 ; then | |
- cat >> confdefs.h <<\EOF | |
-#define HAVE_FIXED_GTK 1 | |
-EOF | |
- | |
- echo "$ac_t""yes" 1>&6 | |
+ HAVE_FIXED_GTK="yes" | |
elif test "$gtk_config_major_version" -eq 1 ; then | |
if test "$gtk_config_minor_version" -gt 2 ; then | |
- cat >> confdefs.h <<\EOF | |
-#define HAVE_FIXED_GTK 1 | |
-EOF | |
- | |
- echo "$ac_t""yes" 1>&6 | |
+ HAVE_FIXED_GTK="yes" | |
elif test "$gtk_config_minor_version" -eq 2 -a \ | |
"$gtk_config_micro_version" -ge 10 ; then | |
- cat >> confdefs.h <<\EOF | |
-#define HAVE_FIXED_GTK 1 | |
-EOF | |
- | |
- echo "$ac_t""yes" 1>&6 | |
- else | |
- echo "$ac_t""no" 1>&6 | |
+ HAVE_FIXED_GTK="yes" | |
fi | |
- else | |
- echo "$ac_t""no" 1>&6 | |
fi | |
+ echo "$ac_t"""$HAVE_FIXED_GTK"" 1>&6 | |
fi | |
fi | |
t@@ -3972,9 +3961,9 @@ EOF | |
GUI_SERVER="no" | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:3976: checking for socklen_t data type" >&5 | |
+echo "configure:3965: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 3978 "configure" | |
+#line 3967 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -3982,7 +3971,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -4026,6 +4015,13 @@ EOF | |
fi | |
+if test "$HAVE_FIXED_GTK" = "yes" ; then | |
+ cat >> confdefs.h <<\EOF | |
+#define HAVE_FIXED_GTK 1 | |
+EOF | |
+ | |
+fi | |
+ | |
if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
GTKPORT_C="gtkport.c" | |
GTKPORT_O="gtkport.o" | |
t@@ -4034,12 +4030,12 @@ if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes"… | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:4038: checking for ANSI C header files" >&5 | |
+echo "configure:4034: 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 4043 "configure" | |
+#line 4039 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -4047,7 +4043,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4047: \"$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@@ -4064,7 +4060,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 4068 "configure" | |
+#line 4064 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -4082,7 +4078,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 4086 "configure" | |
+#line 4082 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -4103,7 +4099,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4107 "configure" | |
+#line 4103 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -4114,7 +4110,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:4118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -4138,12 +4134,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:4142: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4138: 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 4147 "configure" | |
+#line 4143 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -4159,7 +4155,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -4183,17 +4179,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:4187: checking for $ac_hdr" >&5 | |
+echo "configure:4183: 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 4192 "configure" | |
+#line 4188 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4193: \"$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@@ -4221,12 +4217,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:4225: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4221: 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 4230 "configure" | |
+#line 4226 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -4235,7 +4231,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -4256,12 +4252,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:4260: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4256: 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 4265 "configure" | |
+#line 4261 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -4269,7 +4265,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -4291,7 +4287,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4295: checking size of long long" >&5 | |
+echo "configure:4291: 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@@ -4299,7 +4295,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4303 "configure" | |
+#line 4299 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -4310,7 +4306,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4331,7 +4327,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4335: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4331: 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@@ -4339,7 +4335,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4343 "configure" | |
+#line 4339 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4349,7 +4345,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4367,7 +4363,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:4371: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4367: 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@@ -4375,7 +4371,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4379 "configure" | |
+#line 4375 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4389,7 +4385,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4413,12 +4409,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4417: checking for strftime" >&5 | |
+echo "configure:4413: 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 4422 "configure" | |
+#line 4418 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4441,7 +4437,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4463,7 +4459,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:4467: checking for strftime in -lintl" >&5 | |
+echo "configure:4463: 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@@ -4471,7 +4467,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4475 "configure" | |
+#line 4471 "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@@ -4482,7 +4478,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4511,12 +4507,12 @@ fi | |
for ac_func in strdup strstr getopt_long | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4515: checking for $ac_func" >&5 | |
+echo "configure:4511: 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 4520 "configure" | |
+#line 4516 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4539,7 +4535,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4543: \"$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* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4570,14 +4566,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4574: checking for library containing socket" >&5 | |
+echo "configure:4570: 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 4581 "configure" | |
+#line 4577 "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@@ -4588,7 +4584,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4599,7 +4595,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 4603 "configure" | |
+#line 4599 "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@@ -4610,7 +4606,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4632,14 +4628,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4636: checking for library containing gethostbyname" >&5 | |
+echo "configure:4632: 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 4643 "configure" | |
+#line 4639 "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@@ -4650,7 +4646,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4661,7 +4657,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 4665 "configure" | |
+#line 4661 "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@@ -4672,7 +4668,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4695,12 +4691,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4699: checking for $ac_func" >&5 | |
+echo "configure:4695: 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 4704 "configure" | |
+#line 4700 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4723,7 +4719,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -5281,4 +5277,15 @@ if test "$network" = "yes" ; then | |
else | |
echo "Networking support DISABLED; single-player mode only" | |
fi | |
+ | |
+if test "$GUI_SERVER" = "yes" -o "$GUI_CLIENT" = "yes" ; then | |
+ if test "$HAVE_FIXED_GTK" = "no" ; then | |
+ cat <<FGTKEND | |
+WARNING: You have an old version of GTK+, which has bugs in the | |
+gtk_entry_set_visibility function (used for password-entry boxes). Thus, for | |
+stability reasons, this function will not be used, and all passwords entered | |
+will be visible. To fix this, upgrade GTK+ to version 1.2.10 or later. | |
+FGTKEND | |
+ fi | |
+fi | |
echo | |
diff --git a/configure.in b/configure.in | |
t@@ -19,6 +19,8 @@ if test "$gt_cv_func_gettext_libintl" = "yes"; then | |
LIBS="-lintl $LIBS" | |
fi | |
+HAVE_FIXED_GTK="no" | |
+ | |
localedir=${datadir}/locale | |
AC_SUBST(localedir) | |
dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) | |
t@@ -57,6 +59,10 @@ if test "$CYGWIN" = "yes" ; then | |
WNDRES="dopewars.res" | |
AC_SUBST(WNDRES) | |
+ dnl The gtkport implementation works just fine | |
+ dnl for gtk_entry_set_visibility() | |
+ HAVE_FIXED_GTK="yes" | |
+ | |
dnl Use graphical server by default | |
GUI_SERVER="yes" | |
else | |
t@@ -90,23 +96,17 @@ else | |
AC_MSG_CHECKING([for non-buggy GTK+ ( >= 1.2.10 )]) | |
dnl Versions older than 1.2.10 are buggy | |
if test "$gtk_config_major_version" -gt 1 ; then | |
- AC_DEFINE(HAVE_FIXED_GTK) | |
- AC_MSG_RESULT([yes]) | |
+ HAVE_FIXED_GTK="yes" | |
elif test "$gtk_config_major_version" -eq 1 ; then | |
if test "$gtk_config_minor_version" -gt 2 ; then | |
dnl We assume all 1.3.x releases are OK | |
- AC_DEFINE(HAVE_FIXED_GTK) | |
- AC_MSG_RESULT([yes]) | |
+ HAVE_FIXED_GTK="yes" | |
elif test "$gtk_config_minor_version" -eq 2 -a \ | |
"$gtk_config_micro_version" -ge 10 ; then | |
- AC_DEFINE(HAVE_FIXED_GTK) | |
- AC_MSG_RESULT([yes]) | |
- else | |
- AC_MSG_RESULT([no]) | |
+ HAVE_FIXED_GTK="yes" | |
fi | |
- else | |
- AC_MSG_RESULT([no]) | |
fi | |
+ AC_MSG_RESULT("$HAVE_FIXED_GTK") | |
fi | |
fi | |
t@@ -144,6 +144,10 @@ if test "$GUI_SERVER" = "yes" ; then | |
AC_DEFINE(GUI_SERVER) | |
fi | |
+if test "$HAVE_FIXED_GTK" = "yes" ; then | |
+ AC_DEFINE(HAVE_FIXED_GTK) | |
+fi | |
+ | |
if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
dnl Compile in the gtkport stuff for any kind of GUI | |
GTKPORT_C="gtkport.c" | |
t@@ -260,4 +264,15 @@ if test "$network" = "yes" ; then | |
else | |
echo "Networking support DISABLED; single-player mode only" | |
fi | |
+ | |
+if test "$GUI_SERVER" = "yes" -o "$GUI_CLIENT" = "yes" ; then | |
+ if test "$HAVE_FIXED_GTK" = "no" ; then | |
+ cat <<FGTKEND | |
+WARNING: You have an old version of GTK+, which has bugs in the | |
+gtk_entry_set_visibility function (used for password-entry boxes). Thus, for | |
+stability reasons, this function will not be used, and all passwords entered | |
+will be visible. To fix this, upgrade GTK+ to version 1.2.10 or later. | |
+FGTKEND | |
+ fi | |
+fi | |
echo |