Replace AC_TRY_CFLAGS usage with CC_CHECK_CFLAGS and remove the

former.

The CC_CHECK_CFLAGS macro is already present in attributes.m4, so no
need to keep the old version we had around, especially since the new
one caches its results too.

2 files changed, 15 insertions, 30 deletions

diff --git a/m4/_xine.m4 b/m4/_xine.m4
index 900b57da5..0c840cd9d 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -142,21 +142,6 @@ AC_DEFUN([AC_CHECK_DXR3],
   fi
 ])
 
-dnl AC_TRY_CFLAGS (CFLAGS, [ACTION-IF-WORKS], [ACTION-IF-FAILS])
-dnl check if $CC supports a given set of cflags
-AC_DEFUN([AC_TRY_CFLAGS],
-    [AC_MSG_CHECKING([if $CC supports $1 flags])
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$1"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_try_cflags_ok=yes],[ac_cv_try_cflags_ok=no])
-    CFLAGS="$SAVE_CFLAGS"
-    AC_MSG_RESULT([$ac_cv_try_cflags_ok])
-    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-        ifelse([$2],[],[:],[$2])
-    else
-        ifelse([$3],[],[:],[$3])
-    fi])
-
 dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
 dnl generate a default inttypes.h if the header file does not exist already
 AC_DEFUN([AC_CHECK_GENERATE_INTTYPES],
diff --git a/m4/optimizations.m4 b/m4/optimizations.m4
index a1f2f2f00..ca329154e 100644
--- a/m4/optimizations.m4
+++ b/m4/optimizations.m4
@@ -17,30 +17,30 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
     if test "$GCC" = yes; then
         dnl
         dnl check cflags not supported by all gcc versions
-        AC_TRY_CFLAGS("-fschedule-insns2", f_si="-fschedule-insns2", f_si="")
-        AC_TRY_CFLAGS("-mwide-multiply", m_wm="-mwide-multiply", m_wm="")
+        CC_CHECK_CFLAGS([-fschedule-insns2], f_si="-fschedule-insns2", f_si="")
+        CC_CHECK_CFLAGS([-mwide-multiply], m_wm="-mwide-multiply", m_wm="")
         dnl
         dnl gcc 3.1 uses the -f version
         dnl
-        AC_TRY_CFLAGS("-falign-functions=4", f_af="-falign-functions=4",
+        CC_CHECK_CFLAGS([-falign-functions=4], f_af="-falign-functions=4",
             f_af="-malign-functions=4")
-        AC_TRY_CFLAGS("-falign-loops=4", f_al="-falign-loops=4",
+        CC_CHECK_CFLAGS([-falign-loops=4], f_al="-falign-loops=4",
             f_al="-malign-loops=4")
-        AC_TRY_CFLAGS("-falign-jumps=4", f_aj="-falign-jumps=4",
+        CC_CHECK_CFLAGS([-falign-jumps=4], f_aj="-falign-jumps=4",
             f_aj="-malign-jumps=4")
         dnl
         dnl Check for some optimization disabling
         dnl needed for win32 code
         dnl
-        AC_TRY_CFLAGS("-fno-omit-frame-pointer", W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-omit-frame-pointer",)
-        AC_TRY_CFLAGS("-fno-inline-functions", W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-inline-functions",)
-        AC_TRY_CFLAGS("-fno-rename-registers", W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-rename-registers",)
+        CC_CHECK_CFLAGS([-fno-omit-frame-pointer], W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-omit-frame-pointer",)
+        CC_CHECK_CFLAGS([-fno-inline-functions], W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-inline-functions",)
+        CC_CHECK_CFLAGS([-fno-rename-registers], W32_NO_OPTIMIZE="$W32_NO_OPTIMIZE -fno-rename-registers",)
         AC_SUBST(W32_NO_OPTIMIZE)
         dnl
         dnl Multipass compilation
         dnl
-        AC_TRY_CFLAGS("-fprofile-arcs", PASS1_CFLAGS="-fprofile_arcs $PASS1_CFLAGS",)
-        AC_TRY_CFLAGS("-fbranch-probabilities", PASS2_CFLAGS="-fbranch-probabilities $PASS2_CFLAGS",)
+        CC_CHECK_CFLAGS([-fprofile-arcs], PASS1_CFLAGS="-fprofile_arcs $PASS1_CFLAGS",)
+        CC_CHECK_CFLAGS([-fbranch-probabilities], PASS2_CFLAGS="-fbranch-probabilities $PASS2_CFLAGS",)
         AC_SUBST(PASS1_CFLAGS)
         AC_SUBST(PASS2_CFLAGS)
         dnl
@@ -69,7 +69,7 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
     fi
 
     dnl Flags not supported by all *cc* variants
-    AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="")
+    CC_CHECK_CFLAGS([-Wall], wall="-Wall", wall="")
 
     CFLAGS="$wall ${CFLAGS}"
     DEBUG_CFLAGS="$wall ${DEBUG_CFLAGS}"
@@ -80,11 +80,11 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
 
           if test "$GCC" = yes; then
             dnl Check for gcc cpu optimization support
-            AC_TRY_CFLAGS("-mtune=i386",
+            CC_CHECK_CFLAGS("-mtune=i386",
               sarchopt="-mtune",
-              AC_TRY_CFLAGS("-mcpu=i386",
+              CC_CHECK_CFLAGS("-mcpu=i386",
                 sarchopt="-mcpu",
-                AC_TRY_CFLAGS("-march=i386",
+                CC_CHECK_CFLAGS("-march=i386",
                   sarchopt="-march",
                   [ AC_MSG_RESULT(** no cpu optimization supports **)
                     sarchopt=no
@@ -94,7 +94,7 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
             )
 
             dnl special check for k7 cpu CC support
-            AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
+            CC_CHECK_CFLAGS([$sarchopt=athlon], k7cpu="athlon", k7cpu="i686")
 
             dnl add x86 specific gcc CFLAGS
             CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si -ffast-math $INLINE_FUNCTIONS $CFLAGS"