X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fflags.m4;h=2db4febba226b5811f873f26496487c78a11d4e3;hb=690f19195f8e526750c5413c5a5a261c95cd55bf;hp=683c7f8ea47b264e9e4d30103d277aaa1ab16142;hpb=1dfa47c08284d591ecf8747914c5fc2eff19e7da;p=vlc

diff --git a/m4/flags.m4 b/m4/flags.m4
index 683c7f8ea4..2db4febba2 100644
--- a/m4/flags.m4
+++ b/m4/flags.m4
@@ -1,4 +1,4 @@
-# <rdenis (at) simphalempin (dot) com>.
+# Copyright © 2006 Rémi Denis-Courmont
 # This file (flags.m4) is free software; unlimited permission to
 # copy and/or distribute it , with or without modifications, as long
 # as this notice is preserved.
@@ -13,7 +13,7 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
   CFLAGS_save="${CFLAGS}"
   as_ac_var=`echo "ac_cv_prog_cc_flags_$1" | $as_tr_sh`
   AC_CACHE_CHECK([if $CC accepts $1], [$as_ac_var], [
-    CFLAGS="${CFLAGS_save} $1"
+    CFLAGS="${CFLAGS} $1"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
@@ -22,29 +22,28 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
   ])
 
   ac_res=`eval echo '${'$as_ac_var'}'`
-  AS_IF([test "${ac_res}" != "no"], [
-    CXXFLAGS="${CXXFLAGS} $1"
-    OBJCFLAGS="${OBJCFLAGS} $1"
-    $2
-  ], [
-    CFLAGS="${CFLAGS_save}"
-    $3
-  ])
+  CFLAGS="${CFLAGS_save}"
+  AS_IF([test "${ac_res}" != "no"], [$2], [$3])
+])
+
+AC_DEFUN([RDC_PROG_CC_FLAGS],
+[AC_LANG_ASSERT(C)
+  RDC_PROG_CC_FLAGS_IFELSE([$1], [CFLAGS="${CFLAGS} $1"])
 ])
 
 AC_DEFUN([RDC_PROG_CC_WFLAGS],
 [ for a in $1; do
-    RDC_PROG_CC_FLAGS_IFELSE([-W$a])
+    RDC_PROG_CC_FLAGS([-W$a])
   done
 ])
 
 AC_DEFUN([RDC_PROG_LINK_FLAGS_IFELSE],
 [AC_LANG_ASSERT(C)
-  CFLAGS_save="${CFLAGS}"
-  as_ac_var=`echo "ac_cv_prog_cc_flags_$1" | $as_tr_sh`
-  AC_CACHE_CHECK([if $CC accepts $1], [$as_ac_var], [
-    CFLAGS="${CFLAGS_save} $1"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+  LDFLAGS_save="${LDFLAGS}"
+  as_ac_var=`echo "ac_cv_prog_link_flags_$1" | $as_tr_sh`
+  AC_CACHE_CHECK([if $LINK accepts $1], [$as_ac_var], [
+    LDFLAGS="${LDFLAGS} $1"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
       eval "$as_ac_var=no"
@@ -53,10 +52,10 @@ AC_DEFUN([RDC_PROG_LINK_FLAGS_IFELSE],
 
   ac_res=`eval echo '${'$as_ac_var'}'`
   AS_IF([test "${ac_res}" != "no"], [
-    true
+    LDFLAGS="${LDFLAGS} $1"
     $2
   ], [
-    LDFLAGS="${CFLAGS_save}"
+    LDFLAGS="${LDFLAGS_save}"
     $3
   ])
 ])