tSlightly better fix for excluding gtkport.[ch] from non-GUI builds - vaccinewa… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 1851f80b330dbc0e2c3c61e8c20eaf136236915e | |
parent 216d8ead3fdadf684a9b96d6e48fc410a3d01e71 | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 30 Apr 2001 03:08:46 +0000 | |
Slightly better fix for excluding gtkport.[ch] from non-GUI builds | |
Diffstat: | |
M Makefile.in | 2 ++ | |
M configure | 109 +++++++++++++++++------------… | |
M configure.in | 8 ++++++++ | |
M doc/Makefile.in | 2 ++ | |
M src/Makefile.am | 6 +++--- | |
M src/Makefile.in | 14 ++++++++------ | |
M src/gtkport.c | 3 --- | |
M src/gtkport.h | 3 --- | |
8 files changed, 82 insertions(+), 65 deletions(-) | |
--- | |
diff --git a/Makefile.in b/Makefile.in | |
t@@ -67,6 +67,8 @@ GLIB_CONFIG = @GLIB_CONFIG@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GTKPORT_C = @GTKPORT_C@ | |
+GTKPORT_O = @GTKPORT_O@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
diff --git a/configure b/configure | |
t@@ -3987,13 +3987,20 @@ else | |
echo "$ac_t""Using text-mode server" 1>&6 | |
fi | |
+if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
+ GTKPORT_C="gtkport.c" | |
+ GTKPORT_O="gtkport.o" | |
+ | |
+ | |
+fi | |
+ | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:3992: checking for ANSI C header files" >&5 | |
+echo "configure:3999: 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 3997 "configure" | |
+#line 4004 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -4001,7 +4008,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4012: \"$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@@ -4018,7 +4025,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 4022 "configure" | |
+#line 4029 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -4036,7 +4043,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 4040 "configure" | |
+#line 4047 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -4057,7 +4064,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4061 "configure" | |
+#line 4068 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -4068,7 +4075,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -4092,12 +4099,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:4096: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4103: 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 4101 "configure" | |
+#line 4108 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -4113,7 +4120,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -4137,17 +4144,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:4141: checking for $ac_hdr" >&5 | |
+echo "configure:4148: 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 4146 "configure" | |
+#line 4153 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4158: \"$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@@ -4175,12 +4182,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:4179: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4186: 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 4184 "configure" | |
+#line 4191 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -4189,7 +4196,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -4210,12 +4217,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:4214: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4221: 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 4219 "configure" | |
+#line 4226 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -4223,7 +4230,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -4245,7 +4252,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4249: checking size of long long" >&5 | |
+echo "configure:4256: 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@@ -4253,7 +4260,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4257 "configure" | |
+#line 4264 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -4264,7 +4271,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4285,7 +4292,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4289: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4296: 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@@ -4293,7 +4300,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4297 "configure" | |
+#line 4304 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4303,7 +4310,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4307: \"$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_func_memcmp_clean=yes | |
else | |
t@@ -4321,7 +4328,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:4325: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4332: 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@@ -4329,7 +4336,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4333 "configure" | |
+#line 4340 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4343,7 +4350,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4367,12 +4374,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4371: checking for strftime" >&5 | |
+echo "configure:4378: 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 4376 "configure" | |
+#line 4383 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4395,7 +4402,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4417,7 +4424,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:4421: checking for strftime in -lintl" >&5 | |
+echo "configure:4428: 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@@ -4425,7 +4432,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4429 "configure" | |
+#line 4436 "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@@ -4436,7 +4443,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4465,12 +4472,12 @@ fi | |
for ac_func in strdup strstr | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4469: checking for $ac_func" >&5 | |
+echo "configure:4476: 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 4474 "configure" | |
+#line 4481 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4493,7 +4500,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4524,14 +4531,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4528: checking for library containing socket" >&5 | |
+echo "configure:4535: 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 4535 "configure" | |
+#line 4542 "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@@ -4542,7 +4549,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4553,7 +4560,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 4557 "configure" | |
+#line 4564 "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@@ -4564,7 +4571,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4586,14 +4593,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4590: checking for library containing gethostbyname" >&5 | |
+echo "configure:4597: 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 4597 "configure" | |
+#line 4604 "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@@ -4604,7 +4611,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4615,7 +4622,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 4619 "configure" | |
+#line 4626 "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@@ -4626,7 +4633,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4649,12 +4656,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4653: checking for $ac_func" >&5 | |
+echo "configure:4660: 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 4658 "configure" | |
+#line 4665 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4677,7 +4684,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4914,6 +4921,8 @@ s%@GLIB_LIBS@%$GLIB_LIBS%g | |
s%@GTK_CONFIG@%$GTK_CONFIG%g | |
s%@GTK_CFLAGS@%$GTK_CFLAGS%g | |
s%@GTK_LIBS@%$GTK_LIBS%g | |
+s%@GTKPORT_C@%$GTKPORT_C%g | |
+s%@GTKPORT_O@%$GTKPORT_O%g | |
s%@LIBOBJS@%$LIBOBJS%g | |
CEOF | |
diff --git a/configure.in b/configure.in | |
t@@ -137,6 +137,14 @@ else | |
AC_MSG_RESULT(Using text-mode server) | |
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" | |
+ GTKPORT_O="gtkport.o" | |
+ AC_SUBST(GTKPORT_C) | |
+ AC_SUBST(GTKPORT_O) | |
+fi | |
+ | |
dnl Checks for header files. | |
AC_HEADER_STDC | |
AC_HEADER_SYS_WAIT | |
diff --git a/doc/Makefile.in b/doc/Makefile.in | |
t@@ -67,6 +67,8 @@ GLIB_CONFIG = @GLIB_CONFIG@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GTKPORT_C = @GTKPORT_C@ | |
+GTKPORT_O = @GTKPORT_O@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
diff --git a/src/Makefile.am b/src/Makefile.am | |
t@@ -1,11 +1,11 @@ | |
bin_PROGRAMS = dopewars | |
dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c \ | |
curses_client.c gtk_client.c winmain.c \ | |
- dopeos.c tstring.c gtkport.c | |
-dopewars_DEPENDENCIES = @INTLLIBS@ | |
+ dopeos.c tstring.c @GTKPORT_C@ | |
+dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ | |
SUFFIXES = .rc .res | |
INCLUDES = @GTK_CFLAGS@ -I.. -I. | |
-LDADD = @GTK_LIBS@ @INTLLIBS@ | |
+LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
DOCPATH=/usr/doc/${PACKAGE}-${VERSION}/ | |
diff --git a/src/Makefile.in b/src/Makefile.in | |
t@@ -67,6 +67,8 @@ GLIB_CONFIG = @GLIB_CONFIG@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GTKPORT_C = @GTKPORT_C@ | |
+GTKPORT_O = @GTKPORT_O@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -91,12 +93,12 @@ l = @l@ | |
localedir = @localedir@ | |
bin_PROGRAMS = dopewars | |
-dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c … | |
+dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c … | |
-dopewars_DEPENDENCIES = @INTLLIBS@ | |
+dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ | |
SUFFIXES = .rc .res | |
INCLUDES = @GTK_CFLAGS@ -I.. -I. | |
-LDADD = @GTK_LIBS@ @INTLLIBS@ | |
+LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
DOCPATH = /usr/doc/${PACKAGE}-${VERSION}/ | |
t@@ -111,7 +113,7 @@ CPPFLAGS = @CPPFLAGS@ | |
LDFLAGS = @LDFLAGS@ | |
LIBS = @LIBS@ | |
dopewars_OBJECTS = AIPlayer.o serverside.o dopewars.o message.o \ | |
-curses_client.o gtk_client.o winmain.o dopeos.o tstring.o gtkport.o | |
+curses_client.o gtk_client.o winmain.o dopeos.o tstring.o | |
dopewars_LDADD = $(LDADD) | |
dopewars_LDFLAGS = | |
CFLAGS = @CFLAGS@ | |
t@@ -126,8 +128,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFO… | |
TAR = gtar | |
GZIP_ENV = --best | |
DEP_FILES = .deps/AIPlayer.P .deps/curses_client.P .deps/dopeos.P \ | |
-.deps/dopewars.P .deps/gtk_client.P .deps/gtkport.P .deps/message.P \ | |
-.deps/serverside.P .deps/tstring.P .deps/winmain.P | |
+.deps/dopewars.P .deps/gtk_client.P .deps/message.P .deps/serverside.P \ | |
+.deps/tstring.P .deps/winmain.P | |
SOURCES = $(dopewars_SOURCES) | |
OBJECTS = $(dopewars_OBJECTS) | |
diff --git a/src/gtkport.c b/src/gtkport.c | |
t@@ -27,7 +27,6 @@ | |
#include <stdarg.h> | |
#include <glib.h> | |
-#ifdef GUI_CLIENT | |
#include "gtkport.h" | |
/* Internationalization stuff */ | |
t@@ -4429,6 +4428,4 @@ gint GtkMessageBox(GtkWidget *parent,const gchar *Text, | |
return retval; | |
} | |
-#endif /* GUI_CLIENT */ | |
- | |
#endif /* CYGWIN */ | |
diff --git a/src/gtkport.h b/src/gtkport.h | |
t@@ -5,8 +5,6 @@ | |
#include <config.h> | |
#endif | |
-#ifdef GUI_CLIENT | |
- | |
#ifdef CYGWIN | |
/* GTK+ emulation prototypes etc. for Win32 platform */ | |
t@@ -701,5 +699,4 @@ guint SetAccelerator(GtkWidget *labelparent,gchar *Text, | |
GtkAccelGroup *accel_group); | |
GtkWidget *gtk_scrolled_text_new(GtkAdjustment *hadj,GtkAdjustment *vadj, | |
GtkWidget **pack_widg); | |
-#endif /* GUI_CLIENT */ | |
#endif /* __GTKPORT_H__ */ |