Adapated cblas patch to respect upstream policy about pkg-config, fixing tests (bug #370317)

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

3 files changed, 104 insertions, 93 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 1238fd416976..d92ffad5acff 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.81 2011/06/12 17:00:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.82 2011/07/28 21:29:26 bicatali Exp $
+
+  28 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  files/gsl-1.15-cblas.patch:
+  Adapated cblas patch to respect upstream policy about pkg-config, fixing
+  tests (bug #370317)
 
   12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> gsl-1.15.ebuild:
   Move to eapi4. Punt .la files. Run eselect only if really required for
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 8140fd850d3c..229365620ba6 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cblas.pc.in 290 RMD160 4fc855a67383ac17b68c29d8f10307178919e217 SHA1 ec23b2092a5498beb602c9b558af8abcf5dd6358 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1
 AUX eselect.cblas.gsl 216 RMD160 b2c3d435952eb73fcd02406fbd087176407c1f76 SHA1 814489871b93c2b4f7195fb9bbef1227e04c36cf SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7
 AUX gsl-1.13-cblas-vars.patch 403 RMD160 f2633cc65627656287909ec37e568e1cd96be138 SHA1 82715bea7524bda9c1bb49e1b9700163795d8b80 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40
 AUX gsl-1.13-cblas.patch 15524 RMD160 294638c284b5b06f12405dd834b329a0755b1edd SHA1 fa0b377a7e40a9ba660909ab369fc3a744b9ae1a SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890
 AUX gsl-1.14-cblas.patch 17218 RMD160 0e168003aa059083463f1f60a8767c920c328bef SHA1 730bedfe54c179984b43a8cee02ce3a6d3ee26b9 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d
-AUX gsl-1.15-cblas.patch 17387 RMD160 7e6606584608d27ac429b95f16d374c639d7ff46 SHA1 34a7e7e6b15d2e8b0f93c03628601f231db528f3 SHA256 4ac4b613a74575773168b729d262aea49c0cc177938a81551e8cdee2b700475f
+AUX gsl-1.15-cblas.patch 17217 RMD160 670cc31b6fda99413d96d915f619c00e4c1c9603 SHA1 4f6387982615d3606f5c2a9a39e84f1c457db5c0 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491
 DIST gsl-1.13.tar.gz 3014270 RMD160 f71507181ace425df0977a13946f12cae4b65783 SHA1 02db78b9583bc7b2a577da6f45f5dd9f23ef737e SHA256 094648a6e40854cbe006357213fb16fe3e55d048a4a4df675df36a540f8ba2c7
 DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
 DIST gsl-1.15.tar.gz 3281134 RMD160 f34aa2a6514228f7df42fc94638286bcce5cd94c SHA1 d914f84b39a5274b0a589d9b83a66f44cd17ca8e SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3
@@ -12,5 +15,12 @@ EBUILD gsl-1.13-r2.ebuild 2895 RMD160 1c0f307ce8db13d392979a9ff42fe8e8d1f9f0f8 S
 EBUILD gsl-1.14-r1.ebuild 3108 RMD160 1f80e8fea12674fd2e6078a35d79960cb3820340 SHA1 e60a8b126a7b67478a2bf0a30ef49ce6eaba2072 SHA256 59aa4c07edc6aa7d4faea2f7c84d6b179d86bc1e0f61e02e8d5887cd3d33f3ba
 EBUILD gsl-1.14.ebuild 2837 RMD160 0d2c96da12bd4de9c885b23f5638a6aec79691ea SHA1 b020646d4bf435886cdf6f36ce1ee5775a3f8128 SHA256 320a21ccd946d2bf630905767e72731098371907b8e6462f62724b45884ae37b
 EBUILD gsl-1.15.ebuild 3148 RMD160 81c077f7325ad32111036a468c06b1a74548ddb2 SHA1 b121be8b2d5e3ec59411e37f4206240cbfb35252 SHA256 b95b87501f9591046bdb2778961fc78d159dea37df6d1358451b4babfb40a141
-MISC ChangeLog 12337 RMD160 44f5c846e9e7237c6f230b206ebb582bbde4fdfa SHA1 754fd3bd40107398fae673c7b1c25038e3d7b31d SHA256 10a5a26d537d9da6f3efecd0e113031481bc9ee3a5150a85c8edf641e780ebb0
+MISC ChangeLog 12519 RMD160 5a4ff57c5f24544dc101400a6acbdbf8a37367b7 SHA1 6c1ad6eff636fb39d8a4ef6fd58ec85bd1b66c3f SHA256 b57f9706e8297777ccfd9e2659980921e1cf4e220c30486619775ce8446cb787
 MISC metadata.xml 1016 RMD160 e7cbe5d4daaf4f4d5eb1c81c4cc090bb3ee807f2 SHA1 d9f77f0a5a0ff8148d3eb27509dde65f1991a034 SHA256 a74ce60d545607bcbd1828028da835f69e19f306b6ea4957ca3555411d9894af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4x1L8ACgkQ1ycZbhPLE2CcQACeLj9Yri+HVOhxfSm3Jox9ouZp
+owMAmgLDthVQM5N23CAFpzUMu8ccodtL
+=uXfs
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
index fb67d159e247..dd402f392c17 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -1,46 +1,6 @@
-diff -Naur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
---- gsl-1.15.orig/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/Makefile.am	2011-05-21 11:49:28.000000000 +0200
-@@ -19,13 +19,12 @@
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
- 
- MINGW32_HOST = @MINGW32_HOST@
- if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS += -no-undefined
- endif
- 
-@@ -35,10 +34,10 @@
- bin_PROGRAMS = gsl-randist gsl-histogram
- 
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
- 
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
- 
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -57,6 +56,8 @@
- 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- 	-e 's|@LIBS[@]|$(LIBS)|g' \
- 	-e 's|@VERSION[@]|$(VERSION)|g'
- 
-diff -Naur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
+diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
 --- gsl-1.15.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.15/acx_cblas.m4	2011-05-21 11:49:28.000000000 +0200
++++ gsl-1.15/acx_cblas.m4	2011-07-28 22:16:03.000000000 +0100
 @@ -0,0 +1,60 @@
 +AC_DEFUN([ACX_CBLAS],[
 +  use_cblas=no
@@ -102,9 +62,9 @@ diff -Naur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
 +	AC_SUBST(CBLAS_LIBS)
 + fi
 +])
-diff -Naur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
---- gsl-1.15.orig/bspline/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/bspline/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
+--- gsl-1.15.orig/bspline/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/bspline/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,6 +12,6 @@
  
  TESTS = $(check_PROGRAMS)
@@ -113,9 +73,9 @@ diff -Naur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
 +test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
  
  test_SOURCES = test.c
-diff -Naur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
---- gsl-1.15.orig/configure.ac	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/configure.ac	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
+--- gsl-1.15.orig/configure.ac	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/configure.ac	2011-07-28 22:16:03.000000000 +0100
 @@ -190,6 +190,16 @@
    AC_CHECK_LIB(m, cos)
  fi
@@ -133,9 +93,9 @@ diff -Naur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
  dnl Remember to put a definition in acconfig.h for each of these
  AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
  #include <fenv.h>]) 
-diff -Naur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
---- gsl-1.15.orig/eigen/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/eigen/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
+--- gsl-1.15.orig/eigen/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/eigen/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -11,7 +11,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -145,9 +105,9 @@ diff -Naur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
---- gsl-1.15.orig/gsl-config.in	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/gsl-config.in	2011-05-21 11:52:29.000000000 +0200
+diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
+--- gsl-1.15.orig/gsl-config.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl-config.in	2011-07-28 22:16:03.000000000 +0100
 @@ -58,11 +58,11 @@
  	;;
  
@@ -162,25 +122,21 @@ diff -Naur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
  	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
         	;;
  
-diff -Naur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
---- gsl-1.15.orig/gsl.pc.in	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/gsl.pc.in	2011-05-21 11:53:47.000000000 +0200
-@@ -2,10 +2,9 @@
+diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
+--- gsl-1.15.orig/gsl.pc.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl.pc.in	2011-07-28 22:20:14.000000000 +0100
+@@ -2,7 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
 -GSL_CBLAS_LIB=-lgslcblas
++GSL_CBLAS_LIB=@CBLAS_LIBS@
  
  Name: GSL
  Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
--Cflags: @GSL_CFLAGS@
-+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @GSL_LIBM@ @LIBS@
-+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
-diff -Naur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
---- gsl-1.15.orig/interpolation/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/interpolation/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
+--- gsl-1.15.orig/interpolation/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/interpolation/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -190,9 +146,9 @@ diff -Naur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefi
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
---- gsl-1.15.orig/linalg/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/linalg/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
+--- gsl-1.15.orig/linalg/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/linalg/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -202,9 +158,49 @@ diff -Naur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
---- gsl-1.15.orig/multifit/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multifit/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
+--- gsl-1.15.orig/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -19,13 +19,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,10 +34,10 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+ 
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+ TESTS = test_gsl_histogram.sh pkgconfig.test
+@@ -57,6 +56,8 @@
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
+diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
+--- gsl-1.15.orig/multifit/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multifit/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -13,8 +13,8 @@
  TESTS = $(check_PROGRAMS)
  
@@ -216,9 +212,9 @@ diff -Naur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
 -#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
 +#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
  
-diff -Naur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
---- gsl-1.15.orig/multimin/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multimin/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
+--- gsl-1.15.orig/multimin/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multimin/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -13,8 +13,8 @@
  TESTS = $(check_PROGRAMS) 
  
@@ -230,9 +226,9 @@ diff -Naur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
 -#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
 +#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  
-diff -Naur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
---- gsl-1.15.orig/multiroots/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multiroots/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
+--- gsl-1.15.orig/multiroots/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multiroots/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -15,5 +15,5 @@
  TESTS = $(check_PROGRAMS)
  
@@ -240,9 +236,9 @@ diff -Naur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
 -test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
 +test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  
-diff -Naur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
---- gsl-1.15.orig/ode-initval/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/ode-initval/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
+--- gsl-1.15.orig/ode-initval/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/ode-initval/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -252,9 +248,9 @@ diff -Naur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.a
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
---- gsl-1.15.orig/poly/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/poly/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
+--- gsl-1.15.orig/poly/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/poly/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -264,9 +260,9 @@ diff -Naur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
  
  test_SOURCES = test.c
  test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-diff -Naur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
---- gsl-1.15.orig/specfunc/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/specfunc/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
+--- gsl-1.15.orig/specfunc/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/specfunc/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -276,9 +272,9 @@ diff -Naur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
  
  test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
    
-diff -Naur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
---- gsl-1.15.orig/wavelet/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/wavelet/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
+--- gsl-1.15.orig/wavelet/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/wavelet/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)