X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=bfead80f437d226fd6221eb166119a45b0a0de9f;hb=dd963990dc2f69de180be90a509d4af35df91392;hp=79dff6c37a386332a82e0b34cd87c9843e9fd0c8;hpb=02bb6a632589e7587f8e866df40814b8fb4ab8b7;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 79dff6c37..bfead80f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 
@@ -198,8 +194,6 @@ esac
 
 dnl Checks for libraries.
 
-AC_SEARCH_LIBS(cos, m)
-
 dnl Thread related checks
 AC_CHECK_LIB(pthread, pthread_exit)
 if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
@@ -210,7 +204,7 @@ if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
     save_CXXFLAGS="$CXXFLAGS"
     save_CFLAGS="$CFLAGS"
     CXXFLAGS="-pthread $CXXFLAGS"
-    CFLAGS="-pthread $FLAGS"
+    CFLAGS="-pthread $CFLAGS"
     save_LIBS=$LIBS
     AC_CHECK_LIB(c_r, pthread_exit)
     if test "x$ac_cv_lib_c_r_pthread_exit" != "xyes"; then
@@ -220,22 +214,31 @@ if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
     LIBS=$save_LIBS
 fi
 
+thread_LIBS="$LIBS"
+LIBS=""
+
+dnl search for network related libraries
 AC_SEARCH_LIBS(inet_addr, xnet)
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(main, nsl)
+
+network_LIBS="$LIBS"
+LIBS=""
+
+dnl check for some default libraries
+AC_SEARCH_LIBS(cos, m)
 AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"
-opengl_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
@@ -312,6 +315,8 @@ LIBS="$base_LIBS"
 
 AC_SUBST(base_LIBS)
 AC_SUBST(opengl_LIBS)
+AC_SUBST(thread_LIBS)
+AC_SUBST(network_LIBS)
 
 # The following are C++ items that need to be tested for with the c++
 # compiler
@@ -382,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
@@ -586,6 +543,7 @@ AC_CONFIG_FILES([ \
 	src/Network/Makefile \
 	src/NetworkOLK/Makefile \
 	src/Objects/Makefile \
+	src/Replay/Makefile \
 	src/Scenery/Makefile \
 	src/Scripting/Makefile \
 	src/Sound/Makefile \