X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fflags.m4;h=7dc19b7b64478f2893e6b497f33b2931de3108fb;hb=f63dce330a12f1f25f233025375faf912234ebe6;hp=2741979bb04ca0f99aaa60aabdf5ae612b152c63;hpb=7160ce9f6ef3ef6d5afd3234e77611c01e90e1c2;p=vlc

diff --git a/m4/flags.m4 b/m4/flags.m4
index 2741979bb0..7dc19b7b64 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} $1"
+    CFLAGS="${CFLAGS} -Werror $1"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
@@ -31,15 +31,38 @@ AC_DEFUN([RDC_PROG_CC_FLAGS],
   RDC_PROG_CC_FLAGS_IFELSE([$1], [CFLAGS="${CFLAGS} $1"])
 ])
 
-AC_DEFUN([RDC_PROG_CC_WERRORFLAGS],
+AC_DEFUN([RDC_PROG_CC_WFLAGS],
 [ for a in $1; do
-    RDC_PROG_CC_FLAGS_IFELSE([-Werror=$a], [CFLAGS_WERROR="${CFLAGS_WERROR} -Werror=${a}"])
+    RDC_PROG_CC_FLAGS([-W$a])
   done
 ])
 
-AC_DEFUN([RDC_PROG_CC_WFLAGS],
+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"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+      eval "$as_ac_var=yes"
+    ],[
+      eval "$as_ac_var=no"
+    ])
+  ])
+
+  ac_res=`eval echo '${'$as_ac_var'}'`
+  CXXFLAGS="${CXXFLAGS_save}"
+  AS_IF([test "${ac_res}" != "no"], [$2], [$3])
+])
+
+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([-W$a])
+    RDC_PROG_CXX_FLAGS([-W$a])
   done
 ])