[gnome-session] build: Modernize build system a bit
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-session] build: Modernize build system a bit
- Date: Tue, 14 Jun 2011 13:14:41 +0000 (UTC)
commit d68888fa10d5f4bce63d33712f546667d260425d
Author: Vincent Untz <vuntz gnome org>
Date: Tue Jun 14 15:10:03 2011 +0200
build: Modernize build system a bit
Use the tar-ustar option for AM_INIT_AUTOMAKE for better tarballs.
Do not use AM_MAINTAINER_MODE as it is not recommended by automake
developers.
Do not use AC_HEADER_STDC, AM_PROG_CC_C_O as they shouldn't be needed on
modern systems.
Pass dlopen disable-static to LT_INIT.
Require intltool 0.40.6 to avoid various bugs.
Remove checks for perl and awk, and the useless --disable-rebuilds
configure flag.
configure.ac | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 537dd48..61d0a60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,24 +6,19 @@ AC_CONFIG_SRCDIR([gnome-session])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2])
-AM_MAINTAINER_MODE([enable])
+AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Check for programs
AC_PROG_CC
-AM_PROG_CC_C_O
-AC_HEADER_STDC
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+PKG_PROG_PKG_CONFIG()
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen disable-static])
-GNOME_DEBUG_CHECK
GNOME_MAINTAINER_MODE_DEFINES
GNOME_COMPILE_WARNINGS([maximum])
@@ -45,7 +40,6 @@ UPOWER_REQUIRED=0.9.0
dnl ====================================================================
dnl Dependency Checks
dnl ====================================================================
-PKG_PROG_PKG_CONFIG()
dnl Standard vertical stacks
PKG_CHECK_MODULES(GIO, gio-2.0)
@@ -214,7 +208,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
dnl ====================================================================
dnl Language Support
dnl ====================================================================
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.40.6])
GETTEXT_PACKAGE=gnome-session-3.0
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -296,25 +290,6 @@ dnl ============================================================================
dnl End of IPv6 checks
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)
-
-# define a MAINT-like variable REBUILD which is set if Perl
-# and awk are found, so autogenerated sources can be rebuilt
-AC_ARG_ENABLE(rebuilds,
- [AS_HELP_STRING([--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)
-
AC_CONFIG_FILES([
Makefile
capplet/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]