summaryrefslogtreecommitdiff
path: root/libraries/UFconfig/autotoolize.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/UFconfig/autotoolize.diff')
-rw-r--r--libraries/UFconfig/autotoolize.diff35
1 files changed, 29 insertions, 6 deletions
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