1 diff -urN FlightGear-0.7.10.orig/configure.in FlightGear-0.7.10/configure.in
2 --- FlightGear-0.7.10.orig/configure.in Wed Aug 28 20:12:25 2002
3 +++ FlightGear-0.7.10/configure.in Wed Aug 28 20:25:51 2002
5 AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14)
6 AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15)
8 +AM_CONDITIONAL(ENABLE_XMESA_FX, [false])
12 +AC_DEFINE( FGFS,,[fucken] )
18 AC_ARG_WITH(logging, [ --with-logging Include logging output (default)])
19 if test "x$with_logging" = "xno" ; then
20 - AC_DEFINE( FG_NDEBUG )
21 + AC_DEFINE( FG_NDEBUG,,[fucken] )
26 echo "Building without Oliver's multi-pilot network support"
28 echo "Building with Oliver's multi-pilot network support"
29 - AC_DEFINE( FG_NETWORK_OLK )
30 + AC_DEFINE( FG_NETWORK_OLK,,[fucken] )
32 AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno")
35 echo " ftp://ftp.uu.net in the directory graphics/jpeg"
38 - AC_DEFINE( FG_JPEG_SERVER )
39 + AC_DEFINE( FG_JPEG_SERVER,,[fucken] )
41 AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes")
44 AC_ARG_WITH(new-environment, [ --with-new-environment Include new experimental environment subsystem])
45 if test "x$with_new_environment" = "xyes" ; then
46 echo "Building with new environment subsystem"
47 - AC_DEFINE( FG_NEW_ENVIRONMENT )
48 + AC_DEFINE( FG_NEW_ENVIRONMENT,,[fucken] )
50 echo "Building with old weather subsystem"
53 AC_ARG_WITH(old-mouse, [ --with-old-mouse Disable new mouse input support])
54 if test "x$with_old_mouse" = "xyes" ; then
55 echo "Building with old mouse subsystem"
56 - AC_DEFINE( FG_OLD_MOUSE )
57 + AC_DEFINE( FG_OLD_MOUSE,,[fucken] )
59 echo "Building with new mouse subsystem"
62 dnl Thread related checks
63 AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]])
64 if test "x$with_threads" = "xyes"; then
65 - AC_DEFINE(ENABLE_THREADS)
66 + AC_DEFINE(ENABLE_THREADS,,[fucken])
67 CXXFLAGS="$CXXFLAGS -D_REENTRANT"
68 CFLAGS="$CFLAGS -D_REENTRANT"
69 AC_CHECK_HEADER(pthread.h)
71 # Check for external variables daylight and timezone.
73 if test "$have_daylight" = yes; then
74 - AC_DEFINE( HAVE_DAYLIGHT )
75 + AC_DEFINE( HAVE_DAYLIGHT,,[fucken] )
77 # AM_CONDITIONAL(HAVE_DAYLIGHT, test "$have_daylight" = yes )
80 if test "$have_timezone" = yes; then
81 - AC_DEFINE( HAVE_TIMEZONE )
82 + AC_DEFINE( HAVE_TIMEZONE,,[fucken] )
84 # AM_CONDITIONAL(HAVE_TIMEZONE, test "$have_timezone" = yes )
87 -o "x$ac_cv_header_windows_h" = "xyes" \
88 -o "$HOSTTYPE" = "macintosh"; then
90 - AC_DEFINE( ENABLE_AUDIO_SUPPORT )
91 + AC_DEFINE( ENABLE_AUDIO_SUPPORT,,[fucken] )
92 audio_LIBS="-lplibsl -lplibsm"
94 if test -r /usr/include/audio.h; then
97 AC_CHECK_LIB(GL, XMesaSetFXmode)
98 if test "x$ac_cv_lib_GL_XMesaSetFXmode" = "xyes" ; then
101 + AC_DEFINE( XMESA,,[fucken] )
102 + AC_DEFINE( FX,,[fucken])
104 AC_CHECK_LIB(MesaGL, XMesaSetFXmode)
105 if test "x$ac_cv_lib_MesaGL_XMesaSetFXmode" = "xyes" ; then
108 + AC_DEFINE( XMESA,,[fucken] )
109 + AC_DEFINE( FX,,[fucken])
113 @@ -340,11 +342,11 @@
114 # winbloze-isms. We'll just do this manually for now.
116 echo Win32 specific hacks...
118 + AC_DEFINE( WIN32,,[fucken])
120 # force a failed check since we will be building under windoze
121 AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
124 # just define these to true and hope for the best
125 ac_cv_lib_glut_glutGetModifiers="yes"
126 ac_cv_lib_glut_glutGameModeString="yes"
128 # AC_CHECK_LIB(glut, glutGameModeString)
130 # If we get here then plib is available, so force use of plib joystick lib
131 -AC_DEFINE( ENABLE_PLIB_JOYSTICK )
132 +AC_DEFINE( ENABLE_PLIB_JOYSTICK,,[fucken] )
134 # Do we have a new CVS plib version with jsJoystick::getName?
135 echo -n "Testing for Plib joystick getName support: "
137 plib_js_has_getname=yes, plib_js_has_getname=no )
138 echo $plib_js_has_getname
139 if test $plib_js_has_getname = 'yes'; then
140 - AC_DEFINE(FG_PLIB_JOYSTICK_GETNAME)
141 + AC_DEFINE(FG_PLIB_JOYSTICK_GETNAME,,[fucken])
144 # Check for the presence of SimGear
147 AC_CHECK_HEADER(mk4.h)
148 if test "x$ac_cv_header_mk4_h" = "xyes"; then
149 - AC_DEFINE( HAVE_MK4 )
150 + AC_DEFINE( HAVE_MK4,,[fucken] )
153 echo "MetaKit library not found."
155 # Check for system installed zlib
156 AC_CHECK_HEADER(zlib.h)
157 if test "x$ac_cv_header_zlib_h" = "xyes"; then
158 - AC_DEFINE( HAVE_ZLIB )
159 + AC_DEFINE( HAVE_ZLIB,,[fucken] )
162 echo "zlib library not found."