[gupnp-tools] Update autotools

[Jens Georg <jensgeorg src gnome org>]

commit 28043af09eac9b197705c6daf10fa81b03a98b15
Author: Jens Georg <mail jensge org>
Date:   Mon Dec 12 09:57:15 2011 +0100

    Update autotools

 INSTALL      |  236 ----------------------------------------------------------
 Makefile.am  |   15 ++++
 autogen.sh   |   22 +++++-
 configure.ac |   33 ++++++---
 4 files changed, 57 insertions(+), 249 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d05bc54..401b3eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,19 @@
+ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = src data
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in
+
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+		then \
+				echo Creating ChangeLog && \
+				( cd "$(top_srcdir)" && \
+				  echo '# Generated by Makefile. Do not edit.'; echo; \
+				  "$(top_srcdir)"/build-aux/missing --run git log --stat ) > ChangeLog.tmp \
+				&& mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+				|| ( rm -f ChangeLog.tmp ; \
+					 echo Failed to generate ChangeLog >&2 ); \
+		else \
+				echo A git clone is required to generate a ChangeLog >&2; \
+		fi
diff --git a/autogen.sh b/autogen.sh
index 04c1228..906c14e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,20 @@
 #! /bin/sh
-ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit 1
-glib-gettextize --force --copy || exit 1
-./configure --enable-maintainer-mode --enable-debug "$@"
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+fi
+
+mkdir -p m4
+
+autoreconf --force --install --verbose || exit $?
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 0472c1b..30d9253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,28 @@
-AC_PREREQ(2.53)
-AC_INIT(gupnp-tools, 0.8.3, http://www.gupnp.org/)
-AM_INIT_AUTOMAKE()
+AC_PREREQ([2.63])
+AC_INIT([gupnp-tools],
+        [0.8.3],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-tools],
+        [gupnp-tools],
+        [http://www.gupnp.org/])
+
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(src/common/icons.h)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 
-AC_ISC_POSIX
+AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
+AM_MAINTAINER_MODE([enable])
+AM_SILENT_RULES([yes])
+
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
+AC_HEADER_STDC
 AC_FUNC_MMAP
 
+# libtool
+LT_PREREQ([2.2])
+LT_INIT([])
+
 GSSDP_REQUIRED=0.10
 GUPNP_REQUIRED=0.13
 GUPNP_AV_REQUIRED=0.5.5
@@ -51,7 +63,7 @@ else
 fi
 
 AC_ARG_WITH( av,
-  AC_HELP_STRING([--disable-av],[Don't build AV tools]),
+  AS_HELP_STRING([--disable-av],[Don't build AV tools]),
   try_av=$withval, try_av=yes )
 
 HAVE_LIBGUPNP_AV=no
@@ -108,7 +120,7 @@ ALL_LINGUAS=""
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR([LOCALEDIR])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/av-cp/Makefile
@@ -125,3 +137,4 @@ data/gupnp-network-light.desktop.in
 data/pixmaps/Makefile
 data/xml/Makefile
 ])
+AC_OUTPUT