Changeset 1042 for trunk/m4/yat_add_flag.m4

Timestamp:

Mar 23, 2010, 1:09:34 AM (13 years ago)

Author:

Peter Johansson

Message:

updating to yat 0.6.1

File:

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

trunk/m4/yat_add_flag.m4

@@ -1 @@
-## $Id: yat_add_flag.m4 1780 2009-02-06 18:13:22Z peter $
+## $Id: yat_add_flag.m4 2107 2009-11-07 15:53:27Z peter $
 
 # SYNOPSIS
@@ -17 +17 @@
 # LAST MODIFICATION
 #
-#   $Date: 2009-02-06 13:13:22 -0500 (Fri, 06 Feb 2009) $
+#   $Date: 2009-11-07 10:53:27 -0500 (Sat, 07 Nov 2009) $
 #
 # COPYLEFT
@@ -40 +40 @@
 
 #
-# serial 2  
+# serial 5  
 #
 # see http://www.gnu.org/software/automake/manual/automake.html#Serials
@@ -46 +46 @@
 AC_DEFUN([YAT_CPP_ADD_FLAG],
 [
-  for i in $2; do
-    YAT_FIND_STR([$1], [$i], , [AX_CXXCPP_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  AC_PREREQ([2.63]) dnl we use AS_VAR_IF
+  AC_REQUIRE([AC_PROG_SED])
+  for yat_flag in $2; do
+    # ignore flag if
+    # 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 in $1, $CPPFLAGS, or AC_DEFINE
+    ignore=no
+    AS_CASE([$yat_flag],
+            [-I/usr/include], [ignore=yes],
+            [-I/usr/local/include],[AS_IF([test "x$CXX" = "xg++"],[ignore=yes])],
+            [-D*], [yat_def=`AS_ECHO([$yat_flag]) | $SED 's,^-D,,;s,=.*,,'`;
+                    yat_save_CPPFLAGS="$CPPFLAGS"
+                    m4_if([$1], [CPPFLAGS], [], [CPPFLAGS="$$1 $CPPFLAGS"])
+                    AC_CHECK_DECL([$yat_def],[ignore=yes])
+                    CPPFLAGS="$yat_save_CPPFLAGS"])
+
+    AS_VAR_IF([ignore], [no],
+          [YAT_FIND_STR([$1], [$yat_flag], , 
+                        [AX_CXXCPP_CHECK_FLAG([$yat_flag], ,, 
+                                              [$1="$$1 $yat_flag"])])])
   done
 ]) # YAT_CPP_ADD_FLAG
@@ -54 +73 @@
 AC_DEFUN([YAT_CXX_ADD_FLAG],
 [
-  for i in $2; do
-    YAT_FIND_STR([$1], [$i], , [AX_CXX_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  AC_PREREQ([2.61]) dnl we use AX_CXX_CHECK_FLAG 
+  for yat_flag in $2; do
+    YAT_FIND_STR([$1], [$yat_flag], , 
+                 [AX_CXX_CHECK_FLAG([$yat_flag], ,, [$1="$$1 $yat_flag"])])
   done
 ]) # YAT_CXX_ADD_FLAG
@@ -61 +82 @@
 AC_DEFUN([YAT_LD_ADD_FLAG],
 [
-  for i in $2; do
-    YAT_FIND_STR([$1], [$i], , [AX_LD_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  AC_PREREQ([2.61]) dnl we use AX_LD_CHECK_FLAG 
+  for yat_flag in $2; do
+    # ignore flag if
+    # 1) it is -L/usr/lib
+    # 2) it is -L/usr/local/lib and CXX is g++
+    AS_IF([test "x$yat_flag" = "x-L/usr/lib"],,
+          [test "x$CXX" = "xg++" && test "x$yat_flag" = "x-L/usr/local/lib"],,
+          [YAT_FIND_STR([$1], [$yat_flag], , 
+                        [AX_LD_CHECK_FLAG([$yat_flag], ,, 
+                                          [$1="$$1 $yat_flag"])])])
   done
 ]) # YAT_LD_ADD_FLAG