dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.10)
+AM_INIT_AUTOMAKE(FlightGear, 1.0.0)
dnl Checks for programs.
AC_PROG_MAKE_SET
AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
fi
-AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
+AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
if test "x$enable_sp_fdms" != "xno"; then
AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs])
else
base_LIBS="$LIBS"
-dnl Check for SDL if enabled.
-AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL instead of GLUT], [enable_sdl="$enableval"])
-AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer], [enable_osgviewer="$enableval"])
+dnl Check for SDL or glut if enabled.
+AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer(default)], [enable_osgviewer="$enableval"])
+AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL], [enable_sdl="$enableval"])
+AC_ARG_ENABLE(glut, [ --enable-glut Configure to use GLUT], [enable_glut="$enableval"])
AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes")
-AM_CONDITIONAL(USE_OSGVIEWER, test "x$enable_osgviewer" = "xyes")
-if test "x$enable_sdl" = "xyes"; then
- AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL])
-else
- if test "x$enable_osgviewer" = "xyes"; then
- AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
- AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system])
- else
- AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
- fi
+AM_CONDITIONAL(USE_GLUT, test "x$enable_glut" = "xyes")
+if test "x$enable_sdl" != "xyes" -a "x$enable_glut" != "xyes" -a "x$enable_osgviewer" != "xno"; then
+ enable_osgviewer="yes"
+fi
+if test \( "x$enable_osgviewer" = "xyes" \
+ -a \( "x$enable_sdl" = "xyes" -o "x$enable_glut" = "xyes" \) \) \
+ -o \( "x$enable_sdl" = "xyes" -a "x$enable_glut" = "xyes" \); then
+ echo " Only one of --enable-osgviewer, --enable-sdl, or --enable -glut may"
+ echo " be supplied."
+ exit
fi
+AC_DEFINE([PU_USE_NONE], 1, [Define to use application's pu callbacks])
-AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"])
+AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"])
dnl check for OpenGL related libraries
case "${host}" in
exit
fi
-AC_MSG_CHECKING([for plib 1.8.4 or newer])
+AC_MSG_CHECKING([for plib 1.8.5 or newer])
AC_TRY_RUN([
#include <plib/ul.h>
-#define MIN_PLIB_VERSION 184
+#define MIN_PLIB_VERSION 185
int main() {
int major, minor, micro;
],
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(wrong version);
- AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
+ AC_MSG_ERROR([Install plib 1.8.5 or later first...])],
AC_MSG_RESULT(yes)
)
AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
AC_CHECK_LIB(osgDBd,osgDBGetVersion)
AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+ AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
AC_CHECK_LIB(osgd,osgGetVersion)
AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
else
AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>])
AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>])
AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>])
+ AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>])
AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>])
AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>])
fi
AC_CHECK_LIB(osgGAd,osgGAGetVersion)
AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+ AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
LIBS="$LIBS -losgFXd"
else
AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
AC_CHECK_LIB(osgGA,osgGAGetVersion)
AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
AC_CHECK_LIB(osgSim,osgSimGetVersion)
+ AC_CHECK_LIB(osgParticle,osgParticleGetVersion)
LIBS="$LIBS -losgFX"
fi
;;
src/Include/config.h-msvc8 \
src/Aircraft/Makefile \
src/Airports/Makefile \
- src/ATC/Makefile \
+ src/ATCDCL/Makefile \
src/Autopilot/Makefile \
src/Cockpit/Makefile \
src/Cockpit/built_in/Makefile \
tests/Makefile \
utils/Makefile \
utils/GPSsmooth/Makefile \
+ utils/fgadmin/Makefile
+ utils/fgadmin/src/Makefile \
utils/js_server/Makefile \
utils/Modeller/Makefile \
utils/TerraSync/Makefile \