Try and hook CPPFLAGS

[shibboleth/sp.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e4df9cf..e7b8702 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,11 @@ AC_ARG_ENABLE(debug,
     enable_debug=$enableval, enable_debug=no)
 
 if test "$enable_debug" = "yes" ; then
+    GCC_CPPFLAGS="$CPPFLAGS -D_DEBUG"
     GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
     GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
 else
+    GCC_CPPFLAGS="$CPPFLAGS -DNDEBUG"
     GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
     GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
@@ -23,6 +25,7 @@ AC_PROG_CC([gcc gcc3 cc])
 AC_PROG_CXX([g++ g++3 c++ CC])
 
 if test "$GCC" = "yes" ; then
+    CPPFLAGS="$GCC_CPPFLAGS"
     CFLAGS="$GCC_CFLAGS"
     CXXFLAGS="$GCC_CXXFLAGS"
 fi
@@ -269,6 +272,7 @@ if test "$WANT_NSAPI" != "no"; then
     NSAPI_INCLUDE=$WANT_NSAPI/include
     AC_MSG_RESULT(Netscape-Enterprise 3.x style)
     AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+    NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
   fi
   if test -d $WANT_NSAPI/plugins/include ; then
     test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE"