[gnome-session] build: Update autotools configuration

[Javier Jardón <jjardon src gnome org>]

commit 2776d9d3cad158955ee7355f0d3da47071d77769
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Nov 17 05:51:54 2010 +0100

    build: Update autotools configuration
    
    Use new libtool syntax and update deprecated macros

 Makefile.am  |    2 +-
 autogen.sh   |    2 -
 configure.ac |   66 ++++++++++++++++++++++++++++++---------------------------
 3 files changed, 36 insertions(+), 34 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index db24224..0773f78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS =			\
 	doc			\
 	po
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST =		\
 	HACKING		\
diff --git a/autogen.sh b/autogen.sh
index 87d4125..2617adf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,6 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-session"
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_M4MACROS=
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/$PKG_NAME.doap) || {
diff --git a/configure.ac b/configure.ac
index f6e7d47..7a2181b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,35 +1,34 @@
-AC_INIT([gnome-session], [2.91.1],
+AC_INIT([gnome-session],
+        [2.91.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session])
+
 AC_CONFIG_SRCDIR([gnome-session])
 AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2])
+AM_MAINTAINER_MODE([enable])
 
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
-
-IT_PROG_INTLTOOL([0.40.0])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_ISC_POSIX
+# Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_STDC_HEADERS
-AM_PROG_LIBTOOL
+AC_HEADER_STDC
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
+GNOME_DEBUG_CHECK
 GNOME_MAINTAINER_MODE_DEFINES
-
-GNOME_COMPILE_WARNINGS(maximum)
+GNOME_COMPILE_WARNINGS([maximum])
 
 AC_ARG_ENABLE(deprecation_flags,
-              [AC_HELP_STRING([--enable-deprecation-flags],
+              [AS_HELP_STRING([--enable-deprecation-flags],
                               [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
               [enable_deprecation_flags=no])
 
@@ -93,9 +92,9 @@ dnl ====================================================================
 dnl Option to set the default window manager
 dnl ====================================================================
 AC_ARG_WITH(default-wm,
-              [AC_HELP_STRING([--with-default-wm],
+              [AS_HELP_STRING([--with-default-wm],
                               [Specify the default window manager @<:@default=metacity@:>@])],,
-                              [with_default_wm="metacity"])
+              [with_default_wm="metacity"])
 
 DEFAULT_WM=$with_default_wm
 AC_SUBST(DEFAULT_WM)
@@ -205,9 +204,10 @@ dnl - DocBook Documentation
 dnl ====================================================================
 
 AC_ARG_ENABLE(docbook-docs,
-	[AC_HELP_STRING([--enable-docbook-docs],
-	[build documentation (requires xmlto)])],
-	enable_docbook_docs=$enableval,enable_docbook_docs=auto)
+              [AS_HELP_STRING([--enable-docbook-docs],
+                              [build documentation (requires xmlto)])],
+              [enable_docbook_docs=$enableval],
+              [enable_docbook_docs=auto])
 AC_PATH_PROG(XMLTO, xmlto, no)
 AC_MSG_CHECKING([whether to build DocBook documentation])
 if test x$XMLTO = xno ; then
@@ -238,6 +238,8 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 dnl ====================================================================
 dnl Language Support
 dnl ====================================================================
+IT_PROG_INTLTOOL([0.40.0])
+
 GETTEXT_PACKAGE=gnome-session-2.0
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The gettext translation domain])
@@ -276,7 +278,8 @@ dnl Code for checking whether IPv6 is enabled on the system....
 dnl ====================================================================
 AC_MSG_CHECKING([whether to enable ipv6])
 AC_ARG_ENABLE(ipv6,
-              AC_HELP_STRING([--enable-ipv6], [enable IPv6 extensions]),,
+              [AS_HELP_STRING([--enable-ipv6],
+                              [enable IPv6 extensions])],,
               [enable_ipv6=yes])
 have_full_ipv6=no
 if test $enable_ipv6 = yes; then
@@ -284,13 +287,13 @@ if test $enable_ipv6 = yes; then
   dnl ====================================================================
   dnl Code for checking presence of AF_INET6 on the system....
   dnl ====================================================================
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #include <sys/types.h>
-    #include <sys/socket.h>], [
+    #include <sys/socket.h>]], [[
     socket(AF_INET6, SOCK_STREAM, 0)
-    ],
-    have_ipv6=yes,
-    have_ipv6=no
+    ]])],
+    [have_ipv6=yes],
+    [have_ipv6=no]
   )
   AC_MSG_RESULT($have_ipv6)
 
@@ -323,8 +326,8 @@ 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,
-              AC_HELP_STRING([--disable-rebuilds],
-                             [disable all source autogeneration rules]),,
+              [AS_HELP_STRING([--disable-rebuilds],
+                              [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 REBUILD=\#
 if test "x$enable_rebuilds" = "xyes" && \
@@ -335,7 +338,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 capplet/Makefile
 doc/Makefile
@@ -357,6 +360,7 @@ gnome-session/Makefile
 tools/Makefile
 po/Makefile.in
 ])
+AC_OUTPUT
 
 dnl ---------------------------------------------------------------------------
 dnl - Show summary