[libfann] 123/133: Properly extend autotools setup for libm

[Christian Kastner]

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch master
in repository libfann.

commit ff48decf091ee0cd04479cdba2f698e1a3d0d88a
Author: Christian Kastner <debian at kvr.at>
Date:   Wed Apr 23 02:15:38 2014 +0200

    Properly extend autotools setup for libm
    
    The previous solution was a quick-and-dirty hack which is incompatible with
    autoreconf.
---
 debian/patches/0002-Link-against-libm.patch | 48 +++++++++++++++++------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/debian/patches/0002-Link-against-libm.patch b/debian/patches/0002-Link-against-libm.patch
index 02dc834..ff01a9e 100644
--- a/debian/patches/0002-Link-against-libm.patch
+++ b/debian/patches/0002-Link-against-libm.patch
@@ -3,26 +3,34 @@ Date: Fri, 4 Jun 2010 23:28:23 +0200
 Subject: [PATCH] Link against libm
 
 Upstream's autotools setup does not detect if linking against libm is
-necessary. The easiest solution for Debian is to include a small fix in
-Makefile.in.
+necessary, so we extend it to do that.
 
 Forwarded: no
-Last-Update: 2010-06-04
----
- src/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+Last-Update: 2014-04-23
 
-diff --git a/src/Makefile.in b/src/Makefile.in
-index cae862d..4955804 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -124,7 +124,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lm
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
--- 
+Index: libfann-2.1.0~beta~dfsg/configure.in
+===================================================================
+--- libfann-2.1.0~beta~dfsg.orig/configure.in	2014-04-23 02:04:47.842914729 +0200
++++ libfann-2.1.0~beta~dfsg/configure.in	2014-04-23 02:04:47.838914838 +0200
+@@ -6,5 +6,7 @@
+ AC_HEADER_STDC
+ AC_C_CONST
+ AC_HEADER_TIME
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+ AC_CHECK_FUNCS(gettimeofday)
+ AC_OUTPUT(Makefile src/Makefile src/include/Makefile fann.pc fann.spec)
+Index: libfann-2.1.0~beta~dfsg/src/Makefile.am
+===================================================================
+--- libfann-2.1.0~beta~dfsg.orig/src/Makefile.am	2014-04-23 02:04:47.842914729 +0200
++++ libfann-2.1.0~beta~dfsg/src/Makefile.am	2014-04-23 02:04:47.838914838 +0200
+@@ -10,4 +10,9 @@
+ libfixedfann_la_SOURCES = fixedfann.c
+ libfann_la_SOURCES = floatfann.c
+ 
++libfloatfann_la_LIBADD = $(LIBM)
++libdoublefann_la_LIBADD = $(LIBM)
++libfixedfann_la_LIBADD = $(LIBM)
++libfann_la_LIBADD = $(LIBM)
++
+ EXTRA_DIST = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git