[folks] Arrange configure checks from most- to least-likely to succeed.



commit f5053f8df0fe996ac52926e558d9ed46aa6ea7a1
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Aug 10 14:24:41 2010 -0700

    Arrange configure checks from most- to least-likely to succeed.

 configure.ac |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b0e1a1b..ccde791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,20 @@ AC_SUBST([LT_CURRENT])
 AC_SUBST([LT_REVISION])
 AC_SUBST([LT_AGE])
 
+PKG_CHECK_MODULES(GLIB,
+                  glib-2.0 >= $GLIB_REQUIRED
+                  gobject-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
+AC_SUBST(DBUS_GLIB_CFLAGS)
+AC_SUBST(DBUS_GLIB_LIBS)
+
 # require GLib >= 2.24 so GLib.Array, etc. reffing is handled automatically
 VALACFLAGS="$VALACFLAGS --target-glib=2.24"
 AC_SUBST(VALACFLAGS)
@@ -94,20 +108,6 @@ AC_SUBST(VALA_GEN_INTROSPECT)
 AS_IF([test "$VAPIGEN" = "" -o "$VALA_GEN_INTROSPECT" = ""],
 	[AC_MSG_ERROR([Vala must be built with --enable-vapigen])])
 
-PKG_CHECK_MODULES(GLIB,
-                  glib-2.0 >= $GLIB_REQUIRED
-                  gobject-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GIO_CFLAGS)
-AC_SUBST(GIO_LIBS)
-
-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
-AC_SUBST(DBUS_GLIB_CFLAGS)
-AC_SUBST(DBUS_GLIB_LIBS)
-
 PKG_CHECK_MODULES(GEE, gee-1.0)
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)



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