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
|
--- configure.in.orig 2001-01-16 16:26:29.000000000 +0100
+++ configure.in 2009-04-27 03:06:12.000000000 +0200
@@ -43,16 +43,10 @@
dnl General options
dnl --------------------------------------------------------------------------
TR_CPPFLAGS=""
-TR_CFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations"
-TR_CXXFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations"
+TR_CFLAGS=""
+TR_CXXFLAGS=""
TR_LIBS=""
-case "$host" in
-i*86-*-*) TR_CFLAGS="$TR_CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";
- TR_CXXFLAGS="$TR_CXXFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";;
-alpha*-*-linux-*) TR_CFLAGS="$TR_CFLAGS -mieee";;
-esac
-
AC_ARG_ENABLE(debug, [ --enable-debug Produce an executable with debugging symbols],
[TR_CFLAGS="-g -Wall"; TR_CXXFLAGS="-g -Wall"],
[TR_CPPFLAGS="$TR_CPPFLAGS -DTUXRACER_NO_ASSERT=1"])
@@ -137,6 +131,10 @@
if test "x$have_tcl_lib" = "xno" -a "x$with_tcl_lib_name" = "x" ; then
TCL_LIB_LIST=`grep -v -E "^$TCL_LIB_NAME\$" <<EOF
+tcl8.5
+tcl85
+tcl8.4
+tcl84
tcl8.3
tcl83
tcl8.2
@@ -191,6 +189,10 @@
TCL_HEADER_LIST=`grep -v -E "^$TCL_HEADER\$" <<EOF
tcl.h
+tcl8.5.h
+tcl85.h
+tcl8.4.h
+tcl84.h
tcl8.3.h
tcl83.h
tcl8.2.h
@@ -219,7 +221,8 @@
FIND_TCL_H
if test "x$have_tcl_h" = "xno" -a "x$with_tcl_inc" = "x"; then
- TCL_INC_LIST="/usr/include/tcl8.3 /usr/include/tcl8.2 \
+ TCL_INC_LIST="/usr/include/tcl8.5 /usr/include/tcl8.4 \
+ /usr/include/tcl8.3 /usr/include/tcl8.2 \
/usr/include/tcl8.0 /usr/include/tcl"
for TCL_INC in $TCL_INC_LIST ; do
@@ -303,6 +306,10 @@
saved_LIBS="$LIBS"
+if test "x$THREAD_LIB" = "x" ; then
+ THREAD_LIB="-lpthread"
+fi
+
AC_DEFUN( CHECK_FOR_GL_LIB, [
AC_MSG_CHECKING([for $GL_LIB_NAME library])
LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
@@ -313,15 +320,15 @@
TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
else
- dnl Try with -lpthread
+ dnl Try with pthreads
AC_MSG_CHECKING([for $GL_LIB_NAME library (with pthreads)])
- LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME -lpthread"
+ LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME $THREAD_LIB"
AC_TRY_LINK( , , have_GL=yes, have_GL=no)
AC_MSG_RESULT([$have_GL])
if test "x$have_GL" = "xyes" ; then
- TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME -lpthread"
+ TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME $THREAD_LIB"
fi
fi
])
@@ -466,7 +473,7 @@
if test "x$have_glx_h" = "xno" ; then
AC_MSG_ERROR([Cannot find GL/glx.h])
fi
-
+ CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY"
dnl Check that glXGetProcAddressARB is defined in glx.h
AC_MSG_CHECKING([whether glx.h defines glXGetProcAddressARB]);
AC_TRY_COMPILE( [#include <GL/glx.h>], [ char *foo = (char*) glXGetProcAddressARB; ],
|
