configure: Per module Werror flags.

[vlc] / m4 / vlc.m4

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 13a0ada53790921968191254a64ae7680c7e934e..130e47a5c4aafdadbd2358ef2c2e6780219edef7 100644 (file)
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -10,8 +10,9 @@ AC_DEFUN([VLC_ADD_BUILTINS], [
   BUILTINS="${BUILTINS} $1"
 ])
 
-AC_DEFUN([VLC_ADD_PLUGINS], [
+AC_DEFUN([VLC_ADD_PLUGIN], [
   PLUGINS="${PLUGINS} $1"
+  AC_SUBST([LTLIB$1], ["lib$1_plugin.la"])
 ])
 
 dnl  Special cases: vlc, pics, plugins, save
@@ -57,6 +58,12 @@ AC_DEFUN([VLC_ADD_LIBS], [
   done
 ])
 
+AC_DEFUN([VLC_SET_CFLAGS_WERROR], [
+  for element in [$1]; do
+    eval "CFLAGS_WERROR_${element}="'"'"$2"''"'
+  done
+])
+
 dnl ===========================================================================
 dnl  Macros to save and restore default flags
 
@@ -131,16 +138,14 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
     if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
       echo "      libs=\"\${libs} `eval echo '$'LIBS_${x}`\""
     fi
+    if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
+      echo "      CFLAGS_WERROR=\"`eval echo '$'CFLAGS_WERROR_${x}`\""
+    fi
     echo "    ;;"
   ] done >> vlc-config.in
 
-
-  dnl  '/#@1@#/,/#@2@#/{/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@1@#/,/#@2@#/p' < "${srcdir}/vlc-config.in.in" \
-   | sed -e '/#@.@#/d' >> vlc-config.in
-
-  dnl  '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@2@#/,$p' < "${srcdir}/vlc-config.in.in" \
+  dnl  '/#@1@#/,${/#@.@#/d;p}' won't work on OS X
+  sed -ne '/#@1@#/,$p' < "${srcdir}/vlc-config.in.in" \
    | sed -e '/#@.@#/d' >> vlc-config.in
 ])
 
@@ -153,7 +158,7 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
     darwin*)
       LIBEXT=".dylib"
       ;;
-    *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+    *mingw32* | *cygwin* | *wince* | *mingwce*)
       LIBEXT=".dll"
       ;;
     hpux*)