diff options
| author | Aaron Bockover <aaron@abock.org> | 2011-03-04 15:07:30 -0500 |
|---|---|---|
| committer | Aaron Bockover <aaron@abock.org> | 2011-03-04 15:07:30 -0500 |
| commit | b17e5b03a944c1904c62a622bb61374870446b32 (patch) | |
| tree | 13a918a30752411f6b7870d9ed1c00b4bbf87fc4 /build | |
| parent | 84fdce9a97bb36c6c72fe45f24a4fdd0a55b8a6c (diff) | |
OS X Build: Work with new bockbuild, add MonoMac
The profile in bockbuild changed, so update that in bootstrap-bundle
and add --disable-appledevice to profile-configure. Link against and
bundle MonoMac, now required by configure, though not yet integrated
in code.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.environment.mk | 2 | ||||
| -rw-r--r-- | build/m4/banshee/osx.m4 | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build/build.environment.mk b/build/build.environment.mk index 5dd05aecd..87ebfea25 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -171,7 +171,7 @@ REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEP REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB) REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX) REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS) -REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) +REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(MONOMAC_LIBS) REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS) # Cute hack to replace a space with something diff --git a/build/m4/banshee/osx.m4 b/build/m4/banshee/osx.m4 index 1e0688c63..bc841f37e 100644 --- a/build/m4/banshee/osx.m4 +++ b/build/m4/banshee/osx.m4 @@ -4,6 +4,11 @@ AC_DEFUN([BANSHEE_CHECK_OSX], if test "x${host_os%${host_os#??????}}" = "xdarwin"; then enable_osx="yes" PKG_CHECK_MODULES(IGEMACINTEGRATION, ige-mac-integration >= 0.8.6) + PKG_CHECK_MODULES(MONOMAC, monomac >= 0.7) + MONOMAC_ASSEMBLIES=`$PKG_CONFIG --variable=Libraries monomac` + AC_SUBST(MONOMAC_LIBS) + AC_SUBST(MONOMAC_ASSEMBLIES) fi + AM_CONDITIONAL([PLATFORM_DARWIN], [test "x$enable_osx" = "xyes"]) ]) |