From 5a2fc2fb88cd198d542d29146128a78a0f0b6f2d Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Thu, 29 Aug 2013 19:54:33 +0200
Subject: osx: failed menu integration attempt

---
 configure.ac | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 5ee8ef4b..dc2e1511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,11 @@ AC_SUBST(GETTEXT_PACKAGE)
 test "$prefix" = NONE && prefix=/usr/local
 AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory])
 
+case "$host" in
+  *-*-gnu)
+    NOCPPLIB="-nostdlib -lsupc++";;
+esac
+
 case "$host" in
   i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
@@ -33,15 +38,20 @@ case "$host" in
     YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
     APE_USE_YASM=yes
     ;;
-  x86_64-apple-*)
-    AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX])
-    LIB="../deadbeef-deps/lib-x86-64-osx"
-    ;;
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
     LIB="../deadbeef-deps/lib-x86-64"
     YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
     APE_USE_YASM=yes
+    KILLCPPFLAGS="-nostdlib -lsupc++"
+    ;;
+  i686-apple-*)
+    AC_DEFINE(ARCH_X86_32_OSX, 1, [architecture is x86])
+    LIB="../deadbeef-deps/lib-x86-32-apple"
+    ;;
+  x86_64-apple-*)
+    AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX])
+    LIB="../deadbeef-deps/lib-x86-64-osx"
     ;;
   powerpc-*-* )
     AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
@@ -188,6 +198,13 @@ AS_IF([test "${enable_gtk3}" = "yes"], [
     ])
     AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)])
     AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)])
+    GTK_CHECK_BACKEND([quartz], [3.0], [os_osx=yes], [os_osx=no])
+    if test "$os_osx" = "yes"; then
+        PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+        AC_SUBST(GTK_MAC_LIBS)
+        AC_SUBST(GTK_MAC_CFLAGS)
+    fi
+
 ], [
     HAVE_GTK3=no
 ])
-- 
cgit v1.2.3