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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- a/configure.ac
+++ b/configure.ac
@@ -28,15 +28,12 @@
AC_ARG_WITH(tcltk,
AS_HELP_STRING(--with-tcltk,Create tcltk version),
MY_PROG="generator-tcltk")
- AC_ARG_WITH(gtk,
- AS_HELP_STRING(--with-gtk,Create gtk version),
- MY_PROG="generator-gtk")
AC_ARG_WITH(sdl,
AS_HELP_STRING(--with-sdl,Create SDL version),
[MY_PROG="generator-sdl"; USE_SDL_AUDIO=yes])
if [[ "x$MY_PROG" = "x" ]]; then
AC_MSG_ERROR(You must select a user interface type:
- svgalib allegro tcltk gtk sdl)
+ svgalib allegro tcltk sdl)
fi
if [[ "x$MY_PROG" = "xgenerator-allegro" ]]; then
AC_DEFINE(ALLEGRO, 1, [Allegro version])
@@ -202,50 +199,6 @@
CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused"
fi
fi
- if [[ "x$DEBUG" != "xno" ]]; then
- AC_MSG_RESULT(Turning on debug flags)
- CFLAGS="$CFLAGS -g -O"
- optimum=no
- else
- if [[ "x$GCCVER" != "xno" ]]; then
- AC_MSG_RESULT(Turning on gcc optimisations)
- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer"
- if [[ "x$GCCVER" = "x3" ]]; then
- AC_MSG_RESULT(Turning on gcc 3 optimisations)
- CFLAGS="$CFLAGS -fno-math-errno"
- fi
- case "$CFLAGS" in
- *mcpu*|*march*) AC_MSG_RESULT(Skipping target optimisations)
- ;;
- *) case "$target_cpu" in
- i386) AC_MSG_RESULT(Turning on i386 optimisations)
- CFLAGS="$CFLAGS -march=i386 -ffast-math"
- ;;
- i486) AC_MSG_RESULT(Turning on i486 optimisations)
- CFLAGS="$CFLAGS -march=i486 -ffast-math"
- ;;
- i586) AC_MSG_RESULT(Turning on pentium optimisations)
- # cannot do malign-double as we link to other libraries and
- # it would break binary compatibility
- CFLAGS="$CFLAGS -march=pentium -ffast-math"
- ;;
- i?86) AC_MSG_RESULT(Turning on i686 optimisations)
- # cannot do malign-double as we link to other libraries and
- # it would break binary compatibility
- CFLAGS="$CFLAGS -march=i686 -ffast-math"
- ;;
- alpha*) AC_MSG_RESULT(Adding -mieee for Alpha)
- CFLAGS="$CFLAGS -mieee"
- ;;
- *) AC_MSG_RESULT(Sorry unknown target CPU)
- ;;
- esac
- esac
- else
- AC_MSG_WARN(You did not opt for gcc optimisations!)
- optimum=no
- fi
- fi
AC_CHECK_LIB(jpeg, jpeg_start_compress,
[ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
@@ -259,6 +212,7 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_RANLIB
+ AM_PROG_AR
AC_PROG_MAKE_SET
AC_ISC_POSIX
AC_PROG_INSTALL
@@ -272,14 +226,7 @@
AC_PATH_XTRA
- if [[ "x$MY_PROG" = "xgenerator-gtk" ]]; then
- MY_SUBDIRS="glade gtkopts $MY_SUBDIRS"
- AM_PATH_GTK(1.2.10,,AC_MSG_ERROR(Generator needs gtk 1.2.10 or later))
- AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
-
- MY_LIBS="$MY_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- elif [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
+ if [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
MY_SUBDIRS="gtkopts $MY_SUBDIRS"
AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
@@ -305,6 +252,7 @@
AC_CHECK_SIZEOF(unsigned long, 4)
AC_CHECK_SIZEOF(unsigned long long, 8)
AC_CHECK_HEADERS(sys/param.h)
+ AC_CHECK_HEADERS(sys/time.h)
AC_CHECK_HEADERS(bzlib.h)
AC_CHECK_HEADERS(zlib.h)
AC_CHECK_HEADERS(tcl8.0.h)
|
GitWeb