dnl Special cases: vlc, pics, plugins, save
AC_DEFUN([VLC_ADD_CPPFLAGS], [
m4_foreach_w([element], [$1], [
- [CPPFLAGS_]element[="${CPPFLAGS_]element[} $2"]
+ [eval "CPPFLAGS_]element[="'"$'"{CPPFLAGS_]element[} $2"'"']
[am_modules_with_cppflags="${am_modules_with_cppflags} ]element["]
])
])
AC_DEFUN([VLC_ADD_CFLAGS], [
m4_foreach_w([element], [$1], [
- [CFLAGS_]element[="${CFLAGS_]element[} $2"]
+ [eval "CFLAGS_]element[="'"$'"{CFLAGS_]element[} $2"'"']
[am_modules_with_cflags="${am_modules_with_cflags} ]element["]
])
])
AC_DEFUN([VLC_ADD_CXXFLAGS], [
m4_foreach_w([element], [$1], [
- [CXXFLAGS_]element[="${CXXFLAGS_]element[} $2"]
+ [eval "CXXFLAGS_]element[="'"$'"{CXXFLAGS_]element[} $2"'"']
[am_modules_with_cxxflags="${am_modules_with_cxxflags} ]element["]
])
])
AC_DEFUN([VLC_ADD_OBJCFLAGS], [
m4_foreach_w([element], [$1], [
- [OBJCFLAGS_]element[="${OBJCFLAGS_]element[} $2"]
+ [eval "OBJCFLAGS_]element[="'"$'"{OBJCFLAGS_]element[} $2"'"']
[am_modules_with_objcflags="${am_modules_with_objcflags} ]element["]
])
])
AC_DEFUN([VLC_ADD_LDFLAGS], [
m4_foreach_w([element], [$1], [
- [LDFLAGS_]element[="${LDFLAGS_]element[} $2"]
+ [eval "LDFLAGS_]element[="'"$2 $'"{LDFLAGS_]element[}"'"']
[am_modules_with_ldflags="${am_modules_with_ldflags} ]element["]
])
])
AC_DEFUN([VLC_ADD_LIBS], [
m4_foreach_w([element], [$1], [
- [LIBS_]element[="${LIBS_]element[} $2"]
+ [eval "LIBS_]element[="'"'"$2 "'$'"{LIBS_]element[}"'"']
[am_modules_with_libs="${am_modules_with_libs} ]element["]
])
])
-AC_DEFUN([VLC_SET_CFLAGS_WERROR], [
- m4_foreach_w([element], [$1], [
- [CFLAGS_WERROR_]element[="${CFLAGS_WERROR_]element[} $2"]
- [am_modules_with_werror="${am_modules_with_werror} ]element["]
- ])
-])
-
dnl ===========================================================================
dnl Macros to save and restore default flags
AC_MSG_RESULT(configure: creating ./vlc-config.in)
- am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags} ${am_modules_with_libs} ${am_modules_with_werror}; do echo $x; done | sort | uniq`"
+ am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags} ${am_modules_with_libs}; do echo $x; done | sort | uniq`"
rm -f vlc-config.in
sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
-e "s/@cprof@/${enable_cprof}/" \
-e "s/@optim@/${enable_optimizations}/" \
-e "s/@debug@/${enable_debug}/" \
- -e "s/@release@/${enable_release}/" \
-e "s/@PLUGINS@/${PLUGINS}/" \
-e "s/@BUILTINS@/${BUILTINS}/" \
-e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
echo " libs=\"\${libs} `eval echo '$'LIBS_${x}`\""
fi
- if test "`eval echo @'$'CFLAGS_WERROR_${x}@`" != "@@"; then
- echo " cflags_werror=\"`eval echo '$'CFLAGS_WERROR_${x}`\""
- fi
echo " ;;"
] done >> vlc-config.in