Author: abrander
Date: 2011-04-13 23:29:03 +0200 (Wed, 13 Apr 2011)
New Revision: 3995
Modified:
trunk/configure.in
trunk/plugins/colorspace-transform/Makefile.am
trunk/plugins/load-gdk/Makefile.am
Log:
Made lcms requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 21:21:17 UTC (rev 3994)
+++ trunk/configure.in 2011-04-13 21:29:03 UTC (rev 3995)
@@ -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 lcms dbus-1
exiv2 fftw3f libcurl flickcurl libssl libgphoto2 x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 dbus-1 exiv2
fftw3f libcurl flickcurl libssl libgphoto2 x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -96,6 +96,10 @@
AC_SUBST(LENSFUN_CFLAGS)
AC_SUBST(LENSFUN_LIBS)
+PKG_CHECK_MODULES(LCMS, [lcms])
+AC_SUBST(LCMS_CFLAGS)
+AC_SUBST(LCMS_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/plugins/colorspace-transform/Makefile.am
===================================================================
--- trunk/plugins/colorspace-transform/Makefile.am 2011-04-13 21:21:17 UTC
(rev 3994)
+++ trunk/plugins/colorspace-transform/Makefile.am 2011-04-13 21:29:03 UTC
(rev 3995)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LCMS_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,7 +17,7 @@
libdir = $(datadir)/rawstudio/plugins/
-colorspace_transform_la_LIBADD = @PACKAGE_LIBS@ colorspace_transform_avx.lo
colorspace_transform_sse2.lo rs-cmm.lo colorspace_transform-c.lo
+colorspace_transform_la_LIBADD = @PACKAGE_LIBS@ @LCMS_LIBS@
colorspace_transform_avx.lo colorspace_transform_sse2.lo rs-cmm.lo
colorspace_transform-c.lo
colorspace_transform_la_LDFLAGS = -module -avoid-version
colorspace_transform_la_SOURCES =
Modified: trunk/plugins/load-gdk/Makefile.am
===================================================================
--- trunk/plugins/load-gdk/Makefile.am 2011-04-13 21:21:17 UTC (rev 3994)
+++ trunk/plugins/load-gdk/Makefile.am 2011-04-13 21:29:03 UTC (rev 3995)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LCMS_CFLAGS@\
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,6 +17,6 @@
libdir = $(datadir)/rawstudio/plugins/
-load_gdk_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@
+load_gdk_la_LIBADD = @PACKAGE_LIBS@ @LCMS_LIBS@ @LIBJPEG@
load_gdk_la_LDFLAGS = -module -avoid-version
load_gdk_la_SOURCES = load-gdk.c exiv2-colorspace.cpp exiv2-colorspace.h
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
