[cogl/wip/cogl-1.14: 13/177] build: Move the compiler checks and libtool initialization up
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 13/177] build: Move the compiler checks and libtool initialization up
- Date: Mon, 21 Jan 2013 15:46:02 +0000 (UTC)
commit 69ad30dc656766c503894db9905059585a692c91
Author: Damien Lespiau <damien lespiau intel com>
Date: Sat Sep 15 14:56:03 2012 +0100
build: Move the compiler checks and libtool initialization up
It seems logical to first look for the compiler and then run the rest of
configure script (which will use the compiler with small snippets).
Same goes for the libtool initializaton, you might as well do it not too
far from the automake one.
This also happens to be preparatory work to compile cogl with an in-tree
copy of some glib files as the glib's configure script needs those
checks early.
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit ba452ea4a48e48324ee7382b7ccb9065c255f55a)
configure.ac | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9f2fb32..8783bf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,33 @@ dnl Export the source code release status
dnl ================================================================
AC_SUBST([COGL_RELEASE_STATUS], [cogl_release_status])
+dnl ================================================================
+dnl Compiler stuff.
+dnl ================================================================
+AC_PROG_CC
+AC_PROG_CPP
+AM_PROG_CC_C_O
+AC_ISC_POSIX
+AC_C_CONST
+
+dnl ============================================================
+dnl Compiler features
+dnl ============================================================
+AC_MSG_CHECKING([for _Static_assert])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_Static_assert (1, "");],
+ [(void) 0])],
+ [AC_DEFINE([HAVE_STATIC_ASSERT], [1],
+ [Whether _Static_assert can be used or not])
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+
+dnl ================================================================
+dnl Libtool stuff.
+dnl ================================================================
+dnl AC_PROG_LIBTOOL
+dnl LIBTOOL="$LIBTOOL --preserve-dup-deps"
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
dnl ================================================================
dnl See what platform we are building for
@@ -1012,35 +1039,6 @@ AM_CONDITIONAL(X11_TESTS, [test "x$SUPPORT_X11" = "xyes"])
AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "xyes"])
AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "xyes"])
-
-dnl ================================================================
-dnl Compiler stuff.
-dnl ================================================================
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_CC_C_O
-AC_ISC_POSIX
-AC_C_CONST
-
-dnl ============================================================
-dnl Compiler features
-dnl ============================================================
-AC_MSG_CHECKING([for _Static_assert])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_Static_assert (1, "");],
- [(void) 0])],
- [AC_DEFINE([HAVE_STATIC_ASSERT], [1],
- [Whether _Static_assert can be used or not])
- AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])])
-
-dnl ================================================================
-dnl Libtool stuff.
-dnl ================================================================
-dnl AC_PROG_LIBTOOL
-dnl LIBTOOL="$LIBTOOL --preserve-dup-deps"
-LT_PREREQ([2.2.6])
-LT_INIT([disable-static])
-
dnl ================================================================
dnl I18n stuff.
dnl ================================================================
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]