[gnome-ostree] Move integration over to gnome-ostree-integration git module

[Colin Walters <walters src gnome org>]

commit 2a2a70d149107e7651bfdf0bf255ea82c1e31f4d
Author: Colin Walters <walters verbum org>
Date:   Sun Sep 23 22:11:50 2012 -0400

    Move integration over to gnome-ostree-integration git module
    
    The issue is that if we try to "git submodule the world" in here,
    we'll face a recursion problem if we build the integration from here
    too.
    
    So split it out.

 Makefile-integration.am       |   43 --------------------------------------
 Makefile.am                   |    1 -
 configure.ac                  |    5 ----
 gnomeos-3.6.json              |   11 +---------
 src/integration/lib-group     |   46 -----------------------------------------
 src/integration/lib-passwd    |   25 ----------------------
 src/integration/os-release.in |    5 ----
 7 files changed, 1 insertions(+), 135 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 65e4203..963bff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,6 @@ privlib_LTLIBRARIES =
 INSTALL_DATA_HOOKS =
 
 include Makefile-ostbuild.am
-include Makefile-integration.am
 
 install-data-hook: $(INSTALL_DATA_HOOKS)
 
diff --git a/configure.ac b/configure.ac
index 8e5a01b..67db4a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,11 +25,6 @@ AC_ARG_ENABLE(buildsystem,
 	    enable_buildsystem=yes)
 AM_CONDITIONAL(BUILDSYSTEM, test x$enable_buildsystem != xno)
 
-AC_ARG_ENABLE(system-integration,
-	    AS_HELP_STRING([--enable-system-integration], [Install integration for target system]),,
-	    enable_system_integration=no)
-AM_CONDITIONAL(SYSTEM_INTEGRATION, test x$enable_system_integration != xno)
-
 AC_CONFIG_FILES([
 Makefile
 ])
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 9a2b60c..5e58f22 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -656,16 +656,7 @@
 		 "config-opts": ["--disable-documentation",
 		                 "--with-soup-gnome"]},
 
-		{"src": "gnome:gnome-ostree",
-		 "name": "gnome-ostree-integration",
-		 "config-opts": ["--disable-buildsystem",
-		                 "--enable-system-integration"]},
-
-		{"src": "gnome:gnome-ostree",
-		 "name": "gnome-ostree-buildsystem",
-		 "component": "devel",
-		 "config-opts": ["--enable-buildsystem",
-		                 "--disable-system-integration"]},
+		{"src": "gnome:gnome-ostree-integration"},
 
 		{"src": "fd-gstreamer:gstreamer",
 		 "name": "gstreamer-0.10",