Win32 fix

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 85a2cd532526007d38e24b30266ce57d9be16fc7..85a50bd6b17696d9835d22ae487ee9510a625c6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 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
@@ -214,7 +214,6 @@ else
 fi
 
 AC_ARG_ENABLE(osgdebug, [  --enable-osgdebug                  Use OSG debug libraries], [enable_osgdebug="$enableval"])
-AM_CONDITIONAL(USE_OSGDEBUG, test "x$enable_osgdebug" = "xyes")
 
 dnl check for OpenGL related libraries
 case "${host}" in
@@ -465,11 +464,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     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;
@@ -484,7 +483,7 @@ int main() {
 ],
   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)
 )
 
@@ -527,7 +526,7 @@ case "${host}" in
     AS_VAR_POPDEF([ac_Framework])dnl
     ])
 
-    if USE_OSGDEBUG; then
+    if test "x$enable_osgdebug" = "xyes"; then
         AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
         AC_CHECK_LIB(osgGAd,osgGAGetVersion)
         AC_CHECK_LIB(osgTextd,osgTextGetVersion)
@@ -535,6 +534,7 @@ case "${host}" in
         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
@@ -545,31 +545,34 @@ case "${host}" in
         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
     ;;
 *)
-    if USE_OSGDEBUG; then
-        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
-        AC_CHECK_LIB(osgGAd,osgGAGetVersion)
-        AC_CHECK_LIB(osgTextd,osgTextGetVersion)
-        LIBS="$LIBS -losgFXd"
+    if test "x$enable_osgdebug" = "xyes"; then
+        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
+        AC_CHECK_LIB(osgd,osgGetVersion)
         AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
         AC_CHECK_LIB(osgDBd,osgDBGetVersion)
+        AC_CHECK_LIB(osgTextd,osgTextGetVersion)
+        AC_CHECK_LIB(osgGAd,osgGAGetVersion)
+        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
         AC_CHECK_LIB(osgSimd,osgSimGetVersion)
-        AC_CHECK_LIB(osgd,osgGetVersion)
-        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
+        AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
+        LIBS="$LIBS -losgFXd"
     else
-        AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
-        AC_CHECK_LIB(osgGA,osgGAGetVersion)
-        AC_CHECK_LIB(osgText,osgTextGetVersion)
-        LIBS="$LIBS -losgFX"
+        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
+        AC_CHECK_LIB(osg,osgGetVersion)
         AC_CHECK_LIB(osgUtil,osgUtilGetVersion)
         AC_CHECK_LIB(osgDB,osgDBGetVersion)
+        AC_CHECK_LIB(osgText,osgTextGetVersion)
+        AC_CHECK_LIB(osgGA,osgGAGetVersion)
+        AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
         AC_CHECK_LIB(osgSim,osgSimGetVersion)
-        AC_CHECK_LIB(osg,osgGetVersion)
-        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
+        AC_CHECK_LIB(osgParticle,osgParticleGetVersion)
+        LIBS="$LIBS -losgFX"
     fi
     ;;
 esac
@@ -684,6 +687,8 @@ AC_CONFIG_FILES([ \
        tests/Makefile \
        utils/Makefile \
        utils/GPSsmooth/Makefile \
+       utils/fgadmin/Makefile
+       utils/fgadmin/src/Makefile \
        utils/js_server/Makefile \
        utils/Modeller/Makefile \
        utils/TerraSync/Makefile \