Patch from Cameron Moore:

[simgear.git] / simgear / misc / Makefile.am

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 0014ec1631168b8aaf50bf5d5c285b3e6162c771..865678b38eb05d9dbbb57bfbe976ed0670934dda 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,17 +1,12 @@
 includedir = @includedir@/misc
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgmisc.a
 
 include_HEADERS = \
         commands.hxx \
-        exception.hxx
+        exception.hxx \
        props.hxx \
+  props_io.hxx \
        sg_path.hxx \
        sgstream.hxx \
        stopwatch.hxx \
@@ -35,4 +30,8 @@ noinst_PROGRAMS = props_test
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
+if OLD_AUTOMAKE
+INCLUDES += -I$(top_srcdir)
+else
+INCLUDES = -I$(top_srcdir)
+endif