Removed metakit and zlib from the configure/build process. The

developer will need to build and install these separately if they don't
have packages already installed by their system.  See README.metakit and
README.zlib for more details.

As a convenience, pristine tarballs of the metakit and zlib source code
trees are included with the simgear distribution (and cvs.)

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index b0581e423c4ff99a28f2e735100936dc76de3cbe..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
@@ -31,7 +19,6 @@ include_HEADERS = \
        compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
 
 SUBDIRS = \
-       $(ZLIB_DIRS) \
        xml \
        debug \
        misc \

diff --git a/simgear/io/lowlevel.hxx b/simgear/io/lowlevel.hxx
index b866df2e9d54cfdee58960aaedba75442a06c21d..3595991d87e5b7e5cbadcf444760a496bd5d3d83 100644 (file)
--- a/simgear/io/lowlevel.hxx
+++ b/simgear/io/lowlevel.hxx
@@ -29,12 +29,7 @@
 
 
 #include <stdio.h>
-
-#ifdef HAVE_ZLIB
-#  include <zlib.h>
-#else
-#  include <simgear/zlib/zlib.h>
-#endif
+#include <zlib.h>
 
 #include <plib/sg.h>
 

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 794664d84133886508944d1d1dc6bb9eedac580e..cb939c9f630c3f3d44b9b5560e3b185e3b3d6a1c 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,11 +1,5 @@
 includedir = @includedir@/math
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgmath.a
 
 include_HEADERS = \
@@ -31,7 +25,7 @@ libsgmath_a_SOURCES = \
        vector.cxx
 
 if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir)
 else
-INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)
 endif

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 1be8887076397e5f14001a9b5976e8b2103e4863..3c846bf94f5c62ebf4956c4c9df1463bbb226ee7 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,11 +1,5 @@
 includedir = @includedir@/misc
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgmisc.a
 
 include_HEADERS = \
@@ -36,7 +30,7 @@ props_test_SOURCES = props_test.cxx
 props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 
 if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir)
 else
-INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)
 endif

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index 1dd3669e1b1853af6dcfccd72163689b0b975d9a..bf9f1733c830c22d1bf623e89401a4975e99a146 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -30,11 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_ZLIB
-#  include <zlib.h>
-#else
-#  include <simgear/zlib/zlib.h>
-#endif
+#include <zlib.h>
 
 // At least Irix needs this
 #ifdef SG_HAVE_NATIVE_SGI_COMPILERS

diff --git a/simgear/sg_zlib.h b/simgear/sg_zlib.h
index c8b41e06d9915079bec51e46bf5a0f5a8e6a74ee..3119167b23b9e2cafb7a2ae9ea3ef221f3479a5d 100644 (file)
--- a/simgear/sg_zlib.h
+++ b/simgear/sg_zlib.h
@@ -61,11 +61,7 @@
   #define sgclose(F)  (fclose((F)))
 #else
 
-#ifdef HAVE_ZLIB
   #include <zlib.h>
-#else
-  #include <simgear/zlib/zlib.h>
-#endif
 
   #define sgFile gzFile
 

diff --git a/simgear/simgear_config.h.in b/simgear/simgear_config.h.in
index 61b86781aea48fd5f9085365d59d6be72bb3de84..f63fe4b27b8b36e76a871a9d065a5441f3c6da3c 100644 (file)
--- a/simgear/simgear_config.h.in
+++ b/simgear/simgear_config.h.in
@@ -50,9 +50,6 @@
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
-/* Define if you have zlib installed system wide.  */
-#undef HAVE_ZLIB
-
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 

diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am
index bc01b91ba97582589d29415738f634589b534121..33c96bc210aa1056f2ef5b2ce81c13b50649de44 100644 (file)
--- a/simgear/xml/Makefile.am
+++ b/simgear/xml/Makefile.am
@@ -1,11 +1,5 @@
 includedir = @includedir@/xml
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgxml.a
 
 include_HEADERS = \
@@ -25,7 +19,7 @@ libsgxml_a_SOURCES = \
        xmltok_impl.h
 
 if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir)
 else
-INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)
 endif