changeset 1247:0616df8902e0 octave-forge

Fix quoting in OCTAVE_EXISTS for IRIX /bin/sh. Clean up TRY_MKOCTFILE tests.
author pkienzle
date Thu, 29 Jan 2004 21:12:15 +0000
parents 27406165285f
children 4d45b7868483
files configure.base
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.base	Thu Jan 29 21:09:44 2004 +0000
+++ b/configure.base	Thu Jan 29 21:12:15 2004 +0000
@@ -247,7 +247,7 @@
 AC_DEFUN(OCTAVE_EVAL,
 [AC_MSG_CHECKING([for $1 in Octave])
 $2=`echo "disp($1)" | $OCTAVE -qf`
-AC_MSG_RESULT($2)
+AC_MSG_RESULT($$2)
 AC_SUBST($2)
 ])
 
@@ -257,7 +257,7 @@
 dnl
 AC_DEFUN(OCTAVE_CHECK_EXIST,
 [AC_MSG_CHECKING([for $1 in Octave])
-if test "`echo "disp(exist('$1'))" | $OCTAVE -qf`" != 0 ; then
+if test `echo 'disp(exist("$1"))' | $OCTAVE -qf`X != 0X ; then
    AC_MSG_RESULT(yes)
    $2
 else
@@ -346,15 +346,13 @@
 
 dnl Test for load/save functions in class
 TRY_MKOCTFILE([for load/save functions in class],
-[#include <octave/config.h>
-#include <octave/ov-scalar.h>
+[#include <octave/ov-scalar.h>
 int main (void) { octave_scalar a; a.load_ascii(std::cin); }],
 [CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],)
 AC_SUBST(CLASS_HAS_LOAD_SAVE)
 
 TRY_MKOCTFILE([for Octave_map indexing],
-[#include <octave/config.h>
-#include <octave/oct-map.h>
+[#include <octave/oct-map.h>
 int main(void) { Octave_map a; a["key"]; }],
 [HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],)
 AC_SUBST(HAVE_OCTAVE_MAP_INDEX)