diff src/oct-conf.h.in @ 14144:834df9f10963 stable

remove ARPACK files from sources and restore configure checks for external ARPACK library * libcruft/arpack: Remove directory and all files. * libcruft/Makefile.am: Don't include arpack/module.mk. * m4/acinclude.m4 (OCTAVE_CHECK_ARPACK_OK): New macro. * configure.ac: Check for ARPACK. Use OCTAVE_CHECK_ARPACK_OK to test for known bug. * build-aux/common.mk (ARPACK_CPPFLAGS, ARPACK_LDFLAGS, ARPACK_LIBS): Restore variables. (do_subst_config_vals): Substitute them. * eigs-base.cc: Use HAVE_ARPACK again. * sparse/svds.m: Use "testif HAVE_ARPACK" instead of "test". * DLD-FUNCTIONS/eigs.cc (Feigs): Restore HAVE_ARPACK conditionals. Use "testif HAVE_ARPACK" instead of "test". * toplev.cc (octave_config_info): Restore ARPACK_CPPFLAGS, ARPACK_LDFLAGS, ARPACK_LIBS to the struct. * oct-conf.h.in (OCTAVE_CONF_ARPACK_CPPFLAGS, OCTAVE_CONF_ARPACK_LDFLAGS, OCTAVE_CONF_ARPACK_LIBS): Restore #defines.
author John W. Eaton <jwe@octave.org>
date Tue, 03 Jan 2012 20:12:38 -0500
parents 72c96de7a403
children
line wrap: on
line diff
--- a/src/oct-conf.h.in	Tue Jan 03 12:03:12 2012 -0500
+++ b/src/oct-conf.h.in	Tue Jan 03 20:12:38 2012 -0500
@@ -60,6 +60,18 @@
 #define OCTAVE_CONF_AR %OCTAVE_CONF_AR%
 #endif
 
+#ifndef OCTAVE_CONF_ARPACK_CPPFLAGS
+#define OCTAVE_CONF_ARPACK_CPPFLAGS %OCTAVE_CONF_ARPACK_CPPFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_ARPACK_LDFLAGS
+#define OCTAVE_CONF_ARPACK_LDFLAGS %OCTAVE_CONF_ARPACK_LDFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_ARPACK_LIBS
+#define OCTAVE_CONF_ARPACK_LIBS %OCTAVE_CONF_ARPACK_LIBS%
+#endif
+
 #ifndef OCTAVE_CONF_BLAS_LIBS
 #define OCTAVE_CONF_BLAS_LIBS %OCTAVE_CONF_BLAS_LIBS%
 #endif