added ENABLE_??? mechanism (see MPI) for the different Grid Managers

[[Imported from SVN: r4985]]

m4/alberta.m4

@@ -52,7 +52,7 @@ CPPFLAGS="$CPPFLAGS $ALBERTADIM -DEL_INDEX=0 -I$ALBERTA_INCLUDE_PATH"
 
 # check for header
 AC_CHECK_HEADER([alberta.h], 
-   [ALBERTA_CPPFLAGS="-I$ALBERTA_INCLUDE_PATH"
+   [ALBERTA_CPPFLAGS="-I$ALBERTA_INCLUDE_PATH -DENABLE_ALBERTA"
   HAVE_ALBERTA="1"],
   AC_MSG_WARN([alberta.h not found in $ALBERTA_INCLUDE_PATH]))
 
@@ -95,7 +95,9 @@ if test x$HAVE_ALBERTA = x1 ; then
   AC_SUBST(ALBERTA_LIBS, $ALBERTA_LIBS)
   AC_SUBST(ALBERTA_LDFLAGS, $ALBERTA_LDFLAGS)
   AC_SUBST(ALBERTA_CPPFLAGS, $ALBERTA_CPPFLAGS)
-  AC_DEFINE(HAVE_ALBERTA, 1, [Define to 1 if alberta-library is found])
+  AC_DEFINE(HAVE_ALBERTA, ENABLE_ALBERTA,
+    [This is only true if alberta-library was found by configure 
+     _and_ if the application uses the ALBERTA_CPPFLAGS])
 
   # add to global list
   DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $ALBERTA_LDFLAGS"

m4/alugrid.m4

@@ -59,7 +59,7 @@ if test x$with_alugrid != x && test x$with_alugrid != xno ; then
   REM_CPPFLAGS=$CPPFLAGS
 
   LDFLAGS="$LDFLAGS -L$ALUGRID_LIB_PATH"
-  ALU3D_INC_FLAG="-I$ALUGRID_INCLUDE_PATH -I$ALUGRID_INCLUDE_PATH/serial -I$ALUGRID_INCLUDE_PATH/duneinterface"
+  ALU3D_INC_FLAG="-I$ALUGRID_INCLUDE_PATH -I$ALUGRID_INCLUDE_PATH/serial -I$ALUGRID_INCLUDE_PATH/duneinterface -DENABLE_ALUGRID"
   CPPFLAGS="$CPPFLAGS $ALU3D_INC_FLAG"
 
   # check for header
@@ -103,7 +103,9 @@ if test x$HAVE_ALUGRID = x1 ; then
   AC_SUBST(ALUGRID_LIBS, $ALUGRID_LIBS)
   AC_SUBST(ALUGRID_LDFLAGS, $ALUGRID_LDFLAGS)
   AC_SUBST(ALUGRID_CPPFLAGS, $ALUGRID_CPPFLAGS)
-  AC_DEFINE(HAVE_ALUGRID, 1, [Define to 1 if alugrid-library is found])
+  AC_DEFINE(HAVE_ALUGRID, ENABLE_ALUGRID,
+    [This is only true if alugrid-library was found by configure 
+     _and_ if the application uses the ALUGRID_CPPFLAGS])
 
   # add to global list
   DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $ALUGRID_LDFLAGS"

m4/ug.m4

@@ -40,7 +40,7 @@ AC_DEFUN([DUNE_PATH_UG],[
 
       # set variables so that tests can use them
       LDFLAGS="$LDFLAGS -L$UG_LIB_PATH"
-      CPPFLAGS="$CPPFLAGS -I$UG_INCLUDE_PATH"
+      CPPFLAGS="$CPPFLAGS -I$UG_INCLUDE_PATH -DENABLE_UG"
 
       AC_ARG_ENABLE(ug-lgmdomain,
         AC_HELP_STRING([--enable-ug-lgmdomain],[use UG LGM domain (default is standard domain)]))
@@ -56,7 +56,7 @@ AC_DEFUN([DUNE_PATH_UG],[
 
       # check for central header
       AC_CHECK_HEADER([$UG_INCLUDE_PATH/gm.h],
-      [UG_CPPFLAGS="-I$UG_INCLUDE_PATH"
+      [UG_CPPFLAGS="-I$UG_INCLUDE_PATH -DENABLE_UG"
           HAVE_UG="1"],
       [HAVE_UG="0"
       AC_MSG_WARN([gm.h not found in $UG_INCLUDE_PATH])]
@@ -159,7 +159,9 @@ AC_DEFUN([DUNE_PATH_UG],[
       AC_SUBST(UG_LDFLAGS, $UG_LDFLAGS)
       AC_SUBST(UG_LIBS, $UG_LIBS)
       AC_SUBST(UG_CPPFLAGS, $UG_CPPFLAGS)
-      AC_DEFINE(HAVE_UG, 1, [Define to 1 if UG is found])
+      AC_DEFINE(HAVE_UG, ENABLE_UG, 
+        [This is only true if UG was found by configure 
+         _and_ if the application uses the UG_CPPFLAGS])
       if test x"$enable_ug_lgmdomain" = xyes ; then
         AC_DEFINE(UG_LGMDOMAIN, 1, [use UG LGM domain])
       fi