[gnome-desktop] build: Modernize build system a bit
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] build: Modernize build system a bit
- Date: Tue, 14 Jun 2011 13:14:30 +0000 (UTC)
commit d5f0001dd24eae4ce392682acdad7e2098d76a39
Author: Vincent Untz <vuntz gnome org>
Date: Tue Jun 14 15:13:22 2011 +0200
build: Modernize build system a bit
Do not use AM_MAINTAINER_MODE as it is not recommended by automake
developers.
Use LT_PREREQ & LT_INIT for libtool checks.
Require intltool 0.40.6 to avoid various bugs.
Do not use AC_ISC_POSIX, AC_HEADER_STDC as they shouldn't be needed on
modern systems.
Stop using GNOME_COMMON_INIT as it is deprecated.
Do not use GNOME_DEBUG_CHECK as we do not need it.
Remove checks for perl and awk, and the useless --disable-rebuilds
configure flag.
configure.ac | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b6279e1..898a4dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,15 +30,12 @@ AC_CONFIG_MACRO_DIR([m4])
LT_VERSION=2:0:0
AC_SUBST(LT_VERSION)
-AM_MAINTAINER_MODE
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen win32-dll disable-static])
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.40.6])
-AC_ISC_POSIX
AC_PROG_CC
-AC_STDC_HEADERS
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
GNOME_PLATFORM=gnome_platform
@@ -73,8 +70,6 @@ AC_SUBST(GNOME_DATE)
AC_SUBST(GNOME_DATE_COMMENT_START)
AC_SUBST(GNOME_DATE_COMMENT_END)
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
@@ -195,22 +190,6 @@ AM_GLIB_GNU_GETTEXT
GOBJECT_INTROSPECTION_CHECK([0.9.7])
-dnl Don't use AC_PROG_AWK since we need the full pathname.
-AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
-AC_PATH_PROGS(PERL, perl5 perl)
-
-dnl define a MAINT-like variable REBUILD which is set if Perl
-dnl and awk are found, so autogenerated sources can be rebuilt
-AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
- test -n "$PERL" && \
- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
- test -n "$AWK" ; then
- REBUILD=
-fi
-AC_SUBST(REBUILD)
-
# check for gtk-doc
GTK_DOC_CHECK([1.4])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]