Author: abrander
Date: 2011-04-13 23:45:39 +0200 (Wed, 13 Apr 2011)
New Revision: 3997
Modified:
trunk/configure.in
trunk/librawstudio/Makefile.am
trunk/plugins/load-gdk/Makefile.am
trunk/plugins/meta-exiv2/Makefile.am
Log:
Made exiv2 requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 21:32:29 UTC (rev 3996)
+++ trunk/configure.in 2011-04-13 21:45:39 UTC (rev 3997)
@@ -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 exiv2
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
fftw3f libcurl flickcurl libssl x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -104,6 +104,10 @@
AC_SUBST(LIBGPHOTO2_CFLAGS)
AC_SUBST(LIBGPHOTO2_LIBS)
+PKG_CHECK_MODULES(EXIV2, [exiv2])
+AC_SUBST(EXIV2_CFLAGS)
+AC_SUBST(EXIV2_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/librawstudio/Makefile.am
===================================================================
--- trunk/librawstudio/Makefile.am 2011-04-13 21:32:29 UTC (rev 3996)
+++ trunk/librawstudio/Makefile.am 2011-04-13 21:45:39 UTC (rev 3997)
@@ -3,7 +3,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-DWITH_GCONF \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ @EXIV2_CFLAGS@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -112,7 +113,7 @@
rs-gui-functions.c rs-gui-functions.h \
rs-stock.c rs-stock.h
-librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ @LENSFUN_LIBS@
$(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ @LENSFUN_LIBS@
@EXIV2_LIBS@ $(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
Modified: trunk/plugins/load-gdk/Makefile.am
===================================================================
--- trunk/plugins/load-gdk/Makefile.am 2011-04-13 21:32:29 UTC (rev 3996)
+++ trunk/plugins/load-gdk/Makefile.am 2011-04-13 21:45:39 UTC (rev 3997)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LCMS_CFLAGS@\
+ @PACKAGE_CFLAGS@ @LCMS_CFLAGS@ @EXIV2_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,6 +17,6 @@
libdir = $(datadir)/rawstudio/plugins/
-load_gdk_la_LIBADD = @PACKAGE_LIBS@ @LCMS_LIBS@ @LIBJPEG@
+load_gdk_la_LIBADD = @PACKAGE_LIBS@ @LCMS_LIBS@ @EXIV2_LIBS@ @LIBJPEG@
load_gdk_la_LDFLAGS = -module -avoid-version
load_gdk_la_SOURCES = load-gdk.c exiv2-colorspace.cpp exiv2-colorspace.h
Modified: trunk/plugins/meta-exiv2/Makefile.am
===================================================================
--- trunk/plugins/meta-exiv2/Makefile.am 2011-04-13 21:32:29 UTC (rev
3996)
+++ trunk/plugins/meta-exiv2/Makefile.am 2011-04-13 21:45:39 UTC (rev
3997)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @EXIV2_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,6 +17,6 @@
libdir = $(datadir)/rawstudio/plugins/
-meta_exiv2_la_LIBADD = @PACKAGE_LIBS@
+meta_exiv2_la_LIBADD = @PACKAGE_LIBS@ @EXIV2_LIBS@
meta_exiv2_la_LDFLAGS = -module -avoid-version
meta_exiv2_la_SOURCES = exiv2-meta.c exiv2-metadata.cpp exiv2-metadata.h
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
