[svn] r6057: nemerle/trunk: configure lib/tests/Makefile

[malekith]

Log:
Use mono-nunit.pc if available, we should actually check compiling of some simple testcase plus search in additional paths...


Author: malekith
Date: Tue Jan 10 19:38:57 2006
New Revision: 6057

Modified:
   nemerle/trunk/configure
   nemerle/trunk/lib/tests/Makefile

Modified: nemerle/trunk/configure
==============================================================================
--- nemerle/trunk/configure	(original)
+++ nemerle/trunk/configure	Tue Jan 10 19:38:57 2006
@@ -732,6 +732,11 @@
 try_nunit_version_2 "${monopath}nunit-console2";
 if test "$nunit"; then
    echo_result "found, $nunit"
+  if pkgconfig --exists mono-nunit 2>/dev/null; then
+    nunit_lib="-pkg:mono-nunit.pc"
+  else
+    nunit_lib="-r:nunit.core.dll"
+  fi
 else
    echo_result "not found, some tests will be disabled"
 fi
@@ -809,6 +814,7 @@
 NANT_DIR   = $nant_dir
 
 NUNIT_CONSOLE = $nunit
+NUNIT_LIB_FLAG = $nunit_lib
 
 NEM_FLAGS  = $nem_flags
 

Modified: nemerle/trunk/lib/tests/Makefile
==============================================================================
--- nemerle/trunk/lib/tests/Makefile	(original)
+++ nemerle/trunk/lib/tests/Makefile	Tue Jan 10 19:38:57 2006
@@ -24,5 +24,5 @@
 
 lib-unit-tests.dll: 
 	$(Q)if test $(NUNIT_CONSOLE); then \
-		$(EXECUTE) $(TOP)/ncc/out.stage3/ncc.exe linkedlist.n -def:NUNIT -r nunit.core.dll -t:library -o:lib-unit-tests.dll; \
+		$(EXECUTE) $(TOP)/ncc/out.stage3/ncc.exe linkedlist.n -def:NUNIT $(NUNIT_LIB) -t:library -o:lib-unit-tests.dll; \
 	fi