summaryrefslogtreecommitdiff
path: root/libraries/AMD/autotoolize.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/AMD/autotoolize.diff')
-rw-r--r--libraries/AMD/autotoolize.diff54
1 files changed, 43 insertions, 11 deletions
diff --git a/libraries/AMD/autotoolize.diff b/libraries/AMD/autotoolize.diff
index 1bc7eeefec..2b83e03f0d 100644
--- a/libraries/AMD/autotoolize.diff
+++ b/libraries/AMD/autotoolize.diff
@@ -3,7 +3,7 @@ new file mode 100644
--- /dev/null
+++ b/Demo/Makefile.am
@@ -0,0 +1,54 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
+LDADD = $(top_builddir)/Source/libamd.la
+
+EXTRA_DIST = \
@@ -75,20 +75,29 @@ new file mode 100644
+
+clean-local:
+ -$(RM) *.aux *.bbl *.blg *.log *.toc
+diff --git a/Include/Makefile.am b/Include/Makefile.am
+new file mode 100644
+--- /dev/null
++++ b/Include/Makefile.am
+@@ -0,0 +1,2 @@
++pkgincludedir = $(includedir)/amd
++pkginclude_HEADERS = amd.h amd_internal.h
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,3 @@
-+SUBDIRS = Source Demo Doc
+@@ -0,0 +1,5 @@
++SUBDIRS = Include Source Demo Doc
+EXTRA_DIST = README.txt
-+include_HEADERS = Include/amd.h Include/amd_internal.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = amd.pc
diff --git a/Source/Makefile.am b/Source/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Source/Makefile.am
@@ -0,0 +1,33 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
+
+AMDSRC = \
+ amd_1.c \
@@ -117,17 +126,34 @@ new file mode 100644
+
+libamd_la_SOURCES = amd_global.c
+libamd_la_LIBADD = libamdl.la libamdi.la
-+libamd_la_LDFLAGS = -no-undefined -version-info 4:1:2
++libamd_la_LDFLAGS = -no-undefined -version-info 4:2:2
+
+libamdf77_la_SOURCES = amd.f amdbar.f
-+libamdf77_la_LDFLAGS = -no-undefined -version-info 4:1:2
++libamdf77_la_LDFLAGS = -no-undefined -version-info 4:2:2
+diff --git a/amd.pc.in b/amd.pc.in
+new file mode 100644
+--- /dev/null
++++ b/amd.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: Approximate minimum degree ordering
++Version: @PACKAGE_VERSION@
++Requires.private: ufconfig
++Libs: -L${libdir} -lamd
++Libs.private: -lm
++Cflags: -I${includedir}/amd
diff --git a/configure.ac b/configure.ac
new file mode 100644
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,30 @@
-+AC_PREREQ([2.65])
-+AC_INIT([AMD], [2.2.1], [davis@cise.ufl.edu])
+@@ -0,0 +1,36 @@
++AC_PREREQ([2.68])
++AC_INIT([AMD],[2.2.2],[davis@cise.ufl.edu])
+AC_CONFIG_SRCDIR([Source/amd_global.c])
+AC_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign])
@@ -142,7 +168,11 @@ new file mode 100644
+AC_CHECK_LIB([m], [sqrt])
+
+AC_CHECK_HEADERS([limits.h stddef.h stdlib.h])
-+AC_CHECK_HEADERS([UFconfig.h])
++
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([UFCONFIG],[ufconfig],
++ [],
++ [AC_MSG_ERROR([cannot find ufconfig])])
+
+AC_TYPE_SIZE_T
+
@@ -151,8 +181,10 @@ new file mode 100644
+LIBS=$LIBS_SAVED
+
+AC_CONFIG_FILES([
++ amd.pc
+ Makefile
+ Demo/Makefile
+ Doc/Makefile
++ Include/Makefile
+ Source/Makefile])
+AC_OUTPUT