banshee r4778 - in trunk/banshee: . build src/Libraries/Hyena.Gui

[abock svn gnome org]

Author: abock
Date: Tue Nov  4 23:27:17 2008
New Revision: 4778
URL: http://svn.gnome.org/viewvc/banshee?rev=4778&view=rev

Log:
2008-11-04  Aaron Bockover  <abock gnome org>

    * configure.ac: Automatically --enable-release if there is
    no .svn directory (this is for you, packagers)

    * src/Libraries/Hyena.Gui/Hyena.Gui.dll.config: linux->osx



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.rules.mk
   trunk/banshee/configure.ac
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Tue Nov  4 23:27:17 2008
@@ -58,7 +58,7 @@
 	test "x$$colors" = "xyes" && \
 		echo -e "\033[1mCompiling $(notdir $@)...\033[0m" || \
 		echo "Compiling $(notdir $@)...";
-	if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
+	@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
 		$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $  config) && \
 		$(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $  config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll $(SOURCES_BUILD); \
 	fi;

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Tue Nov  4 23:27:17 2008
@@ -1,6 +1,6 @@
 dnl Automake setup
-AC_INIT([banshee-1], [1.3.3])
-ASM_DISPLAY_VERSION="1.3.3"
+AC_INIT([banshee-1], [1.4.0])
+ASM_DISPLAY_VERSION="1.4.0"
 
 DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
@@ -122,8 +122,8 @@
 
 AC_ARG_ENABLE(release,
 	AC_HELP_STRING([--enable-release],
-		[Use release configuration [default=NO]]),
-	enable_release=yes, enable_release=no)
+		[Use release configuration]),
+	enable_release=yes, enable_release=`test ! -d .svn && echo "yes" || echo "no"`)
 AM_CONDITIONAL(ENABLE_RELEASE, test "x$enable_release" = "xyes")
 ENABLE_RELEASE=$enable_release
 AC_SUBST(ENABLE_RELEASE)

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	Tue Nov  4 23:27:17 2008
@@ -13,5 +13,5 @@
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.dylib" os="osx"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.dylib" os="osx"/>
   <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.dylib" os="osx"/>
-  <dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="linux"/>
+  <dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
 </configuration>