5 files changed, 42 insertions, 13 deletions
diff --git a/libraries/UFconfig/README b/libraries/UFconfig/README
index f470ec39f6..3532d51ad2 100644
--- a/libraries/UFconfig/README
+++ b/libraries/UFconfig/README
@@ -1,3 +1,3 @@
 UFconfig is a common configuration library for the SuiteSparse family of
-sparse matrix packages, including SuiteSparseQR, AMD, COLAMD, CCOLAMD,
+sparse matrix packages, including SuiteSparseQR, AMD, CAMD, COLAMD, CCOLAMD,
 CHOLMOD, KLU, BTF, LDL, CXSparse, RBio, and UMFPACK.
diff --git a/libraries/UFconfig/UFconfig.SlackBuild b/libraries/UFconfig/UFconfig.SlackBuild
index dcab743407..f364c3c7d1 100644
--- a/libraries/UFconfig/UFconfig.SlackBuild
+++ b/libraries/UFconfig/UFconfig.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM=UFconfig
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,6 +37,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Recommended by SuiteSparse
+SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+
 set -e
 
 rm -rf $PKG
@@ -52,14 +55,17 @@ patch -p1 < $CWD/autotoolize.diff
 autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+FFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/UFconfig/UFconfig.info b/libraries/UFconfig/UFconfig.info
index e4ec22c0d7..7b96acb0bb 100644
--- a/libraries/UFconfig/UFconfig.info
+++ b/libraries/UFconfig/UFconfig.info
@@ -1,8 +1,8 @@
 PRGNAM="UFconfig"
-VERSION="3.5.0"
+VERSION="3.6.1"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/UFconfig/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.5.0.tar.gz"
-MD5SUM="526413bbbc94f987cf79619d9110bab4"
+DOWNLOAD="http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.6.1.tar.gz"
+MD5SUM="6289d0372a475bdfdd58aba8de85cfc2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
diff --git a/libraries/UFconfig/autotoolize.diff b/libraries/UFconfig/autotoolize.diff
index d892f083ed..b680b982af 100644
--- a/libraries/UFconfig/autotoolize.diff
+++ b/libraries/UFconfig/autotoolize.diff
@@ -2,23 +2,30 @@ diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,16 @@
 +SUBDIRS = xerbla
 +
 +EXTRA_DIST = README.txt
 +
-+include_HEADERS = UFconfig.h
++# Octave doesn't find UFconfig.h if it's placed in a non-default search path.
++# Don't put it in a subdirectory for now.  Update ufconfig.pc.in if this changes.
++#pkgincludedir = $(includedir)/ufconfig
++pkgincludedir = $(includedir)
++pkginclude_HEADERS = UFconfig.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = ufconfig.pc
 +
 +lib_LTLIBRARIES = libufconfig.la
 +libufconfig_la_SOURCES = UFconfig.c
-+libufconfig_la_LDFLAGS = -no-undefined -version-info 8:0:5
++libufconfig_la_LDFLAGS = -no-undefined -version-info 9:1:6
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,21 @@
-+AC_PREREQ([2.65])
-+AC_INIT([UFconfig], [3.5.0], [davis@cise.ufl.edu])
+@@ -0,0 +1,22 @@
++AC_PREREQ([2.68])
++AC_INIT([UFconfig],[3.6.1],[davis@cise.ufl.edu])
 +AC_CONFIG_SRCDIR([UFconfig.c])
 +AC_CONFIG_HEADER([config.h])
 +AM_INIT_AUTOMAKE([foreign])
@@ -35,9 +42,25 @@ new file mode 100644
 +AC_FUNC_MALLOC
 +
 +AC_CONFIG_FILES([
++	ufconfig.pc
 +	Makefile
 +	xerbla/Makefile])
 +AC_OUTPUT
+diff --git a/ufconfig.pc.in b/ufconfig.pc.in
+new file mode 100644
+--- /dev/null
++++ b/ufconfig.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: SuiteSparse common library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lufconfig
++Cflags: -I${includedir}
 diff --git a/xerbla/Makefile.am b/xerbla/Makefile.am
 new file mode 100644
 --- /dev/null
diff --git a/libraries/UFconfig/slack-desc b/libraries/UFconfig/slack-desc
index dc0e79b508..742596d704 100644
--- a/libraries/UFconfig/slack-desc
+++ b/libraries/UFconfig/slack-desc
@@ -10,7 +10,7 @@ UFconfig: UFconfig (SuiteSparse common library)
 UFconfig:
 UFconfig: UFconfig is a common configuration library for the SuiteSparse
 UFconfig: family of sparse matrix packages, including SuiteSparseQR, AMD,
-UFconfig: COLAMD, CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio,
+UFconfig: CAMD, COLAMD, CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio,
 UFconfig: and UMFPACK.
 UFconfig:
 UFconfig: