Allow more than one thread to call libvlc_wait

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index d7311f489fe6286c577cf58624b1b9491a0f274a..4315d2b4a39e7676a4325f1949c7368c7f69fbe0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,11 +125,15 @@ AC_ARG_WITH(contrib,
       if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
          topdir="`pwd`/$topdir"
       fi
-      CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+      CONTRIB_DIR=${topdir}/extras/contrib/hosts/fat
       if ! test -d "$CONTRIB_DIR"
       then
-        gccmachine=`$CC -dumpmachine`
-        CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+          CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+          if ! test -d "$CONTRIB_DIR"
+          then
+            gccmachine=`$CC -dumpmachine`
+            CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+          fi
       fi
     fi
     AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
@@ -3613,7 +3617,7 @@ dnl  X C Bindings modules
 dnl
 AC_ARG_ENABLE(xcb,
   [  --enable-xcb            X11 support with XCB (default enabled)],, [
-  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
     enable_xcb="yes"
   ], [
     enable_xcb="no"
@@ -4439,6 +4443,10 @@ then
   VLC_ADD_PLUGIN([access_eyetv])
 fi
 
+AC_ARG_ENABLE(macosx-vlc-app,
+  [  --enable-macosx-vlc-app            build the VLC media player (default enabled on Mac OS X)])
+AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
+    (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
 
 
 dnl