Now put "-I.." compiler option in front of all others to ensure

that local CUPS headers are used before installed headers (STR
#437)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4027 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 0e1faf3db9fdd0f4569ccf38170837ab168c7df0..72a7be97efc243749493b6bc218dd03d859533ed 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
-CHANGES.txt - 04/10/2003
+CHANGES.txt - 11/29/2003
 ------------------------
 
 CHANGES IN CUPS V1.2.0b1
 
+       - Now put "-I.." compiler option in front of all others
+         to ensure that local CUPS headers are used before
+         installed headers (STR #437)
        - New cupsLangPrintf() and cupsLangPuts() for localized
          interfaces.
        - Now support custom attributes and extended options in

diff --git a/Makedefs.in b/Makedefs.in
index d530cd9504d417fe29ab842bdcb40ad572d91e85..c234217ecbfc98619efa05c831541312325cfbdf 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.36.2.19 2003/09/17 19:36:06 mike Exp $"
+# "$Id: Makedefs.in,v 1.36.2.20 2003/11/30 00:16:06 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -85,9 +85,9 @@ LIBZ          =       @LIBZ@
 
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
-CFLAGS         =       $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ -I.. $(OPTIONS)
+CFLAGS         =       -I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ $(OPTIONS)
 COMMONLIBS     =       @COMMONLIBS@
-CXXFLAGS       =       $(RC_CFLAGS) @CPPFLAGS@ @CXXFLAGS@ -I.. $(OPTIONS)
+CXXFLAGS       =       -I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ $(OPTIONS)
 CXXLIBS                =       @CXXLIBS@
 DSOFLAGS       =       @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
@@ -184,5 +184,5 @@ MAN8DIR             =       @MAN8DIR@
 
 
 #
-# End of "$Id: Makedefs.in,v 1.36.2.19 2003/09/17 19:36:06 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.36.2.20 2003/11/30 00:16:06 mike Exp $"
 #