macosx intf: solve hotkey conflict

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 071df0dd14bbfc1008998f605dcec4c12a96e193..c4ccb785cf58c64888263bfcdab307697c4af7aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -335,12 +335,12 @@ case "${host_os}" in
         fi
     fi
     ;;
-  *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+  *mingw32* | *cygwin* | *wince* | *mingwce*)
     AC_CHECK_TOOL(WINDRES, windres, :)
     AC_CHECK_TOOL(OBJCOPY, objcopy, :)
 
     case "${host_os}" in
-      *wince* | *mingwce* | *mingw32ce* | *pe*)
+      *wince* | *mingwce* | *mingw32ce*)
         SYS=mingwce
         dnl Sadly CeGCC still needs non-wince macros
         AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
@@ -839,6 +839,9 @@ fi
 if test "${THREAD_LIB}" = "error"; then
   AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
 fi
+if test "${THREAD_LIB}" = "error"; then
+  AC_CHECK_LIB(pthread,main,THREAD_LIB="-pthread")
+fi
 if test "${THREAD_LIB}" = "error"; then
   AC_CHECK_FUNCS(pthread_mutex_lock)
   THREAD_LIB=""
@@ -1622,7 +1625,7 @@ if test -n "${with_tuning}"; then
     fi
 else
     if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then
-        CFLAGS_TUNING="-march=pentium-m -mtune=prescott"
+        CFLAGS_TUNING="-march=prescott -mtune=generic"
     elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
         CFLAGS_TUNING="-mtune=pentium2"
     elif test "${host_cpu}" = "x86_64"; then