diff --git a/Makefile.am b/Makefile.am index 1cf44b13..f9aee579 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,94 @@ EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h SUBDIRS = simgear +# +# Additional all, clean, and distclean rules for additional packages. +# We can't just include the additional package dirs in SUBDIRS (which +# would be nice because there are then problems with make dist +# + +all: + @list='@subdirs@'; \ + target=`echo $@`; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done + +install: + @list='@subdirs@'; \ + target=`echo $@`; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done + +clean: + @list='@subdirs@'; \ + target=`echo $@`; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done + +distclean: + @list='@subdirs@'; \ + target=`echo $@`; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done + +# +# distclean the associated packages and include them in the dist +# + +dist-hook: + tar cf - simgear/metar | (cd $(distdir); tar xvf -) + @list='@subdirs@'; \ + target=distclean; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) echo "distclean error ignored...";; *k*) fail=yes;; *) echo "distclean error ignored...";; esac; \ + done + tar cf - simgear/metakit | (cd $(distdir); tar xvf -) + + # # Rule to build RPM distribution package # @@ -9,6 +97,3 @@ rpm: dist cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/packages/SOURCES rpm -ba @PACKAGE@.spec -dist-hook: - tar cf - simgear/metar | (cd $(distdir); tar xvf -) - diff --git a/acconfig.h b/acconfig.h index 6a80f899..e2caadfc 100644 --- a/acconfig.h +++ b/acconfig.h @@ -182,7 +182,7 @@ #undef HAVE_WAIT3 /* Define if you have gdbm installed system wide. */ -#undef HAVE_GDBM +/* #undef HAVE_GDBM */ /* Define if you have zlib installed system wide. */ #undef HAVE_ZLIB diff --git a/configure.in b/configure.in index 2df2e508..63f95597 100644 --- a/configure.in +++ b/configure.in @@ -24,11 +24,6 @@ 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 AC_ARG_WITH(logging, [ --with-logging Include logging output (default)]) @@ -200,14 +195,26 @@ 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." +# 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_GDBM, test "x$ac_cv_header_gdbm_h" = "xyes" ) +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) @@ -245,7 +252,6 @@ AC_OUTPUT( \ simgear/version.h \ simgear/bucket/Makefile \ simgear/debug/Makefile \ - simgear/gdbm/Makefile \ simgear/magvar/Makefile \ simgear/math/Makefile \ simgear/misc/Makefile \ @@ -256,9 +262,9 @@ AC_OUTPUT( \ ) AC_OUTPUT_COMMANDS([ - if test "x$ac_cv_header_windows_h" = "xyes" ; then - cp simgear/gdbm/autoconf.h.cygwin32 simgear/gdbm/autoconf.h - fi +# if test "x$ac_cv_header_windows_h" = "xyes" ; then +# cp simgear/gdbm/autoconf.h.cygwin32 simgear/gdbm/autoconf.h +# fi ]) echo "" @@ -279,8 +285,12 @@ else echo "Electric fence: no" fi -if test "x$ac_cv_header_gdbm_h" != "xyes"; then - echo "Building gdbm" +# 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 diff --git a/simgear/Makefile.am b/simgear/Makefile.am index 1f8e677d..2dd993de 100644 --- a/simgear/Makefile.am +++ b/simgear/Makefile.am @@ -4,11 +4,11 @@ else SERIAL_DIRS = endif -if HAVE_GDBM -GDBM_DIRS = -else -GDBM_DIRS = gdbm -endif +# if HAVE_GDBM +# GDBM_DIRS = +# else +# GDBM_DIRS = gdbm +# endif if HAVE_ZLIB ZLIB_DIRS = @@ -26,7 +26,6 @@ include_HEADERS = compiler.h constants.h fg_traits.hxx fg_zlib.h version.h SUBDIRS = \ bucket \ debug \ - $(GDBM_DIRS) \ magvar \ math \ $(METAR_DIRS) \ diff --git a/simgear/config.h.in b/simgear/config.h.in index 7a8476c9..410fd7a8 100644 --- a/simgear/config.h.in +++ b/simgear/config.h.in @@ -47,9 +47,6 @@ /* Define if you have the vprintf function. */ #undef HAVE_VPRINTF -/* Define if you have gdbm installed system wide. */ -#undef HAVE_GDBM - /* Define if you have zlib installed system wide. */ #undef HAVE_ZLIB