From d5785152f8f82dbcde0824f42637cb5766377ebf Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 24 Oct 2010 21:28:37 +0200
Subject: [PATCH] more HAVE_CONFIG_H patches

---
 packages/PLStream/Makefile.in       | 3 ++-
 packages/clib/Makefile.in           | 3 ++-
 packages/cplint/Makefile.in         | 1 +
 packages/http/Makefile.in           | 3 ++-
 packages/semweb/Makefile.in         | 3 ++-
 packages/sgml/Makefile.in           | 3 ++-
 packages/swi-minisat2/C/Makefile.in | 3 ++-
 packages/tai/Makefile.in            | 3 ++-
 packages/tai/libtai/Makefile.in     | 3 ++-
 packages/zlib/Makefile.in           | 3 ++-
 10 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/PLStream/Makefile.in b/packages/PLStream/Makefile.in
index 09f86c1a8..110a96dfb 100755
--- a/packages/PLStream/Makefile.in
+++ b/packages/PLStream/Makefile.in
@@ -19,8 +19,9 @@ LIBDIR=@libdir@
 YAPLIBDIR=@libdir@/Yap
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/clib/Makefile.in b/packages/clib/Makefile.in
index 54392ffd6..a6729d19e 100755
--- a/packages/clib/Makefile.in
+++ b/packages/clib/Makefile.in
@@ -30,8 +30,9 @@ PL=@INSTALL_ENV@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
 LN_S=@LN_S@
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -I. -I$(srcdir)/maildrop/rfc2045 -I$(srcdir)/maildrop/rfc822  @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I. -I$(srcdir)/maildrop/rfc2045 -I$(srcdir)/maildrop/rfc822  @CPPFLAGS@
 MKINDEX=true
 NETLIBS=@CLIB_NETLIBS@
 CRYPTLIBS=@CLIB_CRYPTLIBS@
diff --git a/packages/cplint/Makefile.in b/packages/cplint/Makefile.in
index 5c8687961..d55e3ffc3 100644
--- a/packages/cplint/Makefile.in
+++ b/packages/cplint/Makefile.in
@@ -21,6 +21,7 @@ YAPLIBDIR=${exec_prefix}/lib/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
 CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../include  @CPPFLAGS@
 #
diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in
index 665550803..8609697af 100755
--- a/packages/http/Makefile.in
+++ b/packages/http/Makefile.in
@@ -27,8 +27,9 @@ EXDIR=$(YAPLIBDIR)/examples/http
 LN_S=@LN_S@
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
 MKINDEX=true
 
 
diff --git a/packages/semweb/Makefile.in b/packages/semweb/Makefile.in
index ce6e49a36..49d7617c6 100755
--- a/packages/semweb/Makefile.in
+++ b/packages/semweb/Makefile.in
@@ -36,8 +36,9 @@ EXDIR=$(YAPLIBDIR)/examples/http
 LN_S=@LN_S@
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
 MKINDEX=true
 
 
diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in
index b1341fc90..3eb6c81b1 100755
--- a/packages/sgml/Makefile.in
+++ b/packages/sgml/Makefile.in
@@ -28,8 +28,9 @@ EXDIR=$(CHRDIR)/examples/chr
 LN_S=@LN_S@
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
 MKINDEX=true
 
 LD=$(CC)
diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in
index 482c71c37..0ccf74b4a 100755
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@@ -19,9 +19,10 @@ LIBDIR=@libdir@
 YAPLIBDIR=@libdir@/Yap
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
+CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/tai/Makefile.in b/packages/tai/Makefile.in
index 887bfd983..0801fa6d9 100755
--- a/packages/tai/Makefile.in
+++ b/packages/tai/Makefile.in
@@ -18,8 +18,9 @@ LIBDIR=@libdir@
 YAPLIBDIR=@libdir@/Yap
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/tai/libtai/Makefile.in b/packages/tai/libtai/Makefile.in
index deeb9f7c7..4f7514ed3 100644
--- a/packages/tai/libtai/Makefile.in
+++ b/packages/tai/libtai/Makefile.in
@@ -25,7 +25,8 @@ AR=@AR@
 RANLIB=@RANLIB@
 ifeq (@PROLOG_SYSTEM@,yap)
 
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@  @JAVAINCPATH@
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../../.. -I$(srcdir)/../../include @CPPFLAGS@  @JAVAINCPATH@
 
 else
 
diff --git a/packages/zlib/Makefile.in b/packages/zlib/Makefile.in
index 0db9c6132..9793bcf22 100644
--- a/packages/zlib/Makefile.in
+++ b/packages/zlib/Makefile.in
@@ -33,8 +33,9 @@ EXDIR=$(YAPLIBDIR)/examples/http
 LN_S=@LN_S@
 #
 #
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 CC=@CC@
-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
 MKINDEX=true
 LIBS=@ZLIBS@