More SGTime clean ups.

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index 7061ba353fdff5d2a118b650a30ed5dba34697e0..4be68112705925e821330ce9f572baa61bead6f8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,10 +3,10 @@ dnl working configure script.
 dnl
 dnl $Id$
 
-AC_INIT(src/bucket/newbucket.cxx)
+AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.2)
+AM_INIT_AUTOMAKE(SimGear, 0.0.12)
 
 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,9 +195,32 @@ 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
+if test "x$ac_cv_header_zlib_h" = "xyes"; then
+    AC_DEFINE( HAVE_ZLIB )
+else
     echo "no zlib found, building."
 fi
 AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" )
@@ -221,24 +243,32 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER(src/include/config.h)
+AM_CONFIG_HEADER(simgear/config.h)
 
 AC_OUTPUT( \
-       VERSION \
        Makefile \
-       src/Makefile \
-       src/include/Makefile \
-       src/bucket/Makefile \
-       src/debug/Makefile \
-       src/math/Makefile \
-       src/misc/Makefile \
-       src/screen/Makefile \
-       src/serial/Makefile \
-       src/xgl/Makefile \
-       src/zlib/Makefile \
+       SimGear.spec \
+       simgear/Makefile \
+       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"
@@ -257,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