X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=bfead80f437d226fd6221eb166119a45b0a0de9f;hb=dd963990dc2f69de180be90a509d4af35df91392;hp=e5fd840d5920cc16a3b90986d73a64205547385d;hpb=9d726c1bd8fec7e2448a73e448c9fcaa044e185f;p=flightgear.git diff --git a/configure.ac b/configure.ac index e5fd840d5..bfead80f4 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.1) +AM_INIT_AUTOMAKE(FlightGear, 0.9.2) dnl Checks for programs. AC_PROG_MAKE_SET @@ -57,16 +57,27 @@ if test "x$with_logging" = "xno" ; then AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) fi -# Specify if we want to build with Oliver's networking support +# Specify if we want to build with Multiplayer support # default to with_network=yes -AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support]) -if test "x$with_network_olk" = "xno" ; then - echo "Building without Oliver's multi-pilot network support" +AC_ARG_WITH(multiplayer, [ --with-multiplayer Include default multiplayer support]) +AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support [default=no]]) + +if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "xno"; then + echo "Building without any kind of multiplayer support" + +elif test "x$with_multiplayer" = "xno"; then +# echo "Building without default multiplayer support" + echo "Building with Oliver's multi-pilot network support" + AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking]) + else - echo "Building with Oliver's multi-pilot network support" - AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking]) + echo "Building with default multiplayer support" +# echo "Building without Oliver's multi-pilot network support" + AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with default multiplayer support]) fi -AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno") + +AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno") +AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno") # Specify if we want to use WeatherCM instead of FGEnvironment. @@ -81,25 +92,14 @@ else fi AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes") -dnl Specify if we want the new XML menu; default to the old one -AC_ARG_WITH(new-menubar, [ --with-new-menubar Use the new XML menu bar]) -if test "x$with_new_menubar" = "xyes" ; then - echo "Building with new menubar" -else - AC_DEFINE([FG_OLD_MENUBAR], 1, - [Define to build with old menubar]) - echo "Building with old menubar" -fi -AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes") - dnl Thread related checks AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]]) if test "x$with_threads" = "xyes"; then AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging]) CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" - AC_CHECK_HEADER(pthread.h) fi +AC_CHECK_HEADER(pthread.h) AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes") # specify the plib location @@ -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) @@ -137,7 +133,7 @@ case "${host}" in if test -d /opt/X11R6 ; then EXTRA_DIR2="/opt/X11R6" fi - EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2" + EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2" ;; esac @@ -168,7 +164,9 @@ case "${host}" in *-*-cygwin* | *-*-mingw32*) audio_LIBS="$audio_LIBS -lwinmm" ;; - +*-apple-darwin*) + audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation" + ;; *-*-irix* ) audio_LIBS="$audio_LIBS -laudio" ;; @@ -196,24 +194,51 @@ esac dnl Checks for libraries. -null_LIBS="$LIBS" +dnl Thread related checks +AC_CHECK_LIB(pthread, pthread_exit) +if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \ + -a "x$ac_cv_header_pthread_h" = "xyes"; then + dnl FreeBSD: System has pthread.h, but -lpthread library check + dnl fails. See if we need -pthread instead of -lpthread and look + dnl for the functions in libc_r. + save_CXXFLAGS="$CXXFLAGS" + save_CFLAGS="$CFLAGS" + CXXFLAGS="-pthread $CXXFLAGS" + 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 + CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS + fi + LIBS=$save_LIBS +fi -AC_CHECK_LIB(m, cos) +thread_LIBS="$LIBS" +LIBS="" -base_LIBS="$LIBS" +dnl search for network related libraries +AC_SEARCH_LIBS(inet_addr, xnet) +AC_SEARCH_LIBS(socket, socket) +AC_SEARCH_LIBS(main, nsl) -dnl Thread related checks -AC_CHECK_LIB(pthread, pthread_exit) -AC_CHECK_LIB(socket, socket) +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], , [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], , [Define as glut.h include location]) else echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" exit @@ -255,48 +280,32 @@ case "${host}" in 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 @@ -306,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 @@ -353,9 +364,9 @@ dnl joystick lib AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support]) -dnl Compiling an in-memory PSL script is available only in the CVS +dnl Checking for PSL in plib dnl version of plib, so check for it. -AC_MSG_CHECKING([for plib PSL in-memory script compilation support]) +AC_MSG_CHECKING([for plib PSL scripting support]) AC_COMPILE_IFELSE([ #include @@ -367,62 +378,15 @@ int main() { } ], [AC_MSG_RESULT(yes); - fg_psl_string_compile=yes], + have_plib_psl=yes], AC_MSG_RESULT(no) ) -if test "x$fg_psl_string_compile" = "xyes"; then - AC_DEFINE([FG_PSL_STRING_COMPILE], 1, - [Support for compiling PSL scripts from an in-memory string.]) -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 +AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes") +if test "x$have_plib_psl" = "xyes"; then + AC_DEFINE([HAVE_PLIB_PSL], 1, + [Define if plib version is new enough to provide "PSL"]) fi -AC_MSG_CHECKING([for metakit 2.4.3 or newer]) -saved_LIBS="$LIBS" -LIBS="$saved_LIBS -lmk4" -AC_TRY_RUN([ -#include - -#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 @@ -436,7 +400,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.0 or newer]) +AC_MSG_CHECKING([for simgear 0.3.3 or newer]) AC_TRY_RUN([ #include @@ -447,7 +411,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 0 +#define MIN_MICRO 3 int main() { int major, minor, micro; @@ -518,7 +482,7 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS( \ fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \ - sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h ) + sys/time.h sys/timeb.h unistd.h windows.h values.h ) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -530,7 +494,7 @@ dnl Checks for library functions. AC_TYPE_SIGNAL AC_FUNC_VPRINTF AC_CHECK_FUNCS( \ - ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ + ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ random drand48 setitimer getitimer signal GetLocalTime rint getrusage ) AM_CONFIG_HEADER(src/Include/config.h) @@ -560,6 +524,7 @@ AC_CONFIG_FILES([ \ src/Environment/Makefile \ src/FDM/Balloon/Makefile \ src/FDM/ExternalNet/Makefile \ + src/FDM/ExternalPipe/Makefile \ src/FDM/JSBSim/Makefile \ src/FDM/JSBSim/filtersjb/Makefile \ src/FDM/LaRCsim/Makefile \ @@ -573,10 +538,12 @@ AC_CONFIG_FILES([ \ src/Main/runfgfs \ src/Main/runfgfs.bat \ src/Model/Makefile \ + src/MultiPlayer/Makefile \ src/Navaids/Makefile \ src/Network/Makefile \ src/NetworkOLK/Makefile \ src/Objects/Makefile \ + src/Replay/Makefile \ src/Scenery/Makefile \ src/Scripting/Makefile \ src/Sound/Makefile \ @@ -597,13 +564,14 @@ echo "=================" echo "Prefix: $prefix" -if test "x$fg_psl_string_compile" = "xyes"; then - echo "Scripts for input bindings: yes" +if test "x$have_plib_psl" = "xyes"; then + echo "Plib PSL scripting: yes" else - echo "Scripts for input bindings: $fg_psl_string_compile" - echo " PSL scripts attached to input bindings will not" - echo " work. Download the latest CVS version of plib" - echo " if you would like to enable them." + echo "Plib PSL scripting: $fg_psl_string_compile" + echo " You will not be able to run scripts written in PSL" + echo " and some advanced GUI and input features may not" + echo " work. Download and install the latest CVS version" + echo " of plib if you would like to enable PSL support." fi if test "x$with_logging" != "x"; then @@ -621,10 +589,10 @@ else echo "Using FGEnvironment" fi -if test "x$with_new_menubar" != "x"; then - echo "Using new menubar" -else - echo "Defaulting to old menubar" +if test "x$with_multiplayer" != "xno"; then + echo "Using default multiplayer support" +elif test "x$with_network_olk" != "xno"; then + echo "Using Oliver's multi-pilot network support" fi if test "x$with_threads" = "xyes"; then