[Maxima-commits] CVS: maxima-pre59/for59 configure.in,1.3,1.4

[James A. <amu...@us...>]

Update of /cvsroot/maxima/maxima-pre59/for59
In directory usw-pr-cvs1:/tmp/cvs-serv29958

Modified Files:
	configure.in 
Log Message:
1) Change version number to 5.9.0pre-cvs
2) Fix bug in automatic lisp detection.
3) Support autoconf-variables.lisp


Index: configure.in
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/for59/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	2002/01/25 03:16:15	1.3
+++ configure.in	2002/02/02 22:33:41	1.4
@@ -2,7 +2,7 @@
 
 AC_INIT(src/macsys.lisp)
 
-AM_INIT_AUTOMAKE(maxima,5.9.0)
+AM_INIT_AUTOMAKE(maxima,5.9.0pre-cvs)
 
 explicit_lisp=false
 
@@ -30,8 +30,6 @@
 	fi
 fi
 
-AM_CONDITIONAL(CLISP, test x$clisp = xtrue)
-
 dnl n.b. cmucl_default_name is hardcoded in "with" message
 cmucl_default_name=lisp
 AC_ARG_ENABLE(cmucl,[--enable-cmucl                   Use CMUCL],
@@ -55,8 +53,6 @@
 	fi
 fi
 	
-AM_CONDITIONAL(CMUCL, test x$cmucl = xtrue)
-
 dnl n.b. gcl_default_name is hardcoded in "with" message
 gcl_default_name=gcl
 AC_ARG_ENABLE(gcl,[--enable-gcl                     Use GCL],
@@ -78,7 +74,6 @@
 		AC_MSG_ERROR(gcl executable ${GCL_NAME} not found in PATH)
 	fi
 fi
-AM_CONDITIONAL(GCL, test x$gcl = xtrue)
 
 if test x"${explicit_lisp}" = xfalse ; then
 	AC_CHECK_PROG(clisp_found,${clisp_default_name},true,false)
@@ -98,6 +93,10 @@
 		fi
 	fi
 fi
+
+AM_CONDITIONAL(CLISP, test x$clisp = xtrue)
+AM_CONDITIONAL(GCL, test x$gcl = xtrue)
+AM_CONDITIONAL(CMUCL, test x$cmucl = xtrue)
 	
 AC_ARG_WITH(default-lisp,
 	[--with-default-lisp=<lisp>       Set default lisp implementation to <lisp>],
@@ -149,7 +148,7 @@
 AC_SUBST(CMUCL_NAME)
 AC_SUBST(GCL_NAME)
 AC_SUBST(DEFAULTLISP)
-AC_OUTPUT(Makefile src/Makefile src/maxima lisp-utils/Makefile tests/Makefile doc/Makefile doc/info/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/maxima src/autoconf-variables.lisp lisp-utils/Makefile tests/Makefile doc/Makefile doc/info/Makefile)
 
 echo
 echo "Summary:"