X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=21050c09c4ba2f842dc9f3064ca17f7f44f2df37;hb=76585fb801049b85987d9fe7f30fab372996359a;hp=5c861dec5967cbf6505589964aa303450b3d6865;hpb=726d97be3cf42d0c0346428dd7142dc049882f54;p=flightgear.git diff --git a/configure.ac b/configure.ac index 5c861dec5..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 @@ -59,24 +59,14 @@ fi # Specify if we want to build with Multiplayer support # default to with_network=yes -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]]) +AC_ARG_WITH(multiplayer, [ --with-multiplayer Include multiplayer support [default=yes]]) -if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "xno"; then +if test "x$with_multiplayer" = "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 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]) + 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" -a "x$with_multiplayer" = "xno") AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno") @@ -110,17 +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 - 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,12 +184,6 @@ esac 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" \ @@ -214,7 +194,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 @@ -223,16 +203,32 @@ if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \ 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], , [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], , [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 @@ -274,48 +270,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 @@ -325,6 +305,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 @@ -372,73 +354,6 @@ dnl joystick lib AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support]) -dnl Checking for PSL in plib -dnl version of plib, so check for it. -AC_MSG_CHECKING([for plib PSL scripting support]) -AC_COMPILE_IFELSE([ -#include - -int main() { - // not for running... - pslProgram program((pslExtension *)0); - program.compile("int main () {}", ""); - return 0; -} -], - [AC_MSG_RESULT(yes); - have_plib_psl=yes], - AC_MSG_RESULT(no) -) -AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes") - -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) if test "x$ac_cv_header_simgear_version_h" != "xyes"; then @@ -452,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 @@ -463,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; @@ -534,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 @@ -546,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) @@ -590,11 +505,12 @@ 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 \ @@ -604,6 +520,8 @@ AC_CONFIG_FILES([ \ tests/Makefile \ utils/Makefile \ utils/TerraSync/Makefile \ + utils/js_server/Makefile \ + utils/3dconvert/Makefile \ ]) AC_OUTPUT @@ -615,16 +533,6 @@ echo "=================" echo "Prefix: $prefix" -if test "x$have_plib_psl" = "xyes"; then - echo "Plib PSL scripting: yes" -else - 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 echo "Debug messages: $with_logging" else @@ -641,9 +549,7 @@ else fi 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" + echo "Building with multiplayer support" fi if test "x$with_threads" = "xyes"; then