Use var_InheritString for --decklink-video-connection.

[vlc] / m4 / flags.m4

diff --git a/m4/flags.m4 b/m4/flags.m4
index 84222ad432b395c5bb78ef8ec3661d27920611e3..2db4febba226b5811f873f26496487c78a11d4e3 100644 (file)
--- 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,20 +22,18 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
   ])
 
   ac_res=`eval echo '${'$as_ac_var'}'`
-  AS_IF([test "${ac_res}" != "no"], [
-    CFLAGS="${CFLAGS} $1"
-    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
 ])
 
@@ -44,7 +42,7 @@ AC_DEFUN([RDC_PROG_LINK_FLAGS_IFELSE],
   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_save} $1"
+    LDFLAGS="${LDFLAGS} $1"
     AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[