Author: abrander
Date: 2011-04-14 00:02:53 +0200 (Thu, 14 Apr 2011)
New Revision: 4001
Modified:
trunk/configure.in
trunk/src/Makefile.am
Log:
Made dbus requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 22:00:13 UTC (rev 4000)
+++ trunk/configure.in 2011-04-13 22:02:53 UTC (rev 4001)
@@ -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
libcurl flickcurl libssl x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 libcurl
flickcurl libssl x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -112,6 +112,10 @@
AC_SUBST(FFTW3F_CFLAGS)
AC_SUBST(FFTW3F_LIBS)
+PKG_CHECK_MODULES(DBUS, [dbus-1])
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-04-13 22:00:13 UTC (rev 4000)
+++ trunk/src/Makefile.am 2011-04-13 22:02:53 UTC (rev 4001)
@@ -3,7 +3,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ @LIBGPHOTO2_CFLAGS@ \
+ @PACKAGE_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@ $(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@LENSFUN_LIBS@ @LIBGPHOTO2_LIBS@ @DBUS_LIBS@ $(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
