[Cogl] [PATCH 4/4] check cogl-pango after glib to implicitly disable without glib

[Robert Bragg]

From: Robert Bragg <robert at linux.intel.com>

---
 configure.ac |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index cb5a5bc..03e2291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,23 +403,6 @@ AS_IF(
   ]
 )
 
-
-dnl     ============================================================
-dnl     Should cogl-pango be built?
-dnl     ============================================================
-
-AC_ARG_ENABLE(
-  [cogl-pango],
-  [AC_HELP_STRING([--enable-cogl-pango=@<:@no/yes@:>@], [Enable pango support @<:@default=yes@:>@])],
-  [],
-  enable_cogl_pango=yes
-)
-AS_IF([test "x$enable_cogl_pango" = "xyes"],
-      [
-	COGL_PANGO_PKG_REQUIRES="$COGL_PANGO_PKG_REQUIRES pangocairo >= pangocairo_req_version"
-      ]
-)
-
 dnl     ============================================================
 dnl     Should examples be installed?
 dnl     ============================================================
@@ -1063,6 +1046,31 @@ AS_IF([test "x$enable_glib" = "xyes"],
       ]
 )
 
+dnl     ============================================================
+dnl     Should cogl-pango be built?
+dnl     ============================================================
+
+AS_IF([test "x$enable_glib" != "xyes"],
+      [
+        AS_IF([test "x$enable_cogl_pango" = "xyes"],
+              AC_MSG_ERROR([--enable-cogl-pango conflicts with --disable-glib]))
+        enable_cogl_pango=no
+      ]
+)
+
+AC_ARG_ENABLE(
+  [cogl-pango],
+  [AC_HELP_STRING([--enable-cogl-pango=@<:@no/yes@:>@], [Enable pango support @<:@default=yes@:>@])],
+  [],
+  enable_cogl_pango=yes
+)
+AS_IF([test "x$enable_cogl_pango" = "xyes"],
+      [
+	COGL_PANGO_PKG_REQUIRES="$COGL_PANGO_PKG_REQUIRES pangocairo >= pangocairo_req_version"
+      ]
+)
+
+
 dnl ================================================================
 dnl I18n stuff.
 dnl ================================================================
-- 
1.7.7.6