X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fvlc.m4;h=e8944e13737901e61ff1b7fc6e5d6549f272d24e;hb=fdb91a064e0291b5d69124008ec52c9d57f3fa77;hp=f6b3093c3311a4cfb72f2294ea7a172027872069;hpb=655212ddf8a63bbb919e1f05d38117369f88de66;p=vlc

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index f6b3093c33..e8944e1373 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -1,71 +1,93 @@
 dnl  Macros needed for VLC
+dnl  $Id$
 
-dnl  Add plugins or builtins
-AC_DEFUN([AX_ADD_BUILTINS], [
-  BUILTINS="${BUILTINS} $1"
-])
+dnl ===========================================================================
+dnl  Macros to add plugins or builtins and handle their flags
+m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
 
-AC_DEFUN([AX_ADD_PLUGINS], [
-  PLUGINS="${PLUGINS} $1"
-])
 
-dnl  Save and restore default flags
-AC_DEFUN([AX_SAVE_FLAGS], [
-  CPPFLAGS_save="${CPPFLAGS}"
-  CFLAGS_save="${CFLAGS}"
-  CXXFLAGS_save="${CXXFLAGS}"
-  OBJCFLAGS_save="${OBJCFLAGS}"
-  LDFLAGS_save="${LDFLAGS}"
+AC_DEFUN([VLC_ADD_BUILTINS], [
+  BUILTINS="${BUILTINS} $1"
 ])
 
-AC_DEFUN([AX_RESTORE_FLAGS], [
-  CPPFLAGS="${CPPFLAGS_save}"
-  CFLAGS="${CFLAGS_save}"
-  CXXFLAGS="${CXXFLAGS_save}"
-  OBJCFLAGS="${OBJCFLAGS_save}"
-  LDFLAGS="${LDFLAGS_save}"
+AC_DEFUN([VLC_ADD_PLUGIN], [
+  PLUGINS="${PLUGINS} $1"
+  AC_SUBST([LTLIB$1], ["lib$1_plugin.la"])
 ])
 
 dnl  Special cases: vlc, pics, plugins, save
-AC_DEFUN([AX_ADD_CPPFLAGS], [
+AC_DEFUN([VLC_ADD_CPPFLAGS], [
   for element in [$1]; do
     eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} $2"'"'
-    am_plugins_with_cppflags="${am_plugins_with_cppflags} ${element}"
+    am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
   done
 ])
 
-AC_DEFUN([AX_ADD_CFLAGS], [
+AC_DEFUN([VLC_ADD_CFLAGS], [
   for element in [$1]; do
     eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} $2"'"'
-    am_plugins_with_cflags="${am_plugins_with_cflags} ${element}"
+    am_modules_with_cflags="${am_modules_with_cflags} ${element}"
   done
 ])
 
-AC_DEFUN([AX_ADD_CXXFLAGS], [
+AC_DEFUN([VLC_ADD_CXXFLAGS], [
   for element in [$1]; do
     eval "CXXFLAGS_${element}="'"$'"{CXXFLAGS_${element}} $2"'"'
-    am_plugins_with_cxxflags="${am_plugins_with_cxxflags} ${element}"
+    am_modules_with_cxxflags="${am_modules_with_cxxflags} ${element}"
   done
 ])
 
-AC_DEFUN([AX_ADD_OBJCFLAGS], [
+AC_DEFUN([VLC_ADD_OBJCFLAGS], [
   for element in [$1]; do
     eval "OBJCFLAGS_${element}="'"$'"{OBJCFLAGS_${element}} $2"'"'
-    am_plugins_with_objcflags="${am_plugins_with_objcflags} ${element}"
+    am_modules_with_objcflags="${am_modules_with_objcflags} ${element}"
   done
 ])
 
-AC_DEFUN([AX_ADD_LDFLAGS], [
+AC_DEFUN([VLC_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}="'"'"$2 "'$'"{LDFLAGS_${element}} "'"'
+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
   done
 ])
 
-AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
+AC_DEFUN([VLC_ADD_LIBS], [
+  for element in [$1]; do
+    eval "LIBS_${element}="'"'"$2 "'$'"{LIBS_${element}} "'"'
+    am_modules_with_libs="${am_modules_with_libs} ${element}"
+  done
+])
+
+dnl ===========================================================================
+dnl  Macros to save and restore default flags
+
+AC_DEFUN([VLC_SAVE_FLAGS], [
+  CPPFLAGS_save="${CPPFLAGS}"
+  CFLAGS_save="${CFLAGS}"
+  CXXFLAGS_save="${CXXFLAGS}"
+  OBJCFLAGS_save="${OBJCFLAGS}"
+  LDFLAGS_save="${LDFLAGS}"
+  LIBS_save="${LIBS}"
+])
+
+AC_DEFUN([VLC_RESTORE_FLAGS], [
+  CPPFLAGS="${CPPFLAGS_save}"
+  CFLAGS="${CFLAGS_save}"
+  CXXFLAGS="${CXXFLAGS_save}"
+  OBJCFLAGS="${OBJCFLAGS_save}"
+  LDFLAGS="${LDFLAGS_save}"
+  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}/" \
@@ -76,47 +98,68 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
           -e "s/@PLUGINS@/${PLUGINS}/" \
           -e "s/@BUILTINS@/${BUILTINS}/" \
           -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
-          -e "s/@CFLAGS_OPTIM@/${CFLAGS_OPTIM}/" \
+          -e "s/@CFLAGS_OPTIM_SIZE@/${CFLAGS_OPTIM_SIZE}/" \
+          -e "s/@CFLAGS_OPTIM_SPEED@/${CFLAGS_OPTIM_SPEED}/" \
           -e "s/@CFLAGS_OPTIM_NODEBUG@/${CFLAGS_OPTIM_NODEBUG}/" \
           -e "s/@CFLAGS_NOOPTIM@/${CFLAGS_NOOPTIM}/" \
     > vlc-config.in
 
   dnl  Switch/case loop
-  for x in `echo ${am_plugins_with_ldflags}`
+  for x in `echo ${am_all_modules}`
   do [
-    echo "    ${x})" >> vlc-config.in
-    if test -n "`eval echo '$'CPPFLAGS_${x}`"; then
-      echo "      cppflags=\"\${cppflags} `eval echo '$'CPPFLAGS_${x}`\"" >> vlc-config.in
+    echo "    ${x})"
+    if test "`eval echo @'$'CPPFLAGS_${x}@`" != "@@"; then
+      echo "      cppflags=\"\${cppflags} `eval echo '$'CPPFLAGS_${x}`\""
     fi
-    if test -n "`eval echo '$'CFLAGS_${x}`"; then
-      echo "      cflags=\"\${cflags} `eval echo '$'CFLAGS_${x}`\"" >> vlc-config.in
+    if test "`eval echo @'$'CFLAGS_${x}@`" != "@@"; then
+      echo "      cflags=\"\${cflags} `eval echo '$'CFLAGS_${x}`\""
     fi
-    if test -n "`eval echo '$'CXXFLAGS_${x}`"; then
-      echo "      cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\"" >> vlc-config.in
-      if test "${x}" != "plugins" -a "${x}" != "builtins"; then
-        echo "      linkage=\"c++\"" >> vlc-config.in
+    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 -n "`eval echo '$'OBJCFLAGS_${x}`"; then
-      echo "      objcflags=\"\${objcflags} `eval echo '$'OBJCFLAGS_${x}`\"" >> vlc-config.in
-      if test "${x}" != "plugins" -a "${x}" != "builtins"; then
-        echo "      if test \"\${linkage}\" = \"c\"; then linkage=\"objc\"; fi" >> vlc-config.in
+    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 -n "`eval echo '$'LDFLAGS_${x}`"; then
-      echo "      ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\"" >> vlc-config.in
+    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 "    ;;" >> vlc-config.in
-  ] done
+    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" \
+  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
+])
 
-  AX_VLC_CONFIG_HELPER
-
-  dnl  '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@2@#/,$p' < "${srcdir}/vlc-config.in.in" \
-   | sed -e '/#@.@#/d' >> vlc-config.in
+dnl ===========================================================================
+dnl  Macros for shared object handling (TODO)
+
+AC_DEFUN([VLC_LIBRARY_SUFFIX], [
+  AC_MSG_CHECKING(for shared objects suffix)
+  case "${host_os}" in
+    darwin*)
+      LIBEXT=".dylib"
+      ;;
+    *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+      LIBEXT=".dll"
+      ;;
+    hpux*)
+      LIBEXT=".sl"
+      ;;
+    *)
+      LIBEXT=".so"
+      ;;
+  esac
+  AC_MSG_RESULT(${LIBEXT})
+  AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
 ])