[epiphany/wip/autocrap: 19/37] configure.ac: Rearrange
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/autocrap: 19/37] configure.ac: Rearrange
- Date: Tue, 30 Jun 2015 15:40:02 +0000 (UTC)
commit 41b34cb38e174811fd226da1e3712b9682eb1542
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Jun 29 17:27:26 2015 -0500
configure.ac: Rearrange
This fixes a bajillion warnings about AX_CHECK_ENABLE_DEBUG being used
before AC_PROG_CC, which we have had ever since GNOME_DEBUG_CHECK
started using AX_CHECK_ENABLE_DEBUG internally.
I rearrange a bit more to make it look nicer to me. :)
configure.ac | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8bb6a00..f533454 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,26 +31,27 @@ AC_CONFIG_SRCDIR([configure.ac])
AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar])
-AM_SILENT_RULES([yes])
-AM_MAINTAINER_MODE([enable])
+AX_CHECK_ENABLE_DEBUG([yes])
+AX_CODE_COVERAGE
-# Initialize libtool
-LT_PREREQ(2.2)
-LT_INIT([dlopen disable-static])
+AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
+WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations"
AC_PROG_CC
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-GLIB_GSETTINGS
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar])
+AM_SILENT_RULES([yes])
+AM_MAINTAINER_MODE([enable])
-AX_CHECK_ENABLE_DEBUG([yes])
-AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
-AX_CODE_COVERAGE
+# Initialize libtool
+LT_PREREQ(2.2)
+LT_INIT([dlopen disable-static])
-WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations"
+GLIB_GSETTINGS
+YELP_HELP_INIT
GLIB_REQUIRED=2.38.0
GTK_REQUIRED=3.13.0
@@ -173,12 +174,6 @@ fi
IT_PROG_INTLTOOL([0.50.0])
AC_SUBST([GETTEXT_PACKAGE], [epiphany])
-# *******************************
-# User help
-# *******************************
-
-YELP_HELP_INIT
-
# ****************
# Distributor name
# ****************
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]