Author: abrander
Date: 2011-04-14 01:46:16 +0200 (Thu, 14 Apr 2011)
New Revision: 4007
Modified:
trunk/configure.in
trunk/librawstudio/Makefile.am
trunk/src/Makefile.am
Log:
Made gconf requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 23:11:04 UTC (rev 4006)
+++ trunk/configure.in 2011-04-13 23:46:16 UTC (rev 4007)
@@ -88,6 +88,10 @@
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.0])
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
PKG_CHECK_MODULES(SQLITE3, [sqlite3])
AC_SUBST(SQLITE3_CFLAGS)
AC_SUBST(SQLITE3_LIBS)
Modified: trunk/librawstudio/Makefile.am
===================================================================
--- trunk/librawstudio/Makefile.am 2011-04-13 23:11:04 UTC (rev 4006)
+++ trunk/librawstudio/Makefile.am 2011-04-13 23:46:16 UTC (rev 4007)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ @LIBCURL_CFLAGS@
+ @PACKAGE_CFLAGS@ @GCONF_CFLAGS@ @LENSFUN_CFLAGS@ @LIBCURL_CFLAGS@
library_includedir=$(includedir)/@PACKAGE@-@VERSION@/
library_include_HEADERS = rawstudio.h rs-types.h rs-macros.h \
@@ -113,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@
@EXIV2_LIBS@ @LIBCURL_LIBS@ $(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @GCONF_LIBS@ @SQLITE3_LIBS@
@LENSFUN_LIBS@ @EXIV2_LIBS@ @LIBCURL_LIBS@ $(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-04-13 23:11:04 UTC (rev 4006)
+++ trunk/src/Makefile.am 2011-04-13 23:46:16 UTC (rev 4007)
@@ -3,7 +3,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ @LIBGPHOTO2_CFLAGS@ @DBUS_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @GCONF_CFLAGS@ @LENSFUN_CFLAGS@ @LIBGPHOTO2_CFLAGS@
@DBUS_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@
@LENSFUN_LIBS@ @LIBGPHOTO2_LIBS@ @DBUS_LIBS@ $(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@GCONF_LIBS@ @LENSFUN_LIBS@ @LIBGPHOTO2_LIBS@ @DBUS_LIBS@ $(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
