Author: abrander
Date: 2011-04-13 23:56:39 +0200 (Wed, 13 Apr 2011)
New Revision: 3999
Modified:
trunk/configure.in
trunk/plugins/denoise/Makefile.am
Log:
Made fftw3f explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 21:56:07 UTC (rev 3998)
+++ trunk/configure.in 2011-04-13 21:56:39 UTC (rev 3999)
@@ -83,7 +83,7 @@
fi
AC_SUBST(LIBTIFF)
-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 dbus-1
fftw3f libcurl flickcurl libssl x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 dbus-1
libcurl flickcurl libssl x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -108,6 +108,10 @@
AC_SUBST(EXIV2_CFLAGS)
AC_SUBST(EXIV2_LIBS)
+PKG_CHECK_MODULES(FFTW3F, [fftw3f])
+AC_SUBST(FFTW3F_CFLAGS)
+AC_SUBST(FFTW3F_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/plugins/denoise/Makefile.am
===================================================================
--- trunk/plugins/denoise/Makefile.am 2011-04-13 21:56:07 UTC (rev 3998)
+++ trunk/plugins/denoise/Makefile.am 2011-04-13 21:56:39 UTC (rev 3999)
@@ -5,7 +5,7 @@
-g3 \
-O4
-AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CXXFLAGS = $(AM_CFLAGS) @FFTW3F_CFLAGS@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -18,7 +18,7 @@
libdir = $(datadir)/rawstudio/plugins/
-denoise_la_LIBADD = @PACKAGE_LIBS@
+denoise_la_LIBADD = @PACKAGE_LIBS@ @FFTW3F_LIBS@
denoise_la_LDFLAGS = -module -avoid-version
denoise_la_SOURCES = denoise.c \
complexblock.cpp complexblock.h \
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
