[ostree] build: Remove --enable-embedded-dependencies

[Colin Walters <walters src gnome org>]

commit 32663a5a5041cabcca8cda04c5f4575fab64e394
Author: Colin Walters <walters verbum org>
Date:   Tue Apr 22 09:08:35 2014 -0400

    build: Remove --enable-embedded-dependencies
    
    This is going to bitrot too much; we'll figure out a better way to do
    this when someone if a RHEL6 port ever happens.  Probably Software
    Collections.

 Makefile.am                              |   27 ----------
 configure.ac                             |   47 +++++++-----------
 embedded-dependencies/Makefile.am        |   78 ------------------------------
 embedded-dependencies/Makefile.bootstrap |    3 -
 embedded-dependencies/README             |   19 -------
 5 files changed, 18 insertions(+), 156 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a9bdb11..0bbae61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,6 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
 AM_CFLAGS += $(WARN_CFLAGS)
 DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
 
-if BUILD_EMBEDDED_DEPENDENCIES
-SUBDIRS += embedded-dependencies
-endif
-
 SUBDIRS += .
 
 if ENABLE_GTK_DOC
@@ -37,33 +33,10 @@ endif
 
 EXTRA_DIST += autogen.sh COPYING README.md
 
-if BUILD_EMBEDDED_DEPENDENCIES
-OT_INTERNAL_GIO_UNIX_CFLAGS = \
-       -I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/glib-2.0 \
-       -I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/gio-unix-2.0 \
-       -I$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/glib-2.0/include \
-       $(NULL)
-OT_INTERNAL_GIO_UNIX_LIBS = \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libglib-2.0.so \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgthread-2.0.so \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgmodule-2.0.so \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgobject-2.0.so \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgio-2.0.so \
-       $(NULL)
-OT_INTERNAL_SOUP_CFLAGS = \
-       $(OT_INTERNAL_GIO_UNIX_CFLAGS) \
-       -I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/libsoup-2.4 \
-       $(NULL)
-OT_INTERNAL_SOUP_LIBS = \
-       $(OT_INTERNAL_GIO_UNIX_LIBS) \
-       $(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libsoup-2.4.so \
-       $(NULL)
-else
 OT_INTERNAL_GIO_UNIX_CFLAGS = $(OT_DEP_GIO_UNIX_CFLAGS)
 OT_INTERNAL_GIO_UNIX_LIBS = $(OT_DEP_GIO_UNIX_LIBS)
 OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS)
 OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS)
-endif
 
 if BUILDOPT_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
diff --git a/configure.ac b/configure.ac
index 0d3d34c..f5322ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,37 +42,28 @@ AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from l
 
 PKG_PROG_PKG_CONFIG
 
-AC_ARG_ENABLE(embedded-dependencies,
-           AS_HELP_STRING([--enable-embedded-dependencies], [Use embedded GLib and libsoup copies]),,
-           enable_embedded_dependencies=no)
-AM_CONDITIONAL(BUILD_EMBEDDED_DEPENDENCIES, test x$enable_embedded_dependencies = xyes)
-AS_IF([test x$enable_embedded_dependencies = xyes], [
-  echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
-  with_soup=yes
-], [
-  GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
-  PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
-
-  SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
-  AC_ARG_WITH(soup,
+GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
+PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
+
+SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
+AC_ARG_WITH(soup,
            AS_HELP_STRING([--with-soup], [Use libsoup @<:@default=yes@:>@]),
            [], [with_soup=check])
-  AS_IF([test x$with_soup != xno ], [
-    AC_MSG_CHECKING([for $SOUP_DEPENDENCY])
-    PKG_CHECK_EXISTS($SOUP_DEPENDENCY, have_soup=yes, have_soup=no)
-    AC_MSG_RESULT([$have_soup])
+AS_IF([test x$with_soup != xno ], [
+  AC_MSG_CHECKING([for $SOUP_DEPENDENCY])
+  PKG_CHECK_EXISTS($SOUP_DEPENDENCY, have_soup=yes, have_soup=no)
+  AC_MSG_RESULT([$have_soup])
     AS_IF([ test x$have_soup = xno && test x$with_soup != xcheck], [
        AC_MSG_ERROR([libsoup is enabled but could not be found])
-    ])
-    AS_IF([test x$have_soup = xyes], [
-       PKG_CHECK_MODULES(OT_DEP_SOUP, $SOUP_DEPENDENCY)
-        AC_DEFINE(HAVE_LIBSOUP, 1, [Define if we have libsoup.pc])
-       with_soup=yes
-    ], [
-       with_soup=no
-    ])
-  ], [ with_soup=no ])
-])
+  ])
+  AS_IF([test x$have_soup = xyes], [
+    PKG_CHECK_MODULES(OT_DEP_SOUP, $SOUP_DEPENDENCY)
+    AC_DEFINE(HAVE_LIBSOUP, 1, [Define if we have libsoup.pc])
+    with_soup=yes
+  ], [
+    with_soup=no
+  ])
+], [ with_soup=no ])
 if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libsoup"; fi
 AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
 
@@ -201,7 +192,6 @@ AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
 
 AC_CONFIG_FILES([
 Makefile
-embedded-dependencies/Makefile
 doc/Makefile
 src/libostree/ostree-1.pc
 ])
@@ -212,7 +202,6 @@ echo "
     ===============
 
 
-    embedded dependencies:                        $enable_embedded_dependencies
     introspection:                                $found_introspection
     libsoup (retrieve remote HTTP repositories):  $with_soup
     SELinux:                                      $with_selinux