[gnome-desktop-testing] configure: Add back missing check for ENABLE_SYSTEMD_JOURNAL



commit 069fdf5cf9423ff1b1c32e02840e0c6a867f250b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri May 23 18:13:37 2014 -0400

    configure: Add back missing check for ENABLE_SYSTEMD_JOURNAL
    
    This was accidentally removed in da5616e.

 Makefile-tests.am |    4 ++--
 configure.ac      |   11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 02585f1..9af4f7d 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -18,5 +18,5 @@
 bin_PROGRAMS += gnome-desktop-testing-runner
 gnome_desktop_testing_runner_SOURCES = src/gnome-desktop-testing-runner.c
 gnome_desktop_testing_runner_CPPFLAGS = $(AM_CPPFLAGS)
-gnome_desktop_testing_runner_CFLAGS = $(BUILDDEP_GDT_CFLAGS)
-gnome_desktop_testing_runner_LDADD = $(BUILDDEP_GDT_LIBS)
+gnome_desktop_testing_runner_CFLAGS = $(BUILDDEP_GDT_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
+gnome_desktop_testing_runner_LDADD = $(BUILDDEP_GDT_LIBS) $(SYSTEMD_JOURNAL_LIBS)
diff --git a/configure.ac b/configure.ac
index f72fd79..40d5241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,17 @@ LT_INIT([disable-static])
 PKG_CHECK_MODULES(BUILDDEP_GDT, [gio-unix-2.0 >= 2.34.0 libgsystem])
 GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
 
+AC_ARG_WITH(systemd-journal,
+           AS_HELP_STRING([--without-systemd-journal], [Use systemd @<:@default=auto@:>@]),
+           [], [with_systemd_journal=auto])
+AS_IF([test x$with_systemd_journal != xno], [
+  PKG_CHECK_MODULES([SYSTEMD_JOURNAL], [libsystemd], have_systemd_journal=yes, have_systemd_journal=no)
+  ])
+AM_CONDITIONAL(ENABLE_SYSTEMD_JOURNAL, test x$have_systemd_journal = xyes)
+AS_IF([test x$have_systemd_journal = xyes], [
+  AC_DEFINE([ENABLE_SYSTEMD_JOURNAL],[1],[Define if you want to build with systemd journal support])
+])
+
 AC_CONFIG_FILES([
 Makefile
 ])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]