X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=2df2e5083b03a7a60348a552d94a0ab86241f911;hb=3ec00676e45f080f9f0555aeaaf7fa2f78261dda;hp=2c2e266cf1c7a42a438fffa38e2a7ec779add40e;hpb=35ed10e252eac1c9c6f6961c5cc1e70e3b69d762;p=simgear.git

diff --git a/configure.in b/configure.in
index 2c2e266c..2df2e508 100644
--- 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.3)
+AM_INIT_AUTOMAKE(SimGear, 0.0.9)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -24,6 +24,10 @@ else
 fi
 
 
+dnl Run configure in the gdbm subdir
+dnl AC_CONFIG_SUBDIRS( simgear/gdbm )
+
+
 dnl Specify if we want logging (testing build) or not (release build)
 # set logging default value
 # with_logging=yes
@@ -196,6 +200,15 @@ 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 zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" = "xyes"; then
@@ -223,24 +236,30 @@ 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/gdbm/Makefile \
+	simgear/magvar/Makefile \
+	simgear/math/Makefile \
+	simgear/misc/Makefile \
+	simgear/screen/Makefile \
+	simgear/serial/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"
@@ -259,3 +278,11 @@ 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_zlib_h" != "xyes"; then
+   echo "Building zlib"
+fi