banshee r3965 - in trunk/banshee: . build build/m4/shamrock

[abock svn gnome org]

Author: abock
Date: Thu May 22 20:00:37 2008
New Revision: 3965
URL: http://svn.gnome.org/viewvc/banshee?rev=3965&view=rev

Log:
Mostly fixed the rest of the nunit stuff

Added:
   trunk/banshee/build/m4/shamrock/nunit.m4   (contents, props changed)
      - copied, changed from r3956, /trunk/banshee/build/m4/shamrock/mono-nunit.m4
Removed:
   trunk/banshee/build/m4/shamrock/mono-nunit.m4
Modified:
   trunk/banshee/build/build.rules.mk
   trunk/banshee/configure.ac

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Thu May 22 20:00:37 2008
@@ -18,7 +18,7 @@
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
 if ENABLE_TESTS
-    LINK += " $(MONO_NUNIT_LIBS)"
+    LINK += " $(NUNIT_LIBS)"
     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
 endif
 

Copied: trunk/banshee/build/m4/shamrock/nunit.m4 (from r3956, /trunk/banshee/build/m4/shamrock/mono-nunit.m4)
==============================================================================
--- /trunk/banshee/build/m4/shamrock/mono-nunit.m4	(original)
+++ trunk/banshee/build/m4/shamrock/nunit.m4	Thu May 22 20:00:37 2008
@@ -1,12 +1,12 @@
-AC_DEFUN([SHAMROCK_CHECK_MONO_NUNIT],
+AC_DEFUN([SHAMROCK_CHECK_NUNIT],
 [
-	PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= 1.0, 
+	PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7, 
 		do_tests="yes", do_tests="no")
 	
-	AC_SUBST(MONO_NUNIT_LIBS)
+	AC_SUBST(NUNIT_LIBS)
 	AM_CONDITIONAL(ENABLE_TESTS, test "x$do_tests" = "xyes")
 
 	if test "x$do_tests" = "xno"; then
-		AC_MSG_WARN([Could not find mono-nunit: tests will not be available.])
+		AC_MSG_WARN([Could not find nunit: tests will not be available.])
 	fi
 ])

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Thu May 22 20:00:37 2008
@@ -65,7 +65,7 @@
 SHAMROCK_CHECK_MONODOC
 
 dnl NUnit (optional)
-SHAMROCK_CHECK_MONO_NUNIT
+SHAMROCK_CHECK_NUNIT
 
 dnl External TagLib# libraries (optional)
 BANSHEE_CHECK_TAGLIB_SHARP