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)
dnl Checks for libraries.
-null_LIBS="$LIBS"
-
-AC_CHECK_LIB(m, cos)
-
-base_LIBS="$LIBS"
-
dnl Thread related checks
AC_CHECK_LIB(pthread, pthread_exit)
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
fi
LIBS=$save_LIBS
fi
-AC_CHECK_LIB(socket, socket)
+
+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
- 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
dnl Skip X11 library tests if requested.
if test "x$no_x" != "xyes"; then
- AC_CHECK_LIB(X11, XCreateWindow)
- AC_CHECK_LIB(Xext, XShmCreateImage)
- AC_CHECK_LIB(Xi, XGetExtensionVersion)
- AC_CHECK_LIB(ICE, IceOpenConnection)
- AC_CHECK_LIB(SM, SmcOpenConnection)
- AC_CHECK_LIB(Xt, XtMalloc)
- AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
+ AC_SEARCH_LIBS(XCreateWindow, X11)
+ AC_SEARCH_LIBS(XShmCreateImage, Xext)
+ AC_SEARCH_LIBS(XGetExtensionVersion, Xi)
+ AC_SEARCH_LIBS(IceOpenConnection, ICE)
+ AC_SEARCH_LIBS(SmcOpenConnection, SM)
+ AC_SEARCH_LIBS(XtMalloc, Xt)
+ AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu)
fi
- AC_CHECK_LIB(GLcore, glNewList)
- if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
- dnl if no GLcore, check for GL
- AC_CHECK_LIB(GL, glNewList)
- if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
- dnl if no GL, check for MesaGL
- AC_CHECK_LIB(MesaGL, glNewList)
- fi
- else
- dnl if GLcore found, then also check for GL
- AC_CHECK_LIB(GL, glXCreateContext)
+ AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
+ if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
+ dnl if GLcore found, then also check for GL
+ AC_SEARCH_LIBS(glXCreateContext, GL)
fi
dnl if using mesa, check for xmesa.h
- if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
- AC_CHECK_HEADER(GL/fxmesa.h)
- if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
- AC_DEFINE([XMESA], 1, [Define for fxmesa])
+ if test "x$ac_cv_search_glNewList" = "x-lMesaGL"; then
+ AC_CHECK_HEADER(GL/fxmesa.h)
+ if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
+ AC_DEFINE([XMESA], 1, [Define for fxmesa])
AC_DEFINE([FX], 1, [Define for fxmesa])
fi
fi
- AC_CHECK_LIB(GLU, gluLookAt)
- if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
- dnl if no GLU, check for MesaGLU
- AC_CHECK_LIB(MesaGLU, gluLookAt)
- fi
-
- AC_CHECK_LIB(glut, glutGetModifiers)
- if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno" ; then
- dnl if no "real" glut, check for freeglut
- AC_CHECK_LIB(freeglut, glutGetModifiers)
- fi
+ AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
+ AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ])
;;
esac
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
[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
src/Network/Makefile \
src/NetworkOLK/Makefile \
src/Objects/Makefile \
+ src/Replay/Makefile \
src/Scenery/Makefile \
src/Scripting/Makefile \
src/Sound/Makefile \
projects / flightgear.git / blobdiff