Fixed a bug in how zlib.h was included.

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

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index f68fb5d39ba542905578a875bc4435c479efdc64..0e7082d08ad585beb7ee82445b13c90883aabff3 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <zlib.h>
 
 #include <vector>
 #include STL_STRING