[Maxima-commits] CVS: maxima configure.in,1.127,1.128

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15282

Modified Files:
	configure.in 
Log Message:
o Detection of CMUCL_RUNTIME_PATH was broken for newer versions (20a
  and later).  Change conditional from #+cmu19 to #-cmu18.
o When searching for subdirectories of share, sort the output of find
  first, so we're consistent.
o Use egrep instead grep, which works better on Solaris.


Index: configure.in
===================================================================
RCS file: /cvsroot/maxima/maxima/configure.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- configure.in	26 Oct 2010 12:59:10 -0000	1.127
+++ configure.in	26 Oct 2010 13:36:32 -0000	1.128
@@ -583,7 +583,7 @@
 
 if test x"${cmucl}" = xtrue; then
     if test x"${CMUCL_RUNTIME_PATH}" = x"" ; then
-        CMUCL_RUNTIME_PATH=`${CMUCL_NAME} -noinit -nositeinit -quiet -batch -eval '#+cmu19 (progn (setf (search-list "cmuclbin:") (append (lisp::parse-unix-search-path lisp::*cmucl-lib*) (mapcar (function (lambda (p) (concatenate (quote string) p "../bin/"))) (lisp::parse-unix-search-path lisp::*cmucl-lib*))))(enumerate-search-list (s "cmuclbin:lisp") (when (probe-file s) (format t "~A~%" s) (quit)))) #+cmu18 (format t "~a/../bin/lisp~%" common-lisp::*cmucl-lib*)(quit)'`
+        CMUCL_RUNTIME_PATH=`${CMUCL_NAME} -noinit -nositeinit -quiet -batch -eval '#-cmu18 (progn (setf (search-list "cmuclbin:") (append (lisp::parse-unix-search-path lisp::*cmucl-lib*) (mapcar (function (lambda (p) (concatenate (quote string) p "../bin/"))) (lisp::parse-unix-search-path lisp::*cmucl-lib*))))(enumerate-search-list (s "cmuclbin:lisp") (when (probe-file s) (format t "~A~%" s) (quit)))) #+cmu18 (format t "~a/../bin/lisp~%" common-lisp::*cmucl-lib*)(quit)'`
     fi
     if test -x "${CMUCL_RUNTIME_PATH}" ; then
         echo "cmucl runtime is \"${CMUCL_RUNTIME_PATH}\""
@@ -832,7 +832,7 @@
 dnl Remove the leading "share" part of the path, and add double-quotes
 dnl around it.
 
-default_sharedirs=`find share -type d | grep -v 'share$\|CVS\|/fortran' | sed 's;share/\(.*\);    "\1" \\\\;' | sed '$s;\\\\;;'`
+default_sharedirs=`find share -type d | sort | egrep -v 'share$|CVS|/fortran' | sed 's;share/\(.*\);    "\1" \\\\;' | sed '$s;\\\\;;'`
 
 AC_SUBST(expanded_top_srcdir)
 AC_SUBST(expanded_exec_prefix)