dnl Process this file with autoget.sh to produce a working configure
dnl script.
-dnl
-dnl $Id$
AC_INIT
AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx])
dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.6)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.8)
dnl Checks for programs.
AC_PROG_MAKE_SET
if test "$CXX" = "CC"; then
AR="CC -ar"
ARFLAGS="-o"
- CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+ CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility"
+ CFLAGS="$CFLAGS -c99"
else
AR="ar"
ARFLAGS="cru"
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
-dnl Used to control whether clouds3d should be compiled in or not
-AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support])
-AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x")
-
# Check for MS Windows environment
AC_CHECK_HEADER(windows.h)
if test -d /opt/X11R6 ; then
EXTRA_DIR2="/opt/X11R6"
fi
- EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/"
+ EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
;;
esac
AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable])
fi
-dnl add correct audio libs and configure for audio support
-audio_LIBS="-lplibsl -lplibsm"
+dnl add joystick support libraries
dnl search for FreeBSD library
AC_SEARCH_LIBS(hid_init, usbhid)
+joystick_LIBS="$LIBS"
+LIBS=""
-case "${host}" in
-*-*-cygwin* | *-*-mingw32*)
- audio_LIBS="$audio_LIBS -lwinmm"
- ;;
-*-apple-darwin*)
- audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation"
- ;;
-*-*-irix* )
- audio_LIBS="$audio_LIBS -laudio"
- ;;
-
-esac
-AC_SUBST(audio_LIBS)
dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
dnl just assuming we have audio support on all platform. We can
if test "x$ac_cv_header_pthread_h" = "xyes"; then
if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
CXXFLAGS="-pthread $CXXFLAGS"
- CFLAGS="-pthread $FLAGS"
+ CFLAGS="-pthread $CFLAGS"
fi
fi
LIBS=""
dnl check for some default libraries
-AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(sqrt, [am ffm fm fastm m])
+AC_SEARCH_LIBS(ceil, m)
AC_SEARCH_LIBS(dlclose, dl)
base_LIBS="$LIBS"
fi
LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+ joystick_LIBS="$joystick_LIBS -lwinmm"
dnl add -lwsock32 for mingwin
case "${host}" in
*-*-mingw32*)
echo "********** BUILDING FOR MINGW32 *************"
- base_LIBS="$base_LIBS -lws2_32"
+ network_LIBS="$network_LIBS -lws2_32"
;;
esac
dnl Mac OS X
LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
+ joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation"
;;
*)
esac
opengl_LIBS="$LIBS"
-LIBS="$base_LIBS"
-
-dnl search for FreeBSD library
-AC_SEARCH_LIBS(hid_init, usbhid)
+LIBS="$base_LIBS $joystick_LIBS"
dnl check for OpenAL libraries
case "${host}" in
AC_SEARCH_LIBS(alGenBuffers, openal32)
AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
- LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+ LIBS="$LIBS -ldsound -ldxguid -lole32"
openal_LIBS="$LIBS"
;;
save_LIBS=$LIBS
LIBS="$LIBS $thread_LIBS"
AC_SEARCH_LIBS(alGenBuffers, openal)
+ AC_SEARCH_LIBS(alutInit, [ alut openal ] )
OPENAL_OK="$ac_cv_search_alGenBuffers"
openal_LIBS="$LIBS"
LIBS=$save_LIBS
AC_SUBST(opengl_LIBS)
AC_SUBST(thread_LIBS)
AC_SUBST(network_LIBS)
+AC_SUBST(joystick_LIBS)
# The following are C++ items that need to be tested for with the c++
# compiler
exit
fi
-AC_MSG_CHECKING([for plib 1.8.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.4 or newer])
AC_TRY_RUN([
#include <plib/ul.h>
-#define MIN_PLIB_VERSION 170
+#define MIN_PLIB_VERSION 184
int main() {
int major, minor, micro;
exit
fi
-AC_MSG_CHECKING([for simgear 0.3.7 or newer])
+AC_MSG_CHECKING([for simgear 0.3.8 or newer])
AC_TRY_RUN([
#include <stdio.h>
#define MIN_MAJOR 0
#define MIN_MINOR 3
-#define MIN_MICRO 7
+#define MIN_MICRO 8
int main() {
int major, minor, micro;
src/Autopilot/Makefile \
src/Cockpit/Makefile \
src/Cockpit/built_in/Makefile \
- src/Controls/Makefile \
src/Environment/Makefile \
src/FDM/Balloon/Makefile \
src/FDM/ExternalNet/Makefile \
src/MultiPlayer/Makefile \
src/Navaids/Makefile \
src/Network/Makefile \
- src/Objects/Makefile \
- src/Replay/Makefile \
src/Scenery/Makefile \
src/Scripting/Makefile \
src/Sound/Makefile \
src/Traffic/Makefile \
tests/Makefile \
utils/Makefile \
- utils/TerraSync/Makefile \
- utils/Modeller/Makefile \
+ utils/GPSsmooth/Makefile \
utils/js_server/Makefile \
+ utils/Modeller/Makefile \
+ utils/TerraSync/Makefile \
+ utils/xmlgrep/Makefile \
])
AC_OUTPUT