[gnome-desktop-testing] Use standalone libgsystem

[Colin Walters <walters src gnome org>]

commit da5616e4405380ba8ee3189eb34840a3a5281304
Author: Colin Walters <walters verbum org>
Date:   Sat Feb 8 04:27:36 2014 -0500

    Use standalone libgsystem
    
    See https://git.gnome.org/browse/libgsystem/commit/?id=9363cfc28ede912e2f06d4ccb42a646bb8a4bd2e

 .gitmodules       |    3 ---
 Makefile-tests.am |    6 +++---
 Makefile.am       |    6 ------
 autogen.sh        |    8 --------
 configure.ac      |   13 +------------
 src/libgsystem    |    1 -
 6 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 239edfc..02585f1 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -17,6 +17,6 @@
 
 bin_PROGRAMS += gnome-desktop-testing-runner
 gnome_desktop_testing_runner_SOURCES = src/gnome-desktop-testing-runner.c
-gnome_desktop_testing_runner_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libgsystem
-gnome_desktop_testing_runner_CFLAGS = $(SYSTEMD_JOURNAL_CFLAGS) $(GIO_UNIX_CFLAGS)
-gnome_desktop_testing_runner_LDADD =  $(SYSTEMD_JOURNAL_LIBS) $(GIO_UNIX_LIBS) libgsystem.la
+gnome_desktop_testing_runner_CPPFLAGS = $(AM_CPPFLAGS)
+gnome_desktop_testing_runner_CFLAGS = $(BUILDDEP_GDT_CFLAGS)
+gnome_desktop_testing_runner_LDADD = $(BUILDDEP_GDT_LIBS)
diff --git a/Makefile.am b/Makefile.am
index 1c5c1c9..9f2b080 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,12 +35,6 @@ privlib_LTLIBRARIES =
 privlib_DATA =
 INSTALL_DATA_HOOKS =
 
-libgsystem_srcpath := src/libgsystem
-libgsystem_cflags = $(GIO_UNIX_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) -I$(srcdir)/src/libgsystem
-libgsystem_libs = $(GIO_UNIX_LIBS) $(SYSTEMD_JOURNAL_LIBS)
-include src/libgsystem/Makefile-libgsystem.am
-privlib_LTLIBRARIES += libgsystem.la
-
 include Makefile-tests.am
 
 install-data-hook: $(INSTALL_DATA_HOOKS)
diff --git a/autogen.sh b/autogen.sh
index 348b6c9..83779c7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,14 +16,6 @@ fi
 
 mkdir -p m4
 
-# Fetch submodules if needed
-if test ! -f src/libgsystem/README;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-  git submodule update
-fi
-
 autoreconf --force --install --verbose
 
 cd $olddir
diff --git a/configure.ac b/configure.ac
index f821037..f72fd79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,20 +27,9 @@ AC_SUBST(WARN_CFLAGS)
 LT_PREREQ([2.2.4])
 LT_INIT([disable-static])
 
-PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0])
+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-journal >= 200], 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
 ])