tconfigure test added to avoid using buggy gtk_entry_set_visibility function on… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 4dcd7012b54fe13702489f2c1604789ab09a0198 | |
parent cf398e69218df2ba898ed0bb7db97b76b71028e5 | |
Author: Ben Webb <[email protected]> | |
Date: Tue, 9 Oct 2001 20:56:40 +0000 | |
configure test added to avoid using buggy gtk_entry_set_visibility function | |
on old GTK+ (< 1.2.10) versions | |
Diffstat: | |
M acconfig.h | 4 ++++ | |
M config.h.in | 4 ++++ | |
M configure | 135 +++++++++++++++++++----------… | |
M configure.in | 21 +++++++++++++++++++++ | |
M src/gtk_client.c | 5 +++++ | |
5 files changed, 116 insertions(+), 53 deletions(-) | |
--- | |
diff --git a/acconfig.h b/acconfig.h | |
t@@ -20,6 +20,10 @@ | |
/* Do we have the socklen_t data type? */ | |
#undef HAVE_SOCKLEN_T | |
+/* Do we have GTK+ with a non-buggy gtk_entry_set_visibility() ? | |
+ (i.e. >= 1.2.10) */ | |
+#undef HAVE_FIXED_GTK | |
+ | |
#undef ENABLE_NLS | |
#undef HAVE_CATGETS | |
#undef HAVE_GETTEXT | |
diff --git a/config.h.in b/config.h.in | |
t@@ -78,6 +78,10 @@ | |
/* Do we have the socklen_t data type? */ | |
#undef HAVE_SOCKLEN_T | |
+/* Do we have GTK+ with a non-buggy gtk_entry_set_visibility() ? | |
+ (i.e. >= 1.2.10) */ | |
+#undef HAVE_FIXED_GTK | |
+ | |
#undef ENABLE_NLS | |
#undef HAVE_CATGETS | |
#undef HAVE_GETTEXT | |
diff --git a/configure b/configure | |
t@@ -3934,6 +3934,35 @@ rm -f conftest* | |
if test "$gtk_found" = "no" ; then | |
echo "configure: warning: Cannot find GTK+" 1>&2 | |
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 | |
+ 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 | |
+ 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 | |
+ 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 | |
+ fi | |
+ else | |
+ echo "$ac_t""no" 1>&6 | |
+ fi | |
fi | |
fi | |
t@@ -3943,9 +3972,9 @@ rm -f conftest* | |
GUI_SERVER="no" | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:3947: checking for socklen_t data type" >&5 | |
+echo "configure:3976: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 3949 "configure" | |
+#line 3978 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -3953,7 +3982,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -4005,12 +4034,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:4009: checking for ANSI C header files" >&5 | |
+echo "configure:4038: 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 4014 "configure" | |
+#line 4043 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -4018,7 +4047,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4051: \"$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@@ -4035,7 +4064,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 4039 "configure" | |
+#line 4068 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -4053,7 +4082,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 4057 "configure" | |
+#line 4086 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -4074,7 +4103,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4078 "configure" | |
+#line 4107 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -4085,7 +4114,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -4109,12 +4138,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:4113: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4142: 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 4118 "configure" | |
+#line 4147 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -4130,7 +4159,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -4154,17 +4183,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:4158: checking for $ac_hdr" >&5 | |
+echo "configure:4187: 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 4163 "configure" | |
+#line 4192 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4197: \"$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@@ -4192,12 +4221,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:4196: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4225: 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 4201 "configure" | |
+#line 4230 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -4206,7 +4235,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -4227,12 +4256,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:4231: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4260: 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 4236 "configure" | |
+#line 4265 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -4240,7 +4269,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -4262,7 +4291,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4266: checking size of long long" >&5 | |
+echo "configure:4295: 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@@ -4270,7 +4299,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4274 "configure" | |
+#line 4303 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -4281,7 +4310,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4302,7 +4331,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4306: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4335: 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@@ -4310,7 +4339,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4314 "configure" | |
+#line 4343 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4320,7 +4349,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4338,7 +4367,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:4342: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4371: 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@@ -4346,7 +4375,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4350 "configure" | |
+#line 4379 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4360,7 +4389,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4384,12 +4413,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4388: checking for strftime" >&5 | |
+echo "configure:4417: 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 4393 "configure" | |
+#line 4422 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4412,7 +4441,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4434,7 +4463,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:4438: checking for strftime in -lintl" >&5 | |
+echo "configure:4467: 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@@ -4442,7 +4471,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4446 "configure" | |
+#line 4475 "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@@ -4453,7 +4482,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4482,12 +4511,12 @@ fi | |
for ac_func in strdup strstr getopt_long | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4486: checking for $ac_func" >&5 | |
+echo "configure:4515: 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 4491 "configure" | |
+#line 4520 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4510,7 +4539,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4541,14 +4570,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4545: checking for library containing socket" >&5 | |
+echo "configure:4574: 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 4552 "configure" | |
+#line 4581 "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@@ -4559,7 +4588,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4570,7 +4599,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 4574 "configure" | |
+#line 4603 "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@@ -4581,7 +4610,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4603,14 +4632,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4607: checking for library containing gethostbyname" >&5 | |
+echo "configure:4636: 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 4614 "configure" | |
+#line 4643 "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@@ -4621,7 +4650,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4632,7 +4661,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 4636 "configure" | |
+#line 4665 "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@@ -4643,7 +4672,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4666,12 +4695,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4670: checking for $ac_func" >&5 | |
+echo "configure:4699: 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 4675 "configure" | |
+#line 4704 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4694,7 +4723,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
diff --git a/configure.in b/configure.in | |
t@@ -86,6 +86,27 @@ else | |
if test "$gtk_found" = "no" ; then | |
AC_MSG_WARN(Cannot find GTK+) | |
GUI_CLIENT="no" | |
+ 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]) | |
+ 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]) | |
+ 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]) | |
+ fi | |
+ else | |
+ AC_MSG_RESULT([no]) | |
+ fi | |
fi | |
fi | |
diff --git a/src/gtk_client.c b/src/gtk_client.c | |
t@@ -3180,7 +3180,12 @@ gboolean AuthDialog(HttpConnection *conn,gchar *realm) { | |
entry=gtk_entry_new(); | |
gtk_object_set_data(GTK_OBJECT(window),"password",(gpointer)entry); | |
+ | |
+#ifdef HAVE_FIXED_GTK | |
+ /* GTK+ versions earlier than 1.2.10 do bad things with this */ | |
gtk_entry_set_visibility(GTK_ENTRY(entry),FALSE); | |
+#endif | |
+ | |
gtk_table_attach_defaults(GTK_TABLE(table),entry,1,2,2,3); | |
gtk_box_pack_start(GTK_BOX(vbox),table,TRUE,TRUE,0); |