Author: abrander
Date: 2011-04-13 23:05:53 +0200 (Wed, 13 Apr 2011)
New Revision: 3992
Modified:
trunk/configure.in
trunk/librawstudio/Makefile.am
trunk/plugins/lensfun/Makefile.am
trunk/src/Makefile.am
Log:
Made lensfun requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 20:35:12 UTC (rev 3991)
+++ trunk/configure.in 2011-04-13 21:05:53 UTC (rev 3992)
@@ -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 lensfun libcurl flickcurl libssl libgphoto2 x11"
+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_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -92,6 +92,10 @@
AC_SUBST(SQLITE3_CFLAGS)
AC_SUBST(SQLITE3_LIBS)
+PKG_CHECK_MODULES(LENSFUN, [lensfun])
+AC_SUBST(LENSFUN_CFLAGS)
+AC_SUBST(LENSFUN_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 20:35:12 UTC (rev 3991)
+++ trunk/librawstudio/Makefile.am 2011-04-13 21:05:53 UTC (rev 3992)
@@ -8,7 +8,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@
+ @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@
library_includedir=$(includedir)/@PACKAGE@-@VERSION@/
library_include_HEADERS = rawstudio.h rs-types.h rs-macros.h \
@@ -112,7 +112,7 @@
rs-gui-functions.c rs-gui-functions.h \
rs-stock.c rs-stock.h
-librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ $(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ @LENSFUN_LIBS@
$(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
Modified: trunk/plugins/lensfun/Makefile.am
===================================================================
--- trunk/plugins/lensfun/Makefile.am 2011-04-13 20:35:12 UTC (rev 3991)
+++ trunk/plugins/lensfun/Makefile.am 2011-04-13 21:05:53 UTC (rev 3992)
@@ -10,7 +10,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -18,7 +18,7 @@
libdir = $(datadir)/rawstudio/plugins/
-lensfun_la_LIBADD = @PACKAGE_LIBS@ lensfun-avx.lo lensfun-sse2.lo lensfun-c.lo
+lensfun_la_LIBADD = @PACKAGE_LIBS@ @LENSFUN_LIBS@ lensfun-avx.lo
lensfun-sse2.lo lensfun-c.lo
lensfun_la_LDFLAGS = -module -avoid-version
lensfun_la_SOURCES = lensfun-version.c lensfun-version.h
EXTRA_DIST = lensfun-avx.c lensfun-sse2.c lensfun.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-04-13 20:35:12 UTC (rev 3991)
+++ trunk/src/Makefile.am 2011-04-13 21:05:53 UTC (rev 3992)
@@ -3,7 +3,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -47,5 +47,5 @@
rs-tag-gui.c rs-tag-gui.h\
rs-tethered-shooting.c rs-tethered-shooting.h
-rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
$(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@LENSFUN_LIBS@ $(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
