Qt4 - Fullscreen button should work now. hasVideo() does not work, so force the activ...

[vlc] / m4 / vlc.m4

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 08e7ec51244f3bc9fab901b50e40c8d9a28cf3df..3fc1698cd1cdb37b4a494d57778552033d668100 100644 (file)
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -3,6 +3,8 @@ 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"
@@ -86,7 +88,8 @@ AC_DEFUN([VLC_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
@@ -135,11 +138,11 @@ dnl  Macros for shared object handling (TODO)
 
 AC_DEFUN([VLC_LIBRARY_SUFFIX], [
   AC_MSG_CHECKING(for shared objects suffix)
-  case "${target_os}" in
+  case "${host_os}" in
     darwin*)
       LIBEXT=".dylib"
       ;;
-    *mingw32* | *cygwin*)
+    *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
       LIBEXT=".dll"
       ;;
     hpux*)
@@ -153,3 +156,14 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
   AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
 ])
 
+AC_DEFUN([VLC_SYMBOL_PREFIX], [
+  AC_MSG_CHECKING(for prefix to exported symbols)
+  SYMPREF=""
+  case "${host_os}" in
+    darwin* | *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+      SYMPREF="_"
+      ;;
+  esac
+  AC_MSG_RESULT(${SYMPREF})
+])
+