X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fvlc.m4;h=1adec40b312cbe7981c54f5c169f1d81cabbf0df;hb=f7e78fb2cb603de3cd1ab27e48055484a966be56;hp=61e309e5865554ea5596098dd909a8491a7daade;hpb=4a78361e7a557fd32d74cf9a84633a9c39f7d384;p=vlc

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 61e309e586..1adec40b31 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -1,62 +1,55 @@
 dnl  Macros needed for VLC
-dnl  $Id$
 
 dnl ===========================================================================
 dnl  Macros to add plugins or builtins and handle their flags
 m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
 
 
-AC_DEFUN([VLC_ADD_BUILTINS], [
-  BUILTINS="${BUILTINS} $1"
-])
-
 AC_DEFUN([VLC_ADD_PLUGIN], [
   m4_foreach_w([element], [$1], [
-    [PLUGINS="${PLUGINS} ]element["]
     AC_SUBST([LTLIB]element, [lib]element[_plugin.la])
   ])
 ])
 
-dnl  Special cases: vlc, pics, plugins, save
 AC_DEFUN([VLC_ADD_CPPFLAGS], [
   m4_foreach_w([element], [$1], [
     [eval "CPPFLAGS_]element[="'"$'"{CPPFLAGS_]element[} $2"'"']
-    [am_modules_with_cppflags="${am_modules_with_cppflags} ]element["]
+    AC_SUBST([CPPFLAGS_]element)
   ])
 ])
 
 AC_DEFUN([VLC_ADD_CFLAGS], [
   m4_foreach_w([element], [$1], [
     [eval "CFLAGS_]element[="'"$'"{CFLAGS_]element[} $2"'"']
-    [am_modules_with_cflags="${am_modules_with_cflags} ]element["]
+    AC_SUBST([CFLAGS_]element)
   ])
 ])
 
 AC_DEFUN([VLC_ADD_CXXFLAGS], [
   m4_foreach_w([element], [$1], [
     [eval "CXXFLAGS_]element[="'"$'"{CXXFLAGS_]element[} $2"'"']
-    [am_modules_with_cxxflags="${am_modules_with_cxxflags} ]element["]
+    AC_SUBST([CXXFLAGS_]element)
   ])
 ])
 
 AC_DEFUN([VLC_ADD_OBJCFLAGS], [
   m4_foreach_w([element], [$1], [
     [eval "OBJCFLAGS_]element[="'"$'"{OBJCFLAGS_]element[} $2"'"']
-    [am_modules_with_objcflags="${am_modules_with_objcflags} ]element["]
+    AC_SUBST([OBJCFLAGS_]element)
   ])
 ])
 
 AC_DEFUN([VLC_ADD_LDFLAGS], [
   m4_foreach_w([element], [$1], [
     [eval "LDFLAGS_]element[="'"$2 $'"{LDFLAGS_]element[}"'"']
-    [am_modules_with_ldflags="${am_modules_with_ldflags} ]element["]
+    AC_SUBST([LDFLAGS_]element)
   ])
 ])
 
 AC_DEFUN([VLC_ADD_LIBS], [
   m4_foreach_w([element], [$1], [
     [eval "LIBS_]element[="'"'"$2 "'$'"{LIBS_]element[}"'"']
-    [am_modules_with_libs="${am_modules_with_libs} ]element["]
+    AC_SUBST([LIBS_]element)
   ])
 ])
 
@@ -81,64 +74,6 @@ AC_DEFUN([VLC_RESTORE_FLAGS], [
   LIBS="${LIBS_save}"
 ])
 
-dnl ===========================================================================
-dnl  Helper macro to generate the vlc-config.in file
-
-AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
-
-  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}; do echo $x; done | sort | uniq`"
-
-  rm -f vlc-config.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}/" \
-          -e "s/@debug@/${enable_debug}/" \
-          -e "s/@PLUGINS@/${PLUGINS}/" \
-          -e "s/@BUILTINS@/${BUILTINS}/" \
-          -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
-          -e "s/@CFLAGS_OPTIM_SPEED@/${CFLAGS_OPTIM_SPEED}/" \
-          -e "s/@CFLAGS_OPTIM_NODEBUG@/${CFLAGS_OPTIM_NODEBUG}/" \
-    > vlc-config.in
-
-  dnl  Switch/case loop
-  for x in `echo ${am_all_modules}`
-  do [
-    echo "    ${x})"
-    if test "`eval echo @'$'CPPFLAGS_${x}@`" != "@@"; then
-      echo "      cppflags=\"\${cppflags} `eval echo '$'CPPFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'CFLAGS_${x}@`" != "@@"; then
-      echo "      cflags=\"\${cflags} `eval echo '$'CFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'CXXFLAGS_${x}@`" != "@@"; then
-      echo "      cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\""
-      if test "${x}" != "plugin" -a "${x}" != "builtin"; then
-        echo "      linkage=\"c++\""
-      fi
-    fi
-    if test "`eval echo @'$'OBJCFLAGS_${x}@`" != "@@"; then
-      echo "      objcflags=\"\${objcflags} `eval echo '$'OBJCFLAGS_${x}`\""
-      if test "${x}" != "plugin" -a "${x}" != "builtin"; then
-        echo "      if test \"\${linkage}\" = \"c\"; then linkage=\"objc\"; fi"
-      fi
-    fi
-    if test "`eval echo @'$'LDFLAGS_${x}@`" != "@@"; then
-      echo "      ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
-      echo "      libs=\"\${libs} `eval echo '$'LIBS_${x}`\""
-    fi
-    echo "    ;;"
-  ] done >> vlc-config.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
-])
-
 dnl ===========================================================================
 dnl  Macros for shared object handling (TODO)
 
@@ -161,4 +96,3 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
   AC_MSG_RESULT(${LIBEXT})
   AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
 ])
-