Changeset 1756

Timestamp:

Jan 27, 2009, 11:35:10 PM (14 years ago)

Author:

Peter

Message:

improved YAT_*_ADD_FLAG - if contains several words, loop over the words and try each one of them rather than try whole sentance in one shot, which implies subset of words might get accepted

Location:

trunk

Files:

• build_support/yat_add_flag.m4 (modified) (6 diffs)
• configure.ac (modified) (2 diffs)

trunk/build_support/yat_add_flag.m4

@@ -21 +21 @@
 # COPYLEFT
 #
-#   Copyright (C) 2008 Peter Johansson
+#   Copyright (C) 2008, 2009 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -40 +40 @@
 
 #
-# serial 0  
+# serial 1  
 #
 # see http://www.gnu.org/software/automake/manual/automake.html#Serials
@@ -47 +47 @@
 [
   AC_REQUIRE([AX_CXXCPP_CHECK_FLAG])
-  YAT_FIND_STR([$1], [$2], , [AX_CXXCPP_CHECK_FLAG([$2], ,, [$1="$$1 $2"])])
+  for i in $2; do
+    YAT_FIND_STR([$1], [$i], , [AX_CXXCPP_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  done
 ]) # YAT_CPP_ADD_FLAG
 
@@ -54 +56 @@
 [
   AC_REQUIRE([AX_CXX_CHECK_FLAG])
-  YAT_FIND_STR([$1], [$2], , [AX_CXX_CHECK_FLAG([$2], ,, [$1="$$1 $2"])])
+  for i in $2; do
+    YAT_FIND_STR([$1], [$i], , [AX_CXX_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  done
 ]) # YAT_CXX_ADD_FLAG
 
@@ -60 +64 @@
 [
   AC_REQUIRE([AX_LD_CHECK_FLAG])
-  YAT_FIND_STR([$1], [$2], , [AX_LD_CHECK_FLAG([$2], ,, [$1="$$1 $2"])])
+  for i in $2; do
+    YAT_FIND_STR([$1], [$i], , [AX_LD_CHECK_FLAG([$i], ,, [$1="$$1 $i"])])
+  done
 ]) # YAT_LD_ADD_FLAG
 
@@ -68 +74 @@
   found=no;       
   for a in $$1; do 
-    if test "x$a" = "x$2"; then
-      found=yes;
-    fi
+    AS_IF([test "x$a" = "x$2"],[found=yes])
   done
 
   # ACTION
-  if test "$found" = "yes" ; then
-    m4_default([$3], [:])
-  else
-    m4_default([$4], [:])
-  fi  
+  AS_IF([test "$found" = "yes"], [m4_default([$3], [:])],
+        [m4_default([$4], [:])])
 
 ]) # YAT_FIND_STR

trunk/configure.ac

@@ -191 +191 @@
 # i.e., they are not needed for a user of yat and are not propagated
 # to yat-config or yat.m4.
-YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-Wall])
-YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-pedantic])
+YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-Wall -pedantic])
 YAT_CPP_ADD_FLAG([CPPFLAGS], [-DHAVE_INLINE=1])
 AC_ARG_ENABLE([debug],
@@ -198 +197 @@
 if test "${enable_debug}" = "yes" ; then
   YAT_CPP_ADD_FLAG([AM_CPPFLAGS], [-DYAT_DEBUG=1])
-  YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-g])
-  YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-O])
+  YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-g -O])
 else
-  YAT_CPP_ADD_FLAG([CPPFLAGS], [-DGSL_RANGE_CHECK_OFF])
-  YAT_CPP_ADD_FLAG([AM_CPPFLAGS], [-DNDEBUG])
+  YAT_CPP_ADD_FLAG([CPPFLAGS], [-DGSL_RANGE_CHECK_OFF -DNDEBUG])
   YAT_CXX_ADD_FLAG([AM_CXXFLAGS], [-O3])
 fi