--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Quote the call to AC_CHECK_FUNC inside the
+	AC_CHECK_LIB macro when checking for lapack.  For autoconf 2.50
+
+	* aclocal.m4: Changes for autoconf 2.50:
+	Convert dnl comments inside AC_DEFUN to ###.
+	(OCTAVE_FLIBS): Use [] quoting instead of changequote.
+
 2001-05-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* octMakefile.in: Remove remaining references to readline.

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -100,25 +100,25 @@
 [AC_MSG_CHECKING([for Fortran libraries])
 AC_REQUIRE([OCTAVE_HOST_TYPE])
 AC_CACHE_VAL(octave_cv_flibs,
-[changequote(, )dnl
+[[
 echo "      END" > conftest.f
 foutput=`${F77-f77} -v -o conftest conftest.f 2>&1`
-dnl
-dnl The easiest thing to do for xlf output is to replace all the commas
-dnl with spaces.  Try to only do that if the output is really from xlf,
-dnl since doing that causes problems on other systems.
-dnl
+
+### The easiest thing to do for xlf output is to replace all the commas
+### with spaces.  Try to only do that if the output is really from xlf,
+### since doing that causes problems on other systems.
+
 xlf_p=`echo $foutput | grep xlfentry`
 if test -n "$xlf_p"; then
   foutput=`echo $foutput | sed 's/,/ /g'`
 fi
-dnl
+
 ld_run_path=`echo $foutput | \
   sed -n -e 's/^.*LD_RUN_PATH *= *\([^ ]*\).*/\1/p'`
-dnl
-dnl We are only supposed to find this on Solaris systems...
-dnl Uh, the run path should be absolute, shouldn't it?
-dnl
+
+### We are only supposed to find this on Solaris systems...
+### Uh, the run path should be absolute, shouldn't it?
+
 case "$ld_run_path" in
   /*)
     if test "$ac_cv_prog_gcc" = yes; then
@@ -131,22 +131,22 @@
     ld_run_path=
   ;;
 esac
-dnl
+
 flibs=
 lflags=
-dnl
-dnl If want_arg is set, we know we want the arg to be added to the list,
-dnl so we don't have to examine it.
-dnl
+
+### If want_arg is set, we know we want the arg to be added to the list,
+### so we don't have to examine it.
+
 want_arg=
-dnl
+
 for arg in $foutput; do
   old_want_arg=$want_arg
   want_arg=
-dnl
-dnl None of the options that take arguments expect the argument to
-dnl start with a -, so pretend we didn't see anything special.
-dnl
+
+### None of the options that take arguments expect the argument to
+### start with a -, so pretend we didn't see anything special.
+
   if test -n "$old_want_arg"; then
     case "$arg" in
       -*)
@@ -243,11 +243,11 @@
       arg="-u $arg"
     ;;
     -Y)
-dnl
-dnl Should probably try to ensure unique directory options here too.
-dnl This probably only applies to Solaris systems, and then will only
-dnl work with gcc...
-dnl
+
+### Should probably try to ensure unique directory options here too.
+### This probably only applies to Solaris systems, and then will only
+### work with gcc...
+
       arg=`echo $arg | sed -e 's%^P,%%'`
       SAVE_IFS=$IFS
       IFS=:
@@ -259,7 +259,6 @@
       arg="$list"
     ;;
   esac
-dnl
   if test -n "$arg"; then
     flibs="$flibs $arg"
   fi
@@ -269,7 +268,7 @@
 else
   flibs_result="$flibs"
 fi
-changequote([, ])dnl
+]
 octave_cv_flibs="$flibs_result"])
 FLIBS="$octave_cv_flibs"
 AC_MSG_RESULT([$FLIBS])])

--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.347 $)
+AC_REVISION($Revision: 1.348 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -674,7 +674,8 @@
 
   AC_CHECK_LIB(lapack, $cheev_func, 
 	       [BLAS_LIBS="-llapack $BLAS_LIBS"; LAPACK_DIR=""],
-	       AC_CHECK_FUNC($cheev_func, LAPACK_DIR=""), $BLAS_LIBS $FLIBS)
+	       [AC_CHECK_FUNC($cheev_func, LAPACK_DIR="")],
+	       [$BLAS_LIBS $FLIBS])
 fi
 
 AC_SUBST(BLAS_LIBS)