X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=21050c09c4ba2f842dc9f3064ca17f7f44f2df37;hb=02623bedbc7cc2f5db728c3b1f2fd32675ce3d50;hp=6c4d2eba6bb70fecb6b8ed48b86d4f095b48511a;hpb=43e48070fec3ff8299be0e6aa5a709711def50fe;p=flightgear.git diff --git a/configure.ac b/configure.ac index 6c4d2eba6..21050c09c 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.3) dnl Checks for programs. AC_PROG_MAKE_SET @@ -21,19 +21,32 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S +# specify the simgear location +AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) + +if test "x$with_simgear" != "x" ; then + echo "SimGear prefix path is $with_simgear" + EXTRA_DIRS="${EXTRA_DIRS} $with_simgear" +fi + dnl set the $host variable based on local machine/os AC_CANONICAL_HOST -dnl Used on the Irix platform -AR="ar" -ARFLAGS="cru" case "${host}" in *-*-irix*) if test "$CXX" = "CC"; then AR="CC -ar" ARFLAGS="-o" + CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility" + else + AR="ar" + ARFLAGS="cru" fi ;; +*) + AR="ar" + ARFLAGS="cru" + ;; esac AC_SUBST(AR) AC_SUBST(ARFLAGS) @@ -44,21 +57,22 @@ 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 multiplayer support [default=yes]]) + +if test "x$with_multiplayer" = "xno"; then + echo "Building without any kind of multiplayer support" 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 multiplayer support" + AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with multiplayer support]) fi -AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno") +AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno") # Specify if we want to use WeatherCM instead of FGEnvironment. # default to with_weathercm=no -AC_ARG_WITH(new-environment, [ --with-weathercm Use WeatherCM instead of FGEnvironment]) +AC_ARG_WITH(weathercm, [ --with-weathercm Use WeatherCM instead of FGEnvironment]) if test "x$with_weathercm" = "xyes" ; then echo "Building with WeatherCM" AC_DEFINE([FG_WEATHERCM], 1, @@ -74,8 +88,8 @@ 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 @@ -86,25 +100,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 - -# specify the simgear location -AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) - -if test "x$with_simgear" != "x" ; then - echo "SimGear prefix path is $with_simgear" - EXTRA_DIRS="${EXTRA_DIRS} $with_simgear" -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) @@ -121,7 +123,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 @@ -135,7 +137,7 @@ dnl enough. AM_CONDITIONALS are then referenced to conditionally dnl build a Makefile.in from a Makefile.am which lets us define custom dnl includes, compile alternative source files, etc. -# Check for external variables daylight and timezone. +dnl Check for external variables daylight and timezone. AC_EXT_DAYLIGHT if test "$have_daylight" = yes; then AC_DEFINE([HAVE_DAYLIGHT], 1, [Define if system has daylight variable]) @@ -146,13 +148,15 @@ if test "$have_timezone" = yes; then AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable]) fi -# Check for audio support +dnl add correct audio libs and configure for audio support audio_LIBS="-lplibsl -lplibsm" 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" ;; @@ -160,6 +164,11 @@ case "${host}" in esac AC_SUBST(audio_LIBS) +dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of +dnl just assuming we have audio support on all platform. We can +dnl depend on plib to hide the details. +AC_DEFINE([ENABLE_AUDIO_SUPPORT], 1, [Define for audio support]) + dnl X11 might be installed on Mac OS X or cygwin/mingwin, we don't want dnl to use it if it is. case "${host}" in @@ -175,20 +184,56 @@ 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 + +thread_LIBS="$LIBS" +LIBS="" -AC_CHECK_LIB(m, cos) +dnl search for network related libraries +AC_SEARCH_LIBS(inet_addr, xnet) +AC_SEARCH_LIBS(socket, socket) +AC_SEARCH_LIBS(main, nsl) -dnl MINGW requires libwsock32 -if test "x$is_mingw" = "xyes" ; then - LIBS="$LIBS -lws2_32" -fi +network_LIBS="$LIBS" +LIBS="" + +dnl check for some default libraries +AC_SEARCH_LIBS(cos, m) +AC_SEARCH_LIBS(dlclose, dl) base_LIBS="$LIBS" -dnl Thread related checks -AC_CHECK_LIB(pthread, pthread_exit) -AC_CHECK_LIB(socket, socket) +dnl check for glut location +AC_CHECK_HEADER(GL/glut.h) +if test "x$ac_cv_header_GL_glut_h" = "xyes"; then + 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([FG_GLUT_H], , [Define as glut.h include location]) + else + echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" + exit + fi +fi dnl check for OpenGL related libraries case "${host}" in @@ -205,7 +250,8 @@ case "${host}" in dnl add -lwsock32 for mingwin case "${host}" in *-*-mingw32*) - LIBS="$LIBS -lws2_32" + echo "********** BUILDING FOR MINGW32 *************" + base_LIBS="$base_LIBS -lws2_32" ;; esac @@ -224,67 +270,43 @@ 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 - - LIBS="$LIBS -lglut" + AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ]) + AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) ;; esac -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]) -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]) - else - echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" - exit - fi -fi - opengl_LIBS="$LIBS" 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 @@ -330,56 +352,7 @@ int main() { dnl If we get here then plib is available, so force use of plib dnl joystick lib AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support]) -AC_DEFINE([FG_PLIB_JOYSTICK_GETNAME], 1, - [Define to enable plib joystick name support]) -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 - -#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) @@ -394,7 +367,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.4 or newer]) AC_TRY_RUN([ #include @@ -405,7 +378,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 0 +#define MIN_MICRO 4 int main() { int major, minor, micro; @@ -476,7 +449,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 @@ -488,7 +461,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) @@ -518,6 +491,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 \ @@ -531,11 +505,14 @@ AC_CONFIG_FILES([ \ src/Main/runfgfs \ src/Main/runfgfs.bat \ src/Model/Makefile \ + src/AIModel/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 \ src/Systems/Makefile \ src/Time/Makefile \ @@ -543,6 +520,8 @@ AC_CONFIG_FILES([ \ tests/Makefile \ utils/Makefile \ utils/TerraSync/Makefile \ + utils/js_server/Makefile \ + utils/3dconvert/Makefile \ ]) AC_OUTPUT @@ -563,14 +542,16 @@ fi echo -n "Automake version: " automake --version | head -1 -echo "New plib joystick name support: $plib_js_has_getname" - if test "x$with_weathercm" != "x"; then echo "WeatherCM instead of FGEnvironment: $with_weathercm" else echo "Using FGEnvironment" fi +if test "x$with_multiplayer" != "xno"; then + echo "Building with multiplayer support" +fi + if test "x$with_threads" = "xyes"; then echo "threads: yes" else