Changeset 2087

Timestamp:

Oct 20, 2009, 11:22:29 PM (13 years ago)

Author:

Peter

Message:

modified YAT_CPP_ADD_FLAG so flags are ignored also if flag is defined in or AC_DEFINE

File:

• trunk/m4/yat_add_flag.m4 (modified) (2 diffs)

trunk/m4/yat_add_flag.m4

@@ -51 +51 @@
     # 1) it is -I/usr/include
     # 2) it is -I/usr/local/include and CXX is g++
-    # 3) it is -D* and * is already defined
+    # 3) it is -D* and * is already defined in $1, $CPPFLAGS, or AC_DEFINE
     ignore=no
     AS_CASE([$yat_flag],
@@ -57 +57 @@
             [-I/usr/local/include],[AS_IF([test "x$CXX" = "xg++"],[ignore=yes])],
             [-D*], [yat_def=`echo "$yat_flag" | $SED 's,^-D,,;s,=.*,,'`;
-                    AX_C_IFDEF([$yat_def],[ignore=yes])])
+                    yat_save_CPPFLAGS="$CPPFLAGS"
+                    m4_if([$1], [CPPFLAGS], [], [CPPFLAGS="$$1 $CPPFLAGS"])
+                    AX_C_IFDEF([$yat_def],[ignore=yes])
+                    CPPFLAGS="$yat_save_CPPFLAGS"])
 
     AS_IF([test x$ignore = xno],