* Makefile.am:

[vlc] / m4 / vlc.m4

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 5289e19bd257a4b62e1571af9fcdb5cb7658d57c..f6b3093c3311a4cfb72f2294ea7a172027872069 100644 (file)
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -29,36 +29,36 @@ AC_DEFUN([AX_RESTORE_FLAGS], [
 dnl  Special cases: vlc, pics, plugins, save
 AC_DEFUN([AX_ADD_CPPFLAGS], [
   for element in [$1]; do
-    eval "CPPFLAGS_$element="'"$'"{CPPFLAGS_$element} $2"'"'
-    am_plugins_with_cppflags="${am_plugins_with_cppflags} $element"
+    eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} $2"'"'
+    am_plugins_with_cppflags="${am_plugins_with_cppflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_CFLAGS], [
   for element in [$1]; do
-    eval "CFLAGS_$element="'"$'"{CFLAGS_$element} $2"'"'
-    am_plugins_with_cflags="${am_plugins_with_cflags} $element"
+    eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} $2"'"'
+    am_plugins_with_cflags="${am_plugins_with_cflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_CXXFLAGS], [
   for element in [$1]; do
-    eval "CXXFLAGS_$element="'"$'"{CXXFLAGS_$element} $2"'"'
-    am_plugins_with_cxxflags="${am_plugins_with_cxxflags} $element"
+    eval "CXXFLAGS_${element}="'"$'"{CXXFLAGS_${element}} $2"'"'
+    am_plugins_with_cxxflags="${am_plugins_with_cxxflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_OBJCFLAGS], [
   for element in [$1]; do
-    eval "OBJCFLAGS_$element="'"$'"{OBJCFLAGS_$element} $2"'"'
-    am_plugins_with_objcflags="${am_plugins_with_objcflags} $element"
+    eval "OBJCFLAGS_${element}="'"$'"{OBJCFLAGS_${element}} $2"'"'
+    am_plugins_with_objcflags="${am_plugins_with_objcflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_LDFLAGS], [
   for element in [$1]; do
-    eval "LDFLAGS_$element="'"$'"{LDFLAGS_$element} $2"'"'
-    am_plugins_with_ldflags="${am_plugins_with_ldflags} $element"
+    eval "LDFLAGS_${element}="'"$'"{LDFLAGS_${element}} $2"'"'
+    am_plugins_with_ldflags="${am_plugins_with_ldflags} ${element}"
   done
 ])
 
@@ -67,7 +67,7 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
   AC_MSG_RESULT(configure: creating ./vlc-config.in)
 
   rm -f vlc-config.in
-  sed -ne '/#@1@#/q;p' < vlc-config.in.in \
+  sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
     | sed -e "s/@gprof@/${enable_gprof}/" \
           -e "s/@cprof@/${enable_cprof}/" \
           -e "s/@optim@/${enable_optimizations}/" \
@@ -110,11 +110,13 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
   ] done
 
   dnl  '/#@1@#/,/#@2@#/{/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@1@#/,/#@2@#/p' < vlc-config.in.in | sed -e '/#@.@#/d' >> vlc-config.in
+  sed -ne '/#@1@#/,/#@2@#/p' < "${srcdir}/vlc-config.in.in" \
+   | sed -e '/#@.@#/d' >> vlc-config.in
 
   AX_VLC_CONFIG_HELPER
 
   dnl  '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@2@#/,$p' < vlc-config.in.in | sed -e '/#@.@#/d' >> vlc-config.in
+  sed -ne '/#@2@#/,$p' < "${srcdir}/vlc-config.in.in" \
+   | sed -e '/#@.@#/d' >> vlc-config.in
 ])