dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.8-pre1)
+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"
AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable])
fi
-dnl add correct audio libs and configure for audio support
-LIBS="-lplibsl -lplibsm"
+dnl add joystick support libraries
dnl search for FreeBSD library
AC_SEARCH_LIBS(hid_init, usbhid)
-
-case "${host}" in
-*-*-cygwin* | *-*-mingw32*)
- LIBS="$LIBS -lwinmm"
- ;;
-*-apple-darwin*)
- LIBS="$LIBS -framework IOKit -framework CoreFoundation"
- ;;
-*-*-irix* )
- LIBS="$LIBS -laudio"
- ;;
-
-esac
-audio_LIBS="$LIBS"
+joystick_LIBS="$LIBS"
LIBS=""
-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
fi
LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+ joystick_LIBS="$joystick_LIBS -lwinmm"
dnl add -lwsock32 for mingwin
case "${host}" in
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"
;;
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;