svn rev #21973: tools/gssmonger/trunk/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21973
Commit By: raeburn
Log Message:
Update CPPFLAGS, not CFLAGS, with -I and -D options.


Changed Files:
U   tools/gssmonger/trunk/configure.ac
Modified: tools/gssmonger/trunk/configure.ac
===================================================================
--- tools/gssmonger/trunk/configure.ac	2009-02-12 16:26:14 UTC (rev 21972)
+++ tools/gssmonger/trunk/configure.ac	2009-02-12 16:51:30 UTC (rev 21973)
@@ -16,7 +16,7 @@
 AC_ARG_WITH(com_err, [  --with-com_err=PREFIX	Specify location of com_err], [com_err="$withval"], [com_err=yes])
 if test "$com_err" != no; then
    if test "$com_err" != yes; then
-      CFLAGS="$CFLAGS -I$com_err/include"
+      CPPFLAGS="$CPPFLAGS -I$com_err/include"
       LDFLAGS="$LDFLAGS -L$com_err/lib"
    fi
    AC_CHECK_HEADERS([com_err.h],,AC_MSG_ERROR([com_err.h header not found]))
@@ -26,7 +26,7 @@
 fi
 
 # Default args required by both MIT Kerberos and Heimdal Kerberos
-CFLAGS="$CFLAGS -DUSE_GSSAPI=1 -DUSE_MITKRB5=1"
+CPPFLAGS="$CPPFLAGS -DUSE_GSSAPI=1 -DUSE_MITKRB5=1"
 
 # We need exactly one of MIT and Heimdal Kerberos,
 # and we care which one we're asked to use.
@@ -55,11 +55,11 @@
 
 if test "$mitkrb5" != no; then
    if test "$mitkrb5" != yes; then
-      CFLAGS="$CFLAGS -I$mitkrb5/include"
+      CPPFLAGS="$CPPFLAGS -I$mitkrb5/include"
       LDFLAGS="$LDFLAGS -L$mitkrb5/lib"
    fi
 
-   CFLAGS="$CFLAGS -DKRB5_DEPRECATED=1 -DVERSION_STRING=\\\"MIT-KRB5\\\""
+   CPPFLAGS="$CPPFLAGS -DKRB5_DEPRECATED=1 -DVERSION_STRING=\\\"MIT-KRB5\\\""
 
    AC_CHECK_HEADERS([krb5.h],,AC_MSG_ERROR([krb5.h header not found]))
    AC_CHECK_LIB([krb5], [main],,AC_MSG_ERROR([krb5 library not found]))
@@ -69,7 +69,7 @@
 
 if test "$heimdal" != no; then
    if test "$heimdal" != yes; then
-      CFLAGS="$CFLAGS -I$heimdal/include"
+      CPPFLAGS="$CPPFLAGS -I$heimdal/include"
       LDFLAGS="$LDFLAGS -L$heimdal/lib"
 
       KRB5CONFIG="$heimdal/bin/krb5-config"
@@ -83,7 +83,7 @@
       fi
    fi
 
-   CFLAGS="$CFLAGS -DHEIMDAL=1 -DUSE_GSSAPI_H=1 -DUSE_KRB5_MAKE_PRINCIPAL=1 -DNO_SETPASSWORD=1 `$KRB5CONFIG --cflags gssapi` -DVERSION_STRING=\"HEIMDAL\""
+   CPPFLAGS="$CPPFLAGS -DHEIMDAL=1 -DUSE_GSSAPI_H=1 -DUSE_KRB5_MAKE_PRINCIPAL=1 -DNO_SETPASSWORD=1 `$KRB5CONFIG --cflags gssapi` -DVERSION_STRING=\"HEIMDAL\""
    LDFLAGS="$LDFLAGS `$KRB5CONFIG --libs gssapi` -Wl,-rpath,$heimdal/lib"
 
    # Not much to check; we hope that krb5-config checked everything for us
@@ -93,7 +93,7 @@
 AC_ARG_WITH(log4cpp, [  --with-log4cpp=PREFIX	Specify location of log4cpp], [log4cpp="$withval"], [log4cpp=yes])
 if test "$log4cpp" != no; then
    if test "$log4cpp" != yes; then
-      CFLAGS="$CFLAGS -I$log4cpp/include"
+      CPPFLAGS="$CPPFLAGS -I$log4cpp/include"
       LDFLAGS="$LDFLAGS -L$log4cpp/lib"
    fi
    # Check fails for unknown reason
@@ -107,7 +107,7 @@
 AC_ARG_WITH(pthread, [  --with-pthread=PREFIX	Specify location of pthread], [pthread="$withval"], [pthread=yes])
 if test "$pthread" != no; then
    if test "$pthread" != yes; then
-      CFLAGS="$CFLAGS -I$pthread/include"
+      CPPFLAGS="$CPPFLAGS -I$pthread/include"
       LDFLAGS="$LDFLAGS -L$pthread/lib"
    fi
    AC_CHECK_HEADERS([pthread.h],,AC_MSG_ERROR([pthread.h header not found]))
@@ -124,10 +124,10 @@
 AC_ARG_WITH(glib, [  --with-glib=PREFIX	Specify location of glib-2.0], [glib="$withval"], [glib=yes])
 if test "$glib" != no; then
    if test "$glib" != yes; then
-      CFLAGS="$CFLAGS -I$glib/include -I$glib/include/$glibversion -I$glib/include/$glibversion/glib -I$glib/lib/$glibversion/include"
+      CPPFLAGS="$CPPFLAGS -I$glib/include -I$glib/include/$glibversion -I$glib/include/$glibversion/glib -I$glib/lib/$glibversion/include"
       LDFLAGS="$LDFLAGS -L$glib/lib"
    else
-      CFLAGS="$CFLAGS -I/usr/include -I/usr/include/$glibversion -I/usr/include/$glibversion/glib -I/usr/lib/$glibversion/include"
+      CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/include/$glibversion -I/usr/include/$glibversion/glib -I/usr/lib/$glibversion/include"
    fi
    AC_CHECK_HEADERS([glib.h],,AC_MSG_ERROR([glib.h header not found]))
    AC_CHECK_LIB([glib-2.0], [g_option_context_new],,AC_MSG_ERROR([glib-2.0 library not found]))
@@ -145,7 +145,7 @@
 if test "`uname`" == "Linux"; then
    # I know this breaks with the whole spirit of autoconf and all that;
    # but I don't know what is needed from these two libraries so I can't test for it.
-   CFLAGS="$CFLAGS -DUSE_STRING_H=1 -DUSE_TIME_H=1"
+   CPPFLAGS="$CPPFLAGS -DUSE_STRING_H=1 -DUSE_TIME_H=1"
 fi
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -163,7 +163,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([getpass isascii memset select socket strchr strpbrk strrchr strtoul])
 
-CPPFLAGS="$CFLAGS"
+CPPFLAGS="$CPPFLAGS"
 
 AC_CONFIG_FILES([gssmaster/Makefile gssmaggot/Makefile Makefile])
 AC_OUTPUT