--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.498 $)
+AC_REVISION($Revision: 1.499 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -808,7 +808,7 @@
 if test "$with_colamd" = yes; then
   warn_colamd="COLAMD not found. This will result in some lack of functionality for sparse matrices."
   with_colamd=no
-  AC_CHECK_HEADERS([ufsparse/colamd.h umfpack/colamd.h colamd.h], [
+  AC_CHECK_HEADERS([ufsparse/colamd.h colamd/colamd.h colamd.h], [
     AC_CHECK_LIB(colamd, colamd, [COLAMD_LIBS="-lcolamd"; with_colamd=yes])
     if test "$with_colamd" = yes; then
       AC_DEFINE(HAVE_COLAMD, 1, [Define if the COLAMD library is used.])
@@ -831,7 +831,7 @@
 if test "$with_ccolamd" = yes; then
   warn_ccolamd="CCOLAMD not found. This will result in some lack of functionality for sparse matrices."
   with_ccolamd=no
-  AC_CHECK_HEADERS([ufsparse/ccolamd.h umfpack/ccolamd.h ccolamd.h], [
+  AC_CHECK_HEADERS([ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h], [
     AC_CHECK_LIB(ccolamd, ccolamd, [CCOLAMD_LIBS="-lccolamd"; with_ccolamd=yes])
     if test "$with_ccolamd" = yes; then
       AC_DEFINE(HAVE_CCOLAMD, 1, [Define if the CCOLAMD library is used.])
@@ -855,8 +855,8 @@
 	test "$with_ccolamd" = yes && test "$with_amd" = yes; then
   warn_cholmod="CHOLMOD not found. This will result in some lack of functionality for sparse matrices."
   with_cholmod=no
-  AC_CHECK_HEADERS([ufsparse/cholmod.h umfpack/cholmod.h cholmod.h], [
-    AC_CHECK_HEADERS([metis/metis.h ufsparse/metis.h umfpack/metis.h metis.h], [
+  AC_CHECK_HEADERS([ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], [
+    AC_CHECK_HEADERS([ufsparse/metis.h metis/metis.h metis.h], [
       AC_CHECK_LIB(metis, METIS_NodeND, with_metis=yes, with_metis=no)
       break],
       with_metis=no)
@@ -865,14 +865,14 @@
       AC_DEFINE(HAVE_METIS, 1, [Define if the METIS library is used.])
       AC_CHECK_LIB(cholmod, cholmod_start, [CHOLMOD_LIBS="-lcholmod -lmetis"; 
 	with_cholmod=yes], [
-        AC_CHECK_LIB(cholmod_start, cholmod, 
+        AC_CHECK_LIB(cholmod, cholmod_start, 
 	  [CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes], [],
           $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)],
 	$AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)
     else
       AC_CHECK_LIB(cholmod, cholmod_start, [CHOLMOD_LIBS="-lcholmod"; 
 	with_cholmod=yes], [
-        AC_CHECK_LIB(cholmod_start, cholmod, [CHOLMOD_LIBS="-lcholmod -cblas"; 
+        AC_CHECK_LIB(cholmod, cholmod_start, [CHOLMOD_LIBS="-lcholmod -cblas"; 
 	  with_cholmod=yes], [],
           $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)],
 	$AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)
@@ -889,6 +889,29 @@
   AC_MSG_WARN($warn_cholmod)
 fi
 
+CXSPARSE_LIBS=
+AC_SUBST(CXSPARSE_LIBS)
+
+AC_ARG_WITH(cxsparse,
+  [  --without-cxsparse        don't use CXSparse, disable some sparse functionality],
+  with_cxsparse=$withval, with_cxsparse=yes)
+
+if test "$with_cxsparse" = yes; then
+  warn_cxsparse="CXSparse not found. This will result in some lack of functionality for sparse matrices."
+  with_cxsparse=no
+  AC_CHECK_HEADERS([ufsparse/cxs.h cxsparse/cxs.h cxs.h], [
+    AC_CHECK_LIB(cxspack, cs_sqr_di, [CXSPARSE_LIBS="-lcxspack"; with_cxsparse=yes])
+    if test "$with_cxsparse" = yes; then
+      AC_DEFINE(HAVE_CXSPARSE, 1, [Define if the CXSparse library is used.])
+      warn_cxsparse=
+    fi
+    break])
+fi
+
+if test -n "$warn_cxsparse"; then
+  AC_MSG_WARN($warn_cxsparse)
+fi
+
 ### Handle shared library options.
 
 ### Enable creation of static libraries.
@@ -1810,6 +1833,7 @@
   COLAMD libraries:     $COLAMD_LIBS
   CCOLAMD libraries:    $CCOLAMD_LIBS
   CHOLMOD libraries:    $CHOLMOD_LIBS
+  CXSPARSE libraries:   $CXSPARSE_LIBS
   HDF5 libraries:       $HDF5_LIBS
   MPI libraries:        $MPI_LIBS
   LIBS:                 $LIBS