Make the property tree reading slightly more robust.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 27091e02814fbcd239f15275a85d6c616fecefe0..a98c8fbe893f824fbec0d25ab2f2ad2da38ef194 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -198,12 +198,6 @@ esac
 
 dnl Checks for libraries.
 
-null_LIBS="$LIBS"
-
-AC_SEARCH_LIBS(cos, m)
-
-base_LIBS="$LIBS"
-
 dnl Thread related checks
 AC_CHECK_LIB(pthread, pthread_exit)
 if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
@@ -214,7 +208,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
@@ -224,11 +218,23 @@ 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"
+
 dnl check for glut location
 AC_CHECK_HEADER(GL/glut.h)
 if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
@@ -313,6 +319,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
@@ -587,6 +595,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 \