Author: abrander
Date: 2011-04-13 22:12:28 +0200 (Wed, 13 Apr 2011)
New Revision: 3988
Modified:
trunk/configure.in
trunk/librawstudio/Makefile.am
Log:
Made sqlite3 requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 19:30:06 UTC (rev 3987)
+++ trunk/configure.in 2011-04-13 20:12:28 UTC (rev 3988)
@@ -83,11 +83,15 @@
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 sqlite3 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 lensfun libcurl flickcurl libssl libgphoto2 x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+PKG_CHECK_MODULES(SQLITE3, [sqlite3])
+AC_SUBST(SQLITE3_CFLAGS)
+AC_SUBST(SQLITE3_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 19:30:06 UTC (rev 3987)
+++ trunk/librawstudio/Makefile.am 2011-04-13 20:12:28 UTC (rev 3988)
@@ -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@ @LIBJPEG@ @LIBTIFF@ $(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@ @LIBTIFF@ @SQLITE3_LIBS@
$(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
