# HG changeset patch
# User jwe
# Date 865633675 0
# Node ID 9a5525df1c21e6d74539026dc3531fa92e96c34e
# Parent  e70400e133d0ebce98001edbf3d6ec16b585f75f
[project @ 1997-06-06 21:46:19 by jwe]

diff --git a/CLASSES b/CLASSES
--- a/CLASSES
+++ b/CLASSES
@@ -110,14 +110,8 @@
     |   +-- LPsolve --> LPsolve_options
     |
     +-- QP 
-    |   ^
-    |   |
-    |   +-- QPSOL --> QPSOL_options
     |
     +-- NLP
-	^
-	|
-	+-- NPSOL --> NPSOL_options
 
 
   Quad
diff --git a/configure.in b/configure.in
--- 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.277 $)
+AC_REVISION($Revision: 1.278 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -720,32 +720,6 @@
   AC_MSG_ERROR([I couldn't find termios.h, termio.h, or sgtty.h!])
 fi
 
-### See if the optional nonlinear programming code is present.
-
-AC_MSG_CHECKING([for npsol])
-if test -f $srcdir/libcruft/npsol/npsol.f; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_DEFINE(NPSOL_MISSING, 1)
-fi
-
-AC_MSG_CHECKING([for qpsol])
-if test -f $srcdir/libcruft/qpsol/qpsol.f; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_DEFINE(QPSOL_MISSING, 1)
-fi
-
-AC_MSG_CHECKING([for fsqp])
-if test -f $srcdir/libcruft/fsqp/fsqpd.f; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_DEFINE(FSQP_MISSING, 1)
-fi
-
 ### Checks for functions and variables.
 
 AC_CHECK_FUNCS(atexit bcopy bzero dup2 endgrent endpwent execvp fcntl \
@@ -1212,13 +1186,11 @@
   libcruft/Makefile libcruft/Makerules
   libcruft/blas/Makefile libcruft/balgen/Makefile
   libcruft/dassl/Makefile libcruft/eispack/Makefile
-  libcruft/fftpack/Makefile libcruft/fsqp/Makefile
-  libcruft/lapack/Makefile libcruft/linpack/Makefile
-  libcruft/minpack/Makefile libcruft/misc/Makefile
-  libcruft/npsol/Makefile libcruft/odepack/Makefile
-  libcruft/qpsol/Makefile libcruft/quadpack/Makefile
-  libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile
-  libcruft/villad/Makefile)
+  libcruft/fftpack/Makefile libcruft/lapack/Makefile
+  libcruft/linpack/Makefile libcruft/minpack/Makefile
+  libcruft/misc/Makefile libcruft/odepack/Makefile
+  libcruft/quadpack/Makefile libcruft/ranlib/Makefile
+  libcruft/slatec-fn/Makefile libcruft/villad/Makefile)
 
 ### Print a summary so that important information isn't missed.