X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fflags.m4;h=2db4febba226b5811f873f26496487c78a11d4e3;hb=ff23d0ea0ded9f3e6b855e87f3b8fa2fcb28de04;hp=50a6719ef4165bdb73629a94724725d4e080777d;hpb=eac2117fcd9de41b13e4d7163a0e0aa8e40a543c;p=vlc

diff --git a/m4/flags.m4 b/m4/flags.m4
index 50a6719ef4..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="$1 ${CFLAGS_save}"
+    CFLAGS="${CFLAGS} $1"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
@@ -21,20 +21,41 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
     ])
   ])
 
-  ac_res=`echo "${as_ac_var}"`
-  AS_IF([test "${ac_res}" != "no"], [
-    CFLAGS="$1 ${CFLAGS_save}"
-    CXXFLAGS="$1 ${CFLAGS_save}"
-    OBJCFLAGS="$1 ${OBJCFLAGS_save}"
-    $2
-  ], [
-    CFLAGS="${CFLAGS_save}"
-    $3
-  ])
+  ac_res=`eval echo '${'$as_ac_var'}'`
+  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)
+  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"
+    ])
+  ])
+
+  ac_res=`eval echo '${'$as_ac_var'}'`
+  AS_IF([test "${ac_res}" != "no"], [
+    LDFLAGS="${LDFLAGS} $1"
+    $2
+  ], [
+    LDFLAGS="${LDFLAGS_save}"
+    $3
+  ])
+])