Changeset 2497

Timestamp:

Jun 26, 2011, 7:33:29 PM (12 years ago)

Author:

Peter

Message:

Avoid using deprecated macros AX_{CXXCPP,CXX,LD}_CHECK_FLAG. Instead
use use new macro provided in ax_check_flag.m4 in autoconf macro archive.

Location:

trunk

Files:

• m4/ax_check_flag.m4 (added)
• m4/ax_cxx_check_flag.m4 (deleted)
• m4/ax_cxxcpp_check_flag.m4 (deleted)
• m4/ax_ld_check_flag.m4 (deleted)
• m4/yat_add_flag.m4 (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)

trunk/m4/yat_add_flag.m4

@@ -64 +64 @@
 
     AS_VAR_IF([ignore], [no],
-          [YAT_FIND_STR([$1], [$yat_flag], , 
-                        [AX_CXXCPP_CHECK_FLAG([$yat_flag], ,, 
-                                              [$1="$$1 $yat_flag"])])])
+              [AX_CHECK_PREPROC_FLAG([$yat_flag], 
+                                     [AX_APPEND_FLAG([$yat_flag], [$1])])])
   done
 ]) # YAT_CPP_ADD_FLAG
@@ -73 +72 @@
 AC_DEFUN([YAT_CXX_ADD_FLAG],
 [
-  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
+  AC_PREREQ([2.59]) dnl we use AX_APPEND_COMPILE_FLAGS 
+  AX_APPEND_COMPILE_FLAGS([$2], [$1])
 ]) # YAT_CXX_ADD_FLAG
 
 AC_DEFUN([YAT_LD_ADD_FLAG],
 [
-  AC_PREREQ([2.61]) dnl we use AX_LD_CHECK_FLAG 
+  AC_PREREQ([2.59]) dnl we use AX_APPEND_LINK_FLAGS
   for yat_flag in $2; do
     # ignore flag if
@@ -89 +85 @@
     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"])])])
+          [AX_APPEND_LINK_FLAGS([$yat_flag], [$1])])
   done
 ]) # YAT_LD_ADD_FLAG
-
-AC_DEFUN([YAT_FIND_STR],
-[
-  # YAT_FIND_STR
-  found=no;       
-  for a in $$1; do 
-    AS_IF([test "x$a" = "x$2"],[found=yes])
-  done
-
-  # ACTION
-  AS_IF([test "$found" = "yes"], [m4_default([$3], [:])],
-        [m4_default([$4], [:])])
-
-]) # YAT_FIND_STR
-

trunk/test/Makefile.am

@@ -104 +104 @@
   common_defs.sh
 yat_cpp_add_flag_test.log: $(top_srcdir)/m4/yat_add_flag.m4 \
-  $(top_srcdir)/m4/ax_cxxcpp_check_flag.m4 common_defs.sh
+  $(top_srcdir)/m4/ax_check_flag.m4 common_defs.sh
 yat_cxx_add_flag_test.log: $(top_srcdir)/m4/yat_add_flag.m4 \
-  $(top_srcdir)/m4/ax_cxx_check_flag.m4 common_defs.sh
+  $(top_srcdir)/m4/ax_check_flag.m4 common_defs.sh
 yat_ld_add_flag_test.log: $(top_srcdir)/m4/yat_add_flag.m4 \
-  $(top_srcdir)/m4/ax_ld_check_flag.m4 common_defs.sh
+  $(top_srcdir)/m4/ax_check_flag.m4 common_defs.sh
 yat_lt_link_ifelse_test.log: $(top_srcdir)/m4/yat_lt_link_ifelse.m4 \
   common_defs.sh