dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.4)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.6-pre1)
dnl Checks for programs.
AC_PROG_MAKE_SET
# defaults to yes
with_threads=yes
AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=yes]])
-if test "x$with_threads" = "xno"; then
+if test "x$with_threads" != "xyes"; then
AC_DEFINE([ENABLE_THREADS], 0, [Define to enable threaded tile paging])
else
AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
if test -d /opt/X11R6 ; then
EXTRA_DIR2="/opt/X11R6"
fi
- EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
+ EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/"
;;
esac
AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
- LIBS="$LIBS -lglut32 -lglu32 -lopengl32"
- LIBS="$LIBS -luser32 -lgdi32"
+ if test "x$enable_sdl" = "xyes"; then
+ AC_SEARCH_LIBS(SDL_Init, SDL)
+ else
+ LIBS="$LIBS -lglut32"
+ fi
+
+ LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
dnl add -lwsock32 for mingwin
case "${host}" in
*-apple-darwin*)
dnl Mac OS X
- LIBS="$LIBS -framework GLUT -framework OpenGL -framework Carbon -lobjc"
+ LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
;;
*)
opengl_LIBS="$LIBS"
LIBS="$base_LIBS"
+dnl check for OpenAL libraries
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+ dnl CygWin under Windoze.
+
+ AC_SEARCH_LIBS(alGenBuffers, openal32)
+ AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
+ LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+ ;;
+
+*-apple-darwin*)
+ dnl Mac OS X
+
+ LIBS="$LIBS -framework IOKit -framework OpenAL"
+ ;;
+
+*)
+ dnl default unix style machines
+
+ AC_SEARCH_LIBS(alGenBuffers, openal)
+ ;;
+
+esac
+
+openal_LIBS="$LIBS"
+LIBS="$base_LIBS"
+
AC_SUBST(base_LIBS)
+AC_SUBST(openal_LIBS)
AC_SUBST(opengl_LIBS)
AC_SUBST(thread_LIBS)
AC_SUBST(network_LIBS)
exit
fi
-AC_MSG_CHECKING([for plib 1.7.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.0 or newer])
AC_TRY_RUN([
#include <plib/ul.h>
exit
fi
-AC_MSG_CHECKING([for simgear 0.3.5 or newer])
+AC_MSG_CHECKING([for simgear 0.3.7 or newer])
AC_TRY_RUN([
#include <stdio.h>
#define MIN_MAJOR 0
#define MIN_MINOR 3
-#define MIN_MICRO 5
+#define MIN_MICRO 7
int main() {
int major, minor, micro;
- printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO);
+ /* printf("%d.%d.%d or greater, ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); */
+ printf("[found %s] ... ", STRINGIFY(SIMGEAR_VERSION));
sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, µ );
- if ( major < MIN_MAJOR ) {
- return -1;
- } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) {
- return -1;
- } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){
+ if ( (major < MIN_MAJOR) ||
+ (major == MIN_MAJOR && minor < MIN_MINOR) ||
+ (major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO) ) {
return -1;
}
LIBS="$saved_LIBS"
-dnl Check if SimGear was built with Norman JPEG factory support
+dnl Check if SimGear was built with Norman's JPEG factory support
AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx)
if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then
AC_CHECK_LIB(jpeg, jpeg_start_compress)
src/Sound/Makefile \
src/Systems/Makefile \
src/Time/Makefile \
+ src/Traffic/Makefile \
tests/Makefile \
utils/Makefile \
utils/TerraSync/Makefile \