Patch from Melchior Franz:

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 6cddb53032e2ab27ae2294360380dabe6cca4520..b8c05870601da0372a8f90adf7e3ff566de06236 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -4,18 +4,6 @@ else
 SERIAL_DIRS =
 endif
 
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
-endif
-
 if HAVE_THREADS
 SGTHREAD_DIR = threads
 else
@@ -25,13 +13,12 @@ endif
 # METAR_DIRS =
 METAR_DIRS = metar
 
-EXTRA_DIST = version.h.in
+EXTRA_DIST = simgear_config.h.vc5 version.h.in
 
 include_HEADERS = \
        compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
 
 SUBDIRS = \
-       $(ZLIB_DIRS) \
        xml \
        debug \
        misc \