1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- configure.in.old 2012-03-22 21:48:13.392372372 +0100
+++ configure.in 2012-03-22 21:48:27.373388004 +0100
@@ -61,11 +61,6 @@
SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl"
],)
-PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [
- SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith"
- SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk"
-],)
-
AC_SUBST(SOPWITH_BINS)
AC_SUBST(SOPWITH_SUBDIRS)
@@ -71,7 +71,7 @@
dnl check for TCPIP support
-AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,)
+AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,)
dnl generate Makefiles
--- src/Makefile.am.old 2012-03-23 11:02:37.300326914 +0100
+++ src/Makefile.am 2012-03-23 11:03:17.733470930 +0100
@@ -6,7 +6,7 @@
bin_PROGRAMS = @SOPWITH_BINS@
EXTRA_PROGRAMS = sopwith gtksopwith psopwith
-CFLAGS = @CFLAGS@ -I..
+AM_CFLAGS = @SDL_CFLAGS@ -I..
COMMON_SRC = \
video.h swcollsn.c swgames.h swmain.h swutil.h \
--- src/sdl/Makefile.am.old 2012-03-23 11:04:40.819600680 +0100
+++ src/sdl/Makefile.am 2012-03-23 11:05:07.303729600 +0100
@@ -1,4 +1,4 @@
-CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
+AM_CFLAGS = @SDL_CFLAGS@ -I..
noinst_LIBRARIES = libsdlsopwith.a
|
GitWeb
