[PATCH] get rid of $(includeopt)

[ NB: do not forget about the

--- ccvs/acinclude.m4~gssapi-client	Thu Apr 24 02:34:58 2003
+++ ccvs-alexm/acinclude.m4	Thu Apr 24 02:34:58 2003
@@ -85,7 +85,7 @@ AC_MSG_RESULT([$acx_gssapi_cv_gssapi])
 # Set up GSSAPI includes for later use.  We don't bother to check for
 # $acx_gssapi_cv_gssapi=no here since that will be caught later.
 #
-if test x$acx_gssapi_cv_gssapi = yes; then
+if test x$acx_gssapi_cv_gssapi = xyes; then
   # no special includes necessary
   GSSAPI_INCLUDES=""
 else


also.  (and the whole gssapi-client.patch, while we're at it.)]


2003-04-24  Alexey Mahotkin <[email protected]>

Get rid of $(includeopt), using CPPFLAGS as intended;

use AM_CPPFLAGS in src/Makefile.am instead of the (deprecated) INCLUDES;

the theoretical "namespace hackery" (if any) should still work,
because Automake puts AM_CPPFLAGS before CPPFLAGS in the compilation
line, and I guess it will stay that way (that should be the intent
AFAICT).

This also fixes the "ocnflicts" typo :)



 acinclude.m4    |    2 +-
 configure.in    |    4 +---
 src/Makefile.am |    8 +-------
 3 files changed, 3 insertions(+), 11 deletions(-)

--- ccvs/configure.in~includeopt	Thu Apr 24 23:49:35 2003
+++ ccvs-alexm/configure.in	Thu Apr 24 23:50:15 2003
@@ -365,8 +365,6 @@ if test -z "$krb_h"; then
 fi
 AC_MSG_RESULT($krb_h)
 
-includeopt=
-AC_SUBST(includeopt)
 if test -n "$krb_h"; then
   krb_lib=
   if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
@@ -395,7 +393,7 @@ if test -n "$krb_h"; then
     AC_CHECK_LIB(krb,krb_recvauth)
     LDFLAGS=$hold_ldflags
     if test -n "$krb_incdir"; then
-      includeopt="${includeopt} -I$krb_incdir"
+      CPPFLAGS="$CPPFLAGS -I$krb_incdir"
     fi
   fi
 fi
--- ccvs/src/Makefile.am~includeopt	Thu Apr 24 23:49:39 2003
+++ ccvs-alexm/src/Makefile.am	Thu Apr 24 23:50:28 2003
@@ -16,13 +16,7 @@
 
 SHELL = /bin/sh
 
-# $(includeopt) is CVS specific and set by configure
-# FIXME - This includes line is dependant on its order.  This means there is
-# some namespace hackery going on that maybe shouldn't be.  Long term fix is to
-# try and remove naming ocnflicts and fix Automake to allow particular includes
-# to be attached only to particular object files.  Short term fix is either or.
-##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib
 
 bin_PROGRAMS = cvs
 bin_SCRIPTS = cvsbug
--- ccvs/acinclude.m4~includeopt	Thu Apr 24 23:49:55 2003
+++ ccvs-alexm/acinclude.m4	Thu Apr 24 23:50:46 2003
@@ -100,7 +100,7 @@ if test x$acx_gssapi_cv_gssapi != xno; t
   # define HAVE_GSSAPI and set up the includes
   AC_DEFINE([HAVE_GSSAPI], ,
 [Define if you have GSSAPI with Kerberos version 5 available.])
-  includeopt=$includeopt$GSSAPI_INCLUDES
+  CPPFLAGS="$CPPFLAGS $GSSAPI_INCLUDES"
 
   # locate any other headers
   acx_gssapi_save_CPPFLAGS=$CPPFLAGS

_


--alexm