X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=885ce39a52d560f6c776db32e54168c10ad528f1;hb=c44ef2126c7159a1b2bd152c07bba1ae308740e7;hp=3fdc71ed652ef79bc926c8627f2c8ea580796852;hpb=8c4ee69aeba5b8f0d1620be6a9e96f258604f9da;p=simgear.git diff --git a/configure.ac b/configure.ac index 3fdc71ed..885ce39a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,14 @@ dnl working configure script. dnl dnl $Id$ -AC_INIT(simgear/bucket/newbucket.cxx) +AC_INIT +AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx]) -# Require at least automake 2.53 -AC_PREREQ(2.53) +# Require at least automake 2.52 +AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 0.0.19pre1) +AM_INIT_AUTOMAKE(SimGear, 0.0.19pre2) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. @@ -214,9 +215,6 @@ else echo Win32 specific hacks... AC_DEFINE([WIN32], 1, [Define for Win32 platforms]) - dnl force a failed check since we will be building under windoze - AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes") - dnl just define these to true and hope for the best ac_cv_lib_glut_glutGetModifiers="yes" ac_cv_lib_glut_glutGameModeString="yes" @@ -267,6 +265,11 @@ AC_SUBST(opengl_LIBS) AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" ) +# The following are C++ items that need to be tested for with the c++ +# compiler + +AC_LANG_PUSH(C++) + dnl Check for "plib" without which we cannot go on AC_CHECK_HEADER(plib/pu.h) if test "x$ac_cv_header_plib_pu_h" != "xyes"; then @@ -294,6 +297,7 @@ if test "x$ac_cv_header_mk4_h" != "xyes"; then exit fi +AC_LANG_POP dnl Specify if we want logging (testing build) or not (release build) @@ -330,7 +334,7 @@ AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ AM_CONFIG_HEADER(simgear/simgear_config.h) -AC_OUTPUT( \ +AC_CONFIG_FILES([ \ Makefile \ SimGear.spec \ src-libs/Makefile \ @@ -353,9 +357,9 @@ AC_OUTPUT( \ simgear/timing/Makefile \ simgear/xgl/Makefile \ simgear/xml/Makefile \ -) +]) +AC_OUTPUT -# AC_OUTPUT_COMMANDS([]) echo "" echo "Configure Summary"