From ea9855ca71b5bf1648071b41baf9ff695bba7bae Mon Sep 17 00:00:00 2001
From: Stefan Holst <holstsn@users.sourceforge.net>
Date: Wed, 27 Jul 2005 22:45:56 +0000
Subject: commiting part of my old build fixes: automake doesn't expand
 \!HAVE_ZLIB here, using safer syntax, should work on all platforms

CVS patchset: 7690
CVS date: 2005/07/27 22:45:56
---
 src/input/Makefile.am          | 3 ++-
 src/xine-engine/Makefile.am    | 3 ++-
 win32/contrib/zlib/Makefile.am | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 662a75e6d..071381a67 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -44,7 +44,8 @@ link_dvdnav = libdvdnav/libdvdnav.la
 endif
 
 # not ported to native Windows
-if !WIN32
+if WIN32
+else
 in_rtp = xineplug_inp_rtp.la
 in_dvb = xineplug_inp_dvb.la 
 endif
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index af4e06dff..02eb6136a 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -11,7 +11,8 @@ INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
 DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
 INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
 DEF_FILE = libxine-$(XINE_MAJOR).def
-if !HAVE_ZLIB
+if HAVE_ZLIB
+else
 zlib_dep = $(INTERNAL_ZLIB_LIB)
 endif
 if WIN32
diff --git a/win32/contrib/zlib/Makefile.am b/win32/contrib/zlib/Makefile.am
index b29d35e52..282a9542d 100644
--- a/win32/contrib/zlib/Makefile.am
+++ b/win32/contrib/zlib/Makefile.am
@@ -4,7 +4,8 @@ EXTRA_DIST = inffixed.h ChangeLog FAQ INDEX README example.c maketree.c \
              minigzip.c zlib.3 algorithm.txt build.tar.gz nt/Makefile.emx \
              nt/Makefile.gcc nt/Makefile.nt nt/zlib.dnt
 
-if !HAVE_ZLIB
+if HAVE_ZLIB
+else
 link_zlib = libzlib.la
 endif
 
-- 
cgit v1.2.3