X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=360401f04f57b552987710f2bccfc6f9e907cc40;hb=1d058b0bac42aa38b19762fcfaca64ff8c7608fd;hp=a98c8fbe893f824fbec0d25ab2f2ad2da38ef194;hpb=419f09f804d83c003021d4ec7be97a6889ef960c;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index a98c8fbe8..360401f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.2)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.3-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -110,17 +110,13 @@ if test "x$with_plib" != "x" ; then
     EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
 fi
 
-# specify the metakit location
-AC_ARG_WITH(metakit, [  --with-metakit=PREFIX   Specify the prefix path to metakit])
-
-if test "x$with_metakit" != "x" ; then
-    echo "metakit prefix is $with_metakit"
-    EXTRA_DIRS="${EXTRA_DIRS} $with_metakit"
-fi
-
 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 controll 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)
 
@@ -238,11 +234,11 @@ base_LIBS="$LIBS"
 dnl check for glut location
 AC_CHECK_HEADER(GL/glut.h)
 if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    AC_DEFINE([GLUT_H], "GL/glut.h", [Define as glut.h include location])
+    AC_DEFINE([FG_GLUT_H], <GL/glut.h>, [Define as glut.h include location])
 else
     AC_CHECK_HEADER(GLUT/glut.h)
     if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
+        AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
     else
         echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
         exit
@@ -391,54 +387,6 @@ if test "x$have_plib_psl" = "xyes"; then
              [Define if plib version is new enough to provide "PSL"])
 fi
 
-dnl Check for MetaKit
-AC_CHECK_HEADER(mk4.h)
-if test "x$ac_cv_header_mk4_h" != "xyes"; then
-    echo
-    echo "MetaKit library not found."
-    echo
-    echo "If your OS does not provide an installable package for MetaKit"
-    echo "you will have to compile and install it first yourself.  A copy"
-    echo "of metakit-$(VERSION).tar.gz is included with SimGear.  You will"
-    echo "have to untar this source code, and follow it's included instructions"
-    echo "to compile and install on your system."
-    echo
-    echo "configure aborted."
-    exit
-fi
-
-AC_MSG_CHECKING([for metakit 2.4.3 or newer])
-saved_LIBS="$LIBS"
-LIBS="$saved_LIBS -lmk4"
-AC_TRY_RUN([
-#include <mk4.h>
-
-#define MIN_MK4_VERSION 243
-
-int main() {
-    int major, minor, micro;
-
-    if ( d4_MetaKitLibraryVersion < MIN_MK4_VERSION ) {
-	 return -1;
-    }
-
-    return 0;
-}
-
-],
-  AC_MSG_RESULT(yes),
-  [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([
-
-Install metakit 2.4.3 or later first.
-
-Or, the compiler may not be finding your libmk4.so library.
-Please check the config.log file for specific details of the
-failure if you believe you have the correct metakit version.
-Also, look up this issue in the FlightGear FAQ.])],
-  AC_MSG_RESULT(yes)
-)
-
 dnl Check for the presence of SimGear
 AC_CHECK_HEADER(simgear/version.h)
 if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
@@ -452,7 +400,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.3 or newer])
+AC_MSG_CHECKING([for simgear 0.3.4 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -463,7 +411,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 3
+#define MIN_MICRO 4
 
 int main() {
     int major, minor, micro;