[svn] r5881: nemerle/trunk/configure

malekith svnadmin at nemerle.org
Fri Nov 4 12:22:30 CET 2005


Log:
Change semantics of *-path options to point to the binary -- bring back autodetection or antlr and nant in PATH.

Author: malekith
Date: Fri Nov  4 12:22:30 2005
New Revision: 5881

Modified:
   nemerle/trunk/configure

Modified: nemerle/trunk/configure
==============================================================================
--- nemerle/trunk/configure	(original)
+++ nemerle/trunk/configure	Fri Nov  4 12:22:30 2005
@@ -67,8 +67,8 @@
 broken_swf=0
 monopath=
 antlr=
-antlr_path=
-nant_path=
+antlr_path=antlr
+nant_path=nant
 mono_gacutil=no
 
 ############################################################
@@ -204,8 +204,8 @@
   --net-flags=FLAGS     pass these flags to .NET engine
   --install-path=PATH   the path to a custom install program
   --dll-path=PATH       the path to dlls directory
-  --antlr-path=PATH     the path to where antlr resides
-  --nant-path=PATH      the path to where nant resides  
+  --antlr-path=PATH     how to execute AntLR [default: antlr]
+  --nant-path=PATH      how to execute NAnt [default: nant]
   --force-old-mono      use this switch to force using your version of
                         Mono .NET environment or if you don't use Mono
                         at all but have it installed
@@ -667,7 +667,7 @@
 # check for antlr for generating cs2n C# parser
 echo_check_for "antlr >= 2.7.5"
   # the debian antlr package uses a `runantlr' binary
-  antlrcommand=`which $antlr_path/antlr 2>/dev/null || which runantlr 2>/dev/null`
+  antlrcommand=`which $antlr_path 2>/dev/null || which runantlr 2>/dev/null`
 
   # and the debian antlr version also didn't match with this
   # ver=`antlr 2>&1| head -1 | sed 's/.* \([0-9]*\.[0-9]\.[0-9]*\).*/\1/g'`
@@ -689,13 +689,13 @@
 
 # Step 13.
 echo_check_for "nant"
-try_execute $nant_path/nant
+try_execute $nant_path
 if test $? -lt 126; then
     echo_result yes
-    nant=$nant_path/nant
+    nant=$nant_path
     echo_check_for "nant plugin directory"
     rm -f misc/nant.dir
-    try_execute $nant_path/nant -buildfile:misc/print-dir.build
+    try_execute $nant_path -buildfile:misc/print-dir.build
     nant_dir=`cat misc/nant.dir 2>/dev/null`
     rm -f misc/nant.dir
     if test "$nant_dir" ; then



More information about the svn mailing list