[banshee] [darwin] obsolete --enable-osx, auto-detect darwin

[Aaron Bockover <abock src gnome org>]

commit eeea6203b95414d59136d9646266024aceaf9291
Author: Aaron Bockover <abockover novell com>
Date:   Wed Feb 24 22:57:55 2010 -0500

    [darwin] obsolete --enable-osx, auto-detect darwin
    
    Fixes the ige-mac-integration-sharp issue as well; now looks for only
    the native ige-mac-integration library, which is just a runtime dep,
    so the check is only for sanity. Not required to build.

 bootstrap-bundle                                   |    2 +-
 build/bundle/packages/banshee.py                   |    1 -
 build/m4/banshee/osx.m4                            |   23 ++++---------------
 configure.ac                                       |    2 -
 src/Backends/Banshee.Osx/Makefile.am               |    2 +-
 .../Banshee.NotificationArea/Makefile.am           |    2 +-
 6 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/bootstrap-bundle b/bootstrap-bundle
index d2d36a5..bc9b3ee 100755
--- a/bootstrap-bundle
+++ b/bootstrap-bundle
@@ -44,7 +44,7 @@ CONFIGURE_ARGS="
 	--disable-webkit
 	--disable-docs
 "
-[ $profile_name = darwin ] && CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-osx"
+
 ./autogen.sh --prefix="$BUILD_PREFIX" $CONFIGURE_ARGS
 
 cat <<EOF
diff --git a/build/bundle/packages/banshee.py b/build/bundle/packages/banshee.py
index 3baeadb..54e12d7 100644
--- a/build/bundle/packages/banshee.py
+++ b/build/bundle/packages/banshee.py
@@ -19,7 +19,6 @@ class BansheePackage (Package):
 				'--disable-ipod',
 				'--disable-boo',
 				'--disable-gnome',
-				'--enable-osx',
 				'--with-vendor-build-id="banshee-project.org OSX 10.5+ i386/Intel"'
 			])
 
diff --git a/build/m4/banshee/osx.m4 b/build/m4/banshee/osx.m4
index b41ae07..1e0688c 100644
--- a/build/m4/banshee/osx.m4
+++ b/build/m4/banshee/osx.m4
@@ -1,22 +1,9 @@
 AC_DEFUN([BANSHEE_CHECK_OSX],
 [
-	IGEMACINTEGRATIONSHARP_REQUIRED=0.8.2
-
-	AC_ARG_ENABLE(osx, AC_HELP_STRING([--enable-osx], [Enable OSX support]), enable_osx=$enableval, enable_osx="no")
-
-	if test "x$enable_osx" = "xyes"; then
-		dnl FIXME: detect osx
-		have_osx="yes"
-
-		PKG_CHECK_MODULES(IGEMACINTEGRATIONSHARP, 
-			ige-mac-integration-sharp >= $IGEMACINTEGRATIONSHARP_REQUIRED,
-			have_igemacintegrationsharp=yes, have_igemacintegrationsharp=no)
-	
-		if test "x$have_igemacintegrationsharp" = "xno"; then
-			AC_MSG_ERROR([ige-mac-integration-sharp was not found or is not up to date. Please install ige-mac-integration-sharp of at least version $IGEMACINTEGRATIONSHARP_REQUIRED])
-		fi
-		AC_SUBST(IGEMACINTEGRATIONSHARP_LIBS)
+	enable_osx="no"
+	if test "x${host_os%${host_os#??????}}" = "xdarwin"; then
+		enable_osx="yes"
+		PKG_CHECK_MODULES(IGEMACINTEGRATION, ige-mac-integration >= 0.8.6)
 	fi
-
-	AM_CONDITIONAL(ENABLE_OSX, test "x$have_osx" = "xyes")
+	AM_CONDITIONAL([PLATFORM_DARWIN], [test "x$enable_osx" = "xyes"])
 ])
diff --git a/configure.ac b/configure.ac
index 4da55f0..706ae61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,8 +194,6 @@ AC_SUBST(BUILD_HOST_OS)
 AC_SUBST(BUILD_HOST_CPU)
 AC_SUBST(BUILD_TIME)
 
-AM_CONDITIONAL([PLATFORM_DARWIN], [test "x${host_os%${host_os#??????}}" = "xdarwin"])
-
 SHAVE_INIT([build/m4/shave], [enable])
 
 dnl generated files
diff --git a/src/Backends/Banshee.Osx/Makefile.am b/src/Backends/Banshee.Osx/Makefile.am
index 3452d17..a2642f2 100644
--- a/src/Backends/Banshee.Osx/Makefile.am
+++ b/src/Backends/Banshee.Osx/Makefile.am
@@ -18,7 +18,7 @@ SOURCES =  \
 
 RESOURCES = Banshee.Osx.addin.xml
 
-if ENABLE_OSX
+if PLATFORM_DARWIN
 include $(top_srcdir)/build/build.mk
 else
 EXTRA_DIST = $(SOURCES) $(RESOURCES)
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am b/src/Extensions/Banshee.NotificationArea/Makefile.am
index c3751d2..39db29a 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -26,7 +26,7 @@ RESOURCES =  \
 	Banshee.NotificationArea.addin.xml \
 	Resources/NotificationAreaMenu.xml
 
-if ENABLE_OSX
+if PLATFORM_DARWIN
 EXTRA_DIST = $(SOURCES) $(RESOURCES)
 else
 include $(top_srcdir)/build/build.mk