[nfft] 07/16: d/rules: detect long-double availability with pkg-config.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository nfft.

commit d8a06e1a7f08485e5cbb88b11493e6d00647fad2
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 11 14:02:15 2016 +0100

    d/rules: detect long-double availability with pkg-config.
---
 debian/rules | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3c36165..7f4b328 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,9 @@ COMMON_BUILD_OPTIONS = \
 	--enable-all \
 	--enable-openmp
 
-# Environment information.
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 # Detect whether the long-double version of the FFTW library is available for
-# the host architecture. If positive, support for the long-double precision of
-# the NFFT library will be enabled.
-SYSTEM_FFTWL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
+# the host architecture.
+HAVE_FFTWL ?= $(shell pkg-config --exists fftw3l && echo 'yes')
 
 %:
 	dh $@ --parallel --with autoreconf \
@@ -32,7 +27,7 @@ SYSTEM_FFTWL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
 override_dh_auto_clean:
 	dh_auto_clean --arch --builddirectory=build-nfft
 	dh_auto_clean --arch --builddirectory=build-nfftf
-ifneq "" "$(SYSTEM_FFTWL)"
+ifneq (,$(HAVE_FFTWL))
 	dh_auto_clean --arch --builddirectory=build-nfftl
 endif
 
@@ -45,7 +40,7 @@ override_dh_auto_configure-arch:
 		--disable-doxygen-doc \
 		--enable-single \
 		--program-suffix=f
-ifneq "" "$(SYSTEM_FFTWL)"
+ifneq (,$(HAVE_FFTWL))
 	dh_auto_configure --builddirectory=build-nfftl -- \
 		$(COMMON_BUILD_OPTIONS) \
 		--disable-doxygen-doc \
@@ -61,7 +56,7 @@ override_dh_auto_configure-indep:
 override_dh_auto_build-arch:
 	dh_auto_build --arch --builddirectory=build-nfft
 	dh_auto_build --arch --builddirectory=build-nfftf
-ifneq "" "$(SYSTEM_FFTWL)"
+ifneq (,$(HAVE_FFTWL))
 	dh_auto_build --arch --builddirectory=build-nfftl
 endif
 
@@ -73,7 +68,7 @@ override_dh_auto_install-arch:
 		--package=libnfft3-double2
 	dh_auto_install --arch --builddirectory=build-nfftf \
 		--package=libnfft3-single2
-ifneq "" "$(SYSTEM_FFTWL)"
+ifneq (,$(HAVE_FFTWL))
 	dh_auto_install --arch --builddirectory=build-nfftl \
 		--package=libnfft3-long2
 endif
@@ -86,7 +81,7 @@ ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 #
 # https://github.com/NFFT/nfft/issues/17.
 	#dh_auto_test --builddirectory=build-nfftf
-#ifneq "" "$(SYSTEM_FFTWL)"
+#ifneq (,$(HAVE_FFTWL))
 #	dh_auto_test --builddirectory=build-nfftl
 #endif
 endif

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