tGLib configure test only used on Unix systems (not Win32) - vaccinewars - be a… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit d0702d97923ad6d70c00fe126a0fd11db9f408fa | |
parent f96ff1bb11366328567f7cc6df2690634d07e646 | |
Author: Ben Webb <[email protected]> | |
Date: Sun, 29 Apr 2001 02:42:44 +0000 | |
GLib configure test only used on Unix systems (not Win32) | |
Diffstat: | |
M configure | 285 ++++++++++++++++-------------… | |
M configure.in | 12 +++++++++--- | |
2 files changed, 153 insertions(+), 144 deletions(-) | |
--- | |
diff --git a/configure b/configure | |
t@@ -22,14 +22,14 @@ ac_help="$ac_help | |
ac_help="$ac_help | |
--enable-curses-client include curses client" | |
ac_help="$ac_help | |
+ --enable-nativewin32 build a native Win32 binary under Cygwin" | |
+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)" | |
ac_help="$ac_help | |
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" | |
t@@ -3151,7 +3151,74 @@ else | |
fi | |
-# Check whether --with-glib-prefix or --without-glib-prefix was given. | |
+WIN_RC="" | |
+WIN_RES="" | |
+WIN_MAKE_RES="/dev/null" | |
+ | |
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | |
+echo "configure:3160: 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 3165 "configure" | |
+#include "confdefs.h" | |
+ | |
+int main() { | |
+ | |
+#ifndef __CYGWIN__ | |
+#define __CYGWIN__ __CYGWIN32__ | |
+#endif | |
+return __CYGWIN__; | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:3176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+ rm -rf conftest* | |
+ ac_cv_cygwin=yes | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -rf conftest* | |
+ ac_cv_cygwin=no | |
+fi | |
+rm -f conftest* | |
+rm -f conftest* | |
+fi | |
+ | |
+echo "$ac_t""$ac_cv_cygwin" 1>&6 | |
+CYGWIN= | |
+test "$ac_cv_cygwin" = yes && CYGWIN=yes | |
+# Check whether --enable-nativewin32 or --disable-nativewin32 was given. | |
+if test "${enable_nativewin32+set}" = set; then | |
+ enableval="$enable_nativewin32" | |
+ CYGWIN="$enableval" | |
+fi | |
+ | |
+ | |
+if test "$CYGWIN" = "yes" ; then | |
+ echo "$ac_t"""Configuring for native Win32 binary under Cygwin"" 1>&6 | |
+ cat >> confdefs.h <<\EOF | |
+#define CYGWIN 1 | |
+EOF | |
+ | |
+ | |
+ | |
+ CFLAGS="$CFLAGS -mwindows -fnative-struct -mno-cygwin" | |
+ LIBS="$LIBS -lwsock32 -lcomctl32" | |
+ if test "$GUI_CLIENT" = "yes" ; then | |
+ cat >> confdefs.h <<\EOF | |
+#define GUI_CLIENT 1 | |
+EOF | |
+ | |
+ fi | |
+ | |
+ LDFLAGS="$LDFLAGS -lglib-1.3" | |
+ | |
+ GUI_SERVER="yes" | |
+else | |
+ echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
+ | |
+ # 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" | |
t@@ -3204,7 +3271,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:3208: checking for $ac_word" >&5 | |
+echo "configure:3275: 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@@ -3239,7 +3306,7 @@ 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 | |
+echo "configure:3310: checking for GLIB - version >= $min_glib_version" >&5 | |
no_glib="" | |
if test "$GLIB_CONFIG" = "no" ; then | |
no_glib=yes | |
t@@ -3262,7 +3329,7 @@ echo "configure:3243: checking for GLIB - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3266 "configure" | |
+#line 3333 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3338,7 +3405,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3372,7 +3439,7 @@ fi | |
CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
LIBS="$LIBS $GLIB_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3376 "configure" | |
+#line 3443 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3382,7 +3449,7 @@ 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; } &&… | |
+if { (eval echo configure:3453: \"$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@@ -3421,73 +3488,9 @@ rm -f conftest* | |
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: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 3435 "configure" | |
-#include "confdefs.h" | |
- | |
-int main() { | |
- | |
-#ifndef __CYGWIN__ | |
-#define __CYGWIN__ __CYGWIN32__ | |
-#endif | |
-return __CYGWIN__; | |
-; return 0; } | |
-EOF | |
-if { (eval echo configure:3446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
- rm -rf conftest* | |
- ac_cv_cygwin=yes | |
-else | |
- echo "configure: failed program was:" >&5 | |
- cat conftest.$ac_ext >&5 | |
- rm -rf conftest* | |
- ac_cv_cygwin=no | |
-fi | |
-rm -f conftest* | |
-rm -f conftest* | |
-fi | |
- | |
-echo "$ac_t""$ac_cv_cygwin" 1>&6 | |
-CYGWIN= | |
-test "$ac_cv_cygwin" = yes && CYGWIN=yes | |
-# Check whether --enable-nativewin32 or --disable-nativewin32 was given. | |
-if test "${enable_nativewin32+set}" = set; then | |
- enableval="$enable_nativewin32" | |
- CYGWIN="$enableval" | |
-fi | |
- | |
- | |
-if test "$CYGWIN" = "yes" ; then | |
- echo "$ac_t"""Configuring for native Win32 binary under Cygwin"" 1>&6 | |
- cat >> confdefs.h <<\EOF | |
-#define CYGWIN 1 | |
-EOF | |
- | |
- CFLAGS="$CFLAGS -mwindows -fnative-struct -mno-cygwin" | |
- LIBS="$LIBS -lwsock32 -lcomctl32" | |
- if test "$GUI_CLIENT" = "yes" ; then | |
- cat >> confdefs.h <<\EOF | |
-#define GUI_CLIENT 1 | |
-EOF | |
- | |
- fi | |
- | |
- LDFLAGS="$LDFLAGS -lglib-1.3" | |
- | |
- GUI_SERVER="yes" | |
-else | |
- echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
if test "$CURSES_CLIENT" = "yes" ; then | |
echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:3491: checking for initscr in -lncurses" >&5 | |
+echo "configure:3494: 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@@ -3495,7 +3498,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3499 "configure" | |
+#line 3502 "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@@ -3506,7 +3509,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3535,7 +3538,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:3539: checking for initscr in -lcurses" >&5 | |
+echo "configure:3542: 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@@ -3543,7 +3546,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3547 "configure" | |
+#line 3550 "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@@ -3554,7 +3557,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3583,7 +3586,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:3587: checking for initscr in -lcur_colr" >&5 | |
+echo "configure:3590: 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@@ -3591,7 +3594,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3595 "configure" | |
+#line 3598 "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@@ -3602,7 +3605,7 @@ int main() { | |
initscr() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3688,7 +3691,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:3692: checking for $ac_word" >&5 | |
+echo "configure:3695: 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@@ -3723,7 +3726,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:3727: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:3730: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -3746,7 +3749,7 @@ echo "configure:3727: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3750 "configure" | |
+#line 3753 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3824,7 +3827,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3858,7 +3861,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3862 "configure" | |
+#line 3865 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3868,7 +3871,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3875: \"$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@@ -3925,9 +3928,9 @@ EOF | |
GUI_SERVER="no" | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:3929: checking for socklen_t data type" >&5 | |
+echo "configure:3932: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 3931 "configure" | |
+#line 3934 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -3935,7 +3938,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -3985,12 +3988,12 @@ else | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:3989: checking for ANSI C header files" >&5 | |
+echo "configure:3992: 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 3994 "configure" | |
+#line 3997 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -3998,7 +4001,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4005: \"$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@@ -4015,7 +4018,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 4019 "configure" | |
+#line 4022 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -4033,7 +4036,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 4037 "configure" | |
+#line 4040 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -4054,7 +4057,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4058 "configure" | |
+#line 4061 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -4065,7 +4068,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -4089,12 +4092,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:4093: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4096: 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 4098 "configure" | |
+#line 4101 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -4110,7 +4113,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -4134,17 +4137,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:4138: checking for $ac_hdr" >&5 | |
+echo "configure:4141: 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 4143 "configure" | |
+#line 4146 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4151: \"$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@@ -4172,12 +4175,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:4176: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4179: 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 4181 "configure" | |
+#line 4184 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -4186,7 +4189,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -4207,12 +4210,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:4211: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4214: 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 4216 "configure" | |
+#line 4219 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -4220,7 +4223,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -4242,7 +4245,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4246: checking size of long long" >&5 | |
+echo "configure:4249: 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@@ -4250,7 +4253,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4254 "configure" | |
+#line 4257 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -4261,7 +4264,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4282,7 +4285,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4286: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4289: 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@@ -4290,7 +4293,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4294 "configure" | |
+#line 4297 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4300,7 +4303,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4318,7 +4321,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:4322: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4325: 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@@ -4326,7 +4329,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4330 "configure" | |
+#line 4333 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4340,7 +4343,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4364,12 +4367,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4368: checking for strftime" >&5 | |
+echo "configure:4371: 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 4373 "configure" | |
+#line 4376 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4392,7 +4395,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4414,7 +4417,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:4418: checking for strftime in -lintl" >&5 | |
+echo "configure:4421: 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@@ -4422,7 +4425,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4426 "configure" | |
+#line 4429 "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@@ -4433,7 +4436,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4462,12 +4465,12 @@ fi | |
for ac_func in strdup strstr | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4466: checking for $ac_func" >&5 | |
+echo "configure:4469: 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 4471 "configure" | |
+#line 4474 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4490,7 +4493,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4521,14 +4524,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4525: checking for library containing socket" >&5 | |
+echo "configure:4528: 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 4532 "configure" | |
+#line 4535 "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@@ -4539,7 +4542,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4550,7 +4553,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 4554 "configure" | |
+#line 4557 "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@@ -4561,7 +4564,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4583,14 +4586,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4587: checking for library containing gethostbyname" >&5 | |
+echo "configure:4590: 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 4594 "configure" | |
+#line 4597 "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@@ -4601,7 +4604,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4612,7 +4615,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 4616 "configure" | |
+#line 4619 "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@@ -4623,7 +4626,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4646,12 +4649,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4650: checking for $ac_func" >&5 | |
+echo "configure:4653: 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 4655 "configure" | |
+#line 4658 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4674,7 +4677,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4681: \"$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@@ -31,9 +31,6 @@ 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@@ -48,6 +45,11 @@ AC_ARG_ENABLE(nativewin32, | |
if test "$CYGWIN" = "yes" ; then | |
AC_MSG_RESULT("Configuring for native Win32 binary under Cygwin") | |
AC_DEFINE(CYGWIN) | |
+ | |
+ dnl We NEED GLib, but glib-config is not usually installed under Cygwin | |
+ dnl even when glib-1.3.dll is - so we assume GLib is in place; the worst | |
+ dnl that can happen is that "make" fails later on. | |
+ | |
CFLAGS="$CFLAGS -mwindows -fnative-struct -mno-cygwin" | |
LIBS="$LIBS -lwsock32 -lcomctl32" | |
if test "$GUI_CLIENT" = "yes" ; then | |
t@@ -61,6 +63,10 @@ if test "$CYGWIN" = "yes" ; then | |
GUI_SERVER="yes" | |
else | |
AC_MSG_RESULT("Configuring for Unix binary") | |
+ | |
+ dnl We NEED glib - so test for it first | |
+ AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR(Cannot find glib - aborting)]) | |
+ | |
dnl On true Unix systems, test for valid curses-like libraries | |
if test "$CURSES_CLIENT" = "yes" ; then | |
AC_CHECK_LIB(ncurses,initscr) |