X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=fde76c7f6f7d005a97ebbc011266232f9b68e8b1;hb=b5705ff47a847ebbd6cf78130bdb710692e4fdd3;hp=84b6bf958369351534d80f63f1cc62ff025c9cce;hpb=1547d4ee2f917c3823cb4f2a3ee74ce46c09f7eb;p=simgear.git diff --git a/configure.in b/configure.in index 84b6bf95..fde76c7f 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ dnl $Id$ AC_INIT(simgear/bucket/newbucket.cxx) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 0.0.7) +AM_INIT_AUTOMAKE(SimGear, 0.0.11) dnl Checks for programs. AC_PROG_MAKE_SET @@ -24,7 +24,6 @@ else fi -dnl Specify if we want logging (testing build) or not (release build) # set logging default value # with_logging=yes AC_ARG_WITH(logging, [ --with-logging Include logging output (default)]) @@ -196,6 +195,27 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then exit fi +# dnl Check for system installed gdbm +# AC_CHECK_HEADER(gdbm.h) +# if test "x$ac_cv_header_gdbm_h" = "xyes"; then +# AC_DEFINE( HAVE_GDBM ) +# else +# echo "no gdbm found, configuring and building." +# fi +# AM_CONDITIONAL(HAVE_GDBM, test "x$ac_cv_header_gdbm_h" = "xyes" ) + +dnl Check for system installed metakit +AC_CHECK_HEADER(mk4.h) +if test "x$ac_cv_header_mk4_h" != "xyes"; then + echo "no metakit found, configuring and building." + # Run configure in the metakit subdir + AC_CONFIG_SUBDIRS( simgear/metakit/unix ) +fi +AM_CONDITIONAL(HAVE_METAKIT, test "x$ac_cv_header_mk4_h" = "xyes" ) + + +dnl Specify if we want logging (testing build) or not (release build) + dnl Check for system installed zlib AC_CHECK_HEADER(zlib.h) if test "x$ac_cv_header_zlib_h" = "xyes"; then @@ -232,16 +252,23 @@ AC_OUTPUT( \ simgear/version.h \ simgear/bucket/Makefile \ simgear/debug/Makefile \ + simgear/ephemeris/Makefile \ simgear/magvar/Makefile \ simgear/math/Makefile \ simgear/misc/Makefile \ simgear/screen/Makefile \ simgear/serial/Makefile \ + simgear/sky/Makefile \ + simgear/timing/Makefile \ simgear/xgl/Makefile \ simgear/zlib/Makefile \ ) -# AC_OUTPUT_COMMANDS([./mksymlinks.sh]) +AC_OUTPUT_COMMANDS([ +# if test "x$ac_cv_header_windows_h" = "xyes" ; then +# cp simgear/gdbm/autoconf.h.cygwin32 simgear/gdbm/autoconf.h +# fi +]) echo "" echo "Configure Summary" @@ -260,3 +287,15 @@ if test "x$with_efence" != "x"; then else echo "Electric fence: no" fi + +# if test "x$ac_cv_header_gdbm_h" != "xyes"; then +# echo "Building gdbm" +# fi + +if test "x$ac_cv_header_mk4_h" != "xyes"; then + echo "Building metakit" +fi + +if test "x$ac_cv_header_zlib_h" != "xyes"; then + echo "Building zlib" +fi