diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gdbusxx/gdbusxx.am | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 163018d7..125d0286 100644 --- a/configure.ac +++ b/configure.ac @@ -449,7 +449,7 @@ AC_ARG_WITH([gio-gdbus], [with_gio_gdbus="no"])) AM_CONDITIONAL([COND_GIO_GDBUS], [test "x$with_gio_gdbus" = "xyes"]) AS_IF([test "x$with_gio_gdbus" = "xyes"], [need_glib=yes - PKG_CHECK_MODULES([GIO_GDBUS], [gio-2.0 >= 2.26]) + PKG_CHECK_MODULES([DBUS], [gio-2.0 >= 2.26]) AC_DEFINE([WITH_GIO_GDBUS],[],[Set if using GIO GDBus])]) PKG_CHECK_MODULES(KEYRING, [gnome-keyring-1], HAVE_KEYRING=yes, HAVE_KEYRING=no) diff --git a/src/gdbusxx/gdbusxx.am b/src/gdbusxx/gdbusxx.am index fb2a9b24..8f9bfd97 100644 --- a/src/gdbusxx/gdbusxx.am +++ b/src/gdbusxx/gdbusxx.am @@ -11,13 +11,13 @@ src_gdbusxx_libgdbussyncevo_la_SOURCES = \ src/gdbusxx/gdbus-cxx.h src_gdbusxx_libgdbussyncevo_la_LDFLAGS = $(src_gdbus_version_info) -src_gdbusxx_libgdbussyncevo_la_LIBADD = @GLIB_LIBS@ @GIO_GDBUS_LIBS@ -src_gdbusxx_libgdbussyncevo_la_CXXFLAGS = @GLIB_CFLAGS@ @GIO_GDBUS_CFLAGS@ +src_gdbusxx_libgdbussyncevo_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) +src_gdbusxx_libgdbussyncevo_la_CXXFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) MAINTAINERCLEANFILES += Makefile.in noinst_PROGRAMS += src/gdbusxx/example src_gdbusxx_example_SOURCES = src/gdbusxx/test/example.cpp src_gdbusxx_example_CPPFLAGS = -I$(top_srcdir)/src/gdbusxx/ -src_gdbusxx_example_CXXFLAGS = @GLIB_CFLAGS@ @GIO_GDBUS_CFLAGS@ -src_gdbusxx_example_LDADD = src/gdbusxx/libgdbussyncevo.la @GLIB_LIBS@ @GIO_GDBUS_LIBS@ +src_gdbusxx_example_CXXFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) +src_gdbusxx_example_LDADD = src/gdbusxx/libgdbussyncevo.la $(GLIB_LIBS) $(DBUS_LIBS) |