X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fflags.m4;h=e5def0b342c6ab8b3f071036cf7979e477028891;hb=b54a35bb79f40b82c0e7d0bd3fedf402e03bd0ee;hp=57f22233f2a010b6a4427063d7e7ad08bca282b7;hpb=fca47616535d31d7cd321d86e08da32cdb9108dd;p=vlc

diff --git a/m4/flags.m4 b/m4/flags.m4
index 57f22233f2..e5def0b342 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.
@@ -22,20 +22,47 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
   ])
 
   ac_res=`eval echo '${'$as_ac_var'}'`
-  AS_IF([test "${ac_res}" != "no"], [
-    CFLAGS="${CFLAGS} $1"
+  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([-W$a])
+  done
+])
+
+AC_DEFUN([RDC_PROG_CXX_FLAGS_IFELSE],
+[AC_LANG_ASSERT(C++)
+  CXXFLAGS_save="${CXXFLAGS}"
+  as_ac_var=`echo "ac_cv_prog_cxx_flags_$1" | $as_tr_sh`
+  AC_CACHE_CHECK([if $CXX accepts $1], [$as_ac_var], [
     CXXFLAGS="${CXXFLAGS} $1"
-    OBJCFLAGS="${OBJCFLAGS} $1"
-    $2
-  ], [
-    CFLAGS="${CFLAGS_save}"
-    $3
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+      eval "$as_ac_var=yes"
+    ],[
+      eval "$as_ac_var=no"
+    ])
   ])
+
+  ac_res=`eval echo '${'$as_ac_var'}'`
+  CFLAGS="${CFLAGS_save}"
+  AS_IF([test "${ac_res}" != "no"], [$2], [$3])
 ])
 
-AC_DEFUN([RDC_PROG_CC_WFLAGS],
+AC_DEFUN([RDC_PROG_CXX_FLAGS],
+[AC_LANG_ASSERT(C++)
+  RDC_PROG_CXX_FLAGS_IFELSE([$1], [CXXFLAGS="${CXXFLAGS} $1"])
+])
+
+AC_DEFUN([RDC_PROG_CXX_WFLAGS],
 [ for a in $1; do
-    RDC_PROG_CC_FLAGS_IFELSE([-W$a])
+    RDC_PROG_CXX_FLAGS([-W$a])
   done
 ])