Updates.

diff --git a/Makefile.am b/Makefile.am
index e4842026e73788a0bb9cc44168c99040dc4909bb..a7590db72611acac1f015a2db5ec1712ff5193cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = mksymlinks.sh
+EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h
 
 dist-hook:
        tar cf - src/metar | (cd $(distdir); tar xvf -)

diff --git a/acconfig.h b/acconfig.h
index 4e22afc2d78e52f1dc4807421556d768272630aa..a5fe5539a070fe876e4e223a43c03a7d82bb6920 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -181,6 +181,9 @@
 /* Define if you have the wait3 system call.  */
 #undef HAVE_WAIT3
 
+/* Define if you have zlib installed system wide.  */
+#undef HAVE_ZLIB
+
 /* Define as __inline if that's what the C compiler calls it.  */
 #undef inline
 

diff --git a/configure.in b/configure.in
index 7061ba353fdff5d2a118b650a30ed5dba34697e0..2c2e266cf1c7a42a438fffa38e2a7ec779add40e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl $Id$
 AC_INIT(src/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.2)
+AM_INIT_AUTOMAKE(SimGear, 0.0.3)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -198,7 +198,9 @@ fi
 
 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" )

diff --git a/mksymlinks.sh b/mksymlinks.sh
index e654cf19c61142d6227cb06b98a93f9d89a76b42..8b8cc960b6734ddf9d5776bee64bdd7eb915c98e 100755 (executable)
--- a/mksymlinks.sh
+++ b/mksymlinks.sh
@@ -37,3 +37,6 @@ ln -s ../../misc/fgstream.hxx src/simgear/misc/fgstream.hxx
 ln -s ../../misc/zfstream.hxx src/simgear/misc/zfstream.hxx
 
 ln -s ../../xgl/xgl.h src/simgear/xgl/xgl.h
+
+ln -s ../../zlib/zlib.h src/simgear/zlib/zlib.h
+ln -s ../../zlib/zconf.h src/simgear/zlib/zconf.h

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 5bac7d07f346cecdf0aa6c3131a20fd42dbc8298..4faaf013af67053142454de12775ae782ba51e90 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,5 +1,11 @@
 includedir = @includedir@/math
 
+if HAVE_ZLIB
+ZLIB_INCL =
+else
+ZLIB_INCL = -I$(top_builddir)/src/zlib
+endif
+
 lib_LIBRARIES = libsgmath.a
 
 include_HEADERS = \
@@ -29,4 +35,4 @@ libsgmath_a_SOURCES = \
        polar3d.cxx \
        vector.cxx
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 26112ff700f9bc21b1227aec579c616c026859f1..44d4a79637ff454da0577de17af67b3d24cd9d30 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -3,7 +3,7 @@ includedir = @includedir@/misc
 if HAVE_ZLIB
 ZLIB_INCL =
 else
-ZLIB_INCL = -I$(top_builddir)/zlib
+ZLIB_INCL = -I$(top_builddir)/src/zlib
 endif
 
 lib_LIBRARIES = libsgmisc.a
@@ -23,4 +23,4 @@ libsgmisc_a_SOURCES = \
        texcoord.cxx \
        zfstream.cxx
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index 41b3d04dbc4eb48c8117b1d3ea267a52408568d1..b093499f1597f186cca70c153be248a98758736c 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -26,7 +26,11 @@
 
 #include <simgear/compiler.h>
 
-#include <zlib.h>
+#ifdef HAVE_ZLIB
+#  include <zlib.h>
+#else
+#  include <simgear/zlib/zlib.h>
+#endif
 
 #ifdef FG_HAVE_STD_INCLUDES