[nip2] Remember to link with fftw3

[Benjamin Gilbert]

commit 4865006cb1f4c33ee820e19d89e1c4ae075fd31e
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Mon Dec 29 18:07:28 2014 -0500

    Remember to link with fftw3

 nip2-7.42.0-fix-fftw3-link.patch |   59 ++++++++++++++++++++++++++++++++++++++
 nip2.spec                        |    3 ++
 2 files changed, 62 insertions(+), 0 deletions(-)
---
diff --git a/nip2-7.42.0-fix-fftw3-link.patch b/nip2-7.42.0-fix-fftw3-link.patch
new file mode 100644
index 0000000..c71d71f
--- /dev/null
+++ b/nip2-7.42.0-fix-fftw3-link.patch
@@ -0,0 +1,59 @@
+diff --git a/configure.ac b/configure.ac
+index 3a92253..df58da1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,8 +238,6 @@ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(geteuid getcwd getpwnam getrlimit getpwent getwd putenv regcomp strcspn strspn strstr)
+ 
+ # need fftw so we load and unload wisdom on startup/shutdown
+-# no need to add to libs (pkg-config will do this for us when we ask for vips)
+-# we do need to add to CFLAGS though
+ AC_ARG_WITH([fftw3], AS_HELP_STRING([--without-fftw3], [build without fftw3 (default: test)]))
+ 
+ if test "x$with_fftw3" != "xno"; then
+@@ -250,7 +248,8 @@ if test "x$with_fftw3" != "xno"; then
+     [AC_MSG_WARN([fftw3 not found; disabling fftw support])
+      with_fftw3=no
+     ])
+-  IP_CFLAGS="$FFTW_INCLUDES $FFTW3_CFLAGS $IP_CFLAGS"
++  IP_CFLAGS="$FFTW3_INCLUDES $FFTW3_CFLAGS $IP_CFLAGS"
++  IP_LIBS="$FFTW3_LIBS $IP_LIBS"
+ fi
+ 
+ # optional ... use libgoffice to draw plots
+@@ -267,7 +266,7 @@ if test "x$with_libgoffice" != "xno"; then
+     [AC_MSG_WARN([libgoffice not found; disabling plot display])
+      with_libgoffice=no
+     ])
+-  IP_CFLAGS="$LIBGOFFICE_CFLAGS $IP_CFLAGS"
++  IP_CFLAGS="$LIBGOFFICE_CFLAGS $LIBGOFFICE_INCLUDES $IP_CFLAGS"
+   IP_LIBS="$LIBGOFFICE_LIBS $IP_LIBS"
+ fi
+ 
+@@ -282,7 +281,7 @@ if test "x$with_libgsf" != "xno"; then
+     [AC_MSG_WARN([libgsf not found; disabling save plot to file])
+      with_libgsf=no
+     ])
+-  IP_CFLAGS="$LIBGSF_CFLAGS $IP_CFLAGS"
++  IP_CFLAGS="$LIBGSF_CFLAGS $LIBGSF_INCLUDES $IP_CFLAGS"
+   IP_LIBS="$LIBGSF_LIBS $IP_LIBS"
+ fi
+ 
+@@ -300,7 +299,7 @@ if test "x$with_libgvc" != "xno"; then
+     [AC_MSG_WARN([libgvc not found; disabling workspace dep graph display])
+      with_libgvc=no
+     ])
+-  IP_CFLAGS="$LIBGVC_CFLAGS $IP_CFLAGS"
++  IP_CFLAGS="$LIBGVC_CFLAGS $LIBGVC_INCLUDES $IP_CFLAGS"
+   IP_LIBS="$LIBGVC_LIBS $IP_LIBS"
+ fi
+ 
+@@ -315,7 +314,7 @@ if test "x$with_gsl" != "xno"; then
+     [AC_MSG_WARN([gsl not found; disabling extra numerical functions])
+      with_gsl=no
+     ])
+-  IP_CFLAGS="$GSL_CFLAGS $IP_CFLAGS"
++  IP_CFLAGS="$GSL_CFLAGS $GSL_INCLUDES $IP_CFLAGS"
+   IP_LIBS="$GSL_LIBS $IP_LIBS"
+ fi
+ 
diff --git a/nip2.spec b/nip2.spec
index db63794..5106dd6 100644
--- a/nip2.spec
+++ b/nip2.spec
@@ -10,6 +10,8 @@ Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://www.vips.ecs.soton.ac.uk/
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/%{nip2_version_base}/%{name}-%{version}.tar.gz
+# Upstream commit 85a476bb
+Patch0:		nip2-7.42.0-fix-fftw3-link.patch
 
 BuildRequires:	pkgconfig(vips)
 BuildRequires:	pkgconfig(gtk+-2.0)
@@ -40,6 +42,7 @@ GIMP should be used instead.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build