[gupnp] Update autotools configuration



commit e507201c023bb0d117f2183b635ea830648c5f83
Author: Javier JardÃn <jjardon gnome org>
Date:   Sat Jun 18 21:09:32 2011 +0100

    Update autotools configuration
    
    - Replace deprecated autotools macros.
    - Use new libtool syntax.
    - Use buid-aux directory to store autogenerated files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=652824

 Makefile.am  |    4 ++--
 configure.ac |   35 +++++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e390977..e92161a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = libgupnp tools examples tests doc
 
 pkgconfig_DATA= gupnp-1.0.pc
@@ -5,8 +7,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 EXTRA_DIST = gupnp-1.0.pc.in gupnp-1.0-uninstalled.pc.in
 
-ACLOCAL_AMFLAGS=-I m4
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 # Extra clean files so that maintainer-clean removes *everything*
diff --git a/configure.ac b/configure.ac
index 69ad4a4..d34aaae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,31 @@
-AC_PREREQ(2.53)
-AC_INIT(gupnp, 0.17.0, http://www.gupnp.org/)
+AC_PREREQ([2.64])
+AC_INIT([gupnp],
+        [0.17.0],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp],
+        [gupnp],
+        [http://www.gupnp.org/])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([libgupnp/gupnp.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
 AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(libgupnp/gupnp.h)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-AC_CANONICAL_HOST
+AM_MAINTAINER_MODE([enable])
 
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
-AC_ISC_POSIX
+# Check for programs
 AC_PROG_CC
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
-AC_CONFIG_MACRO_DIR([m4])
 AC_FUNC_MMAP
 AC_SYS_LARGEFILE
 
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
+AC_CANONICAL_HOST
+
 AC_MSG_CHECKING([operating system])
 case "$host_os" in
      mingw*|cygwin*)
@@ -97,7 +107,7 @@ GOBJECT_INTROSPECTION_CHECK([0.6.4])
 # Gtk-doc
 GTK_DOC_CHECK([1.0])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 libgupnp/Makefile
 examples/Makefile
@@ -108,3 +118,4 @@ doc/version.xml
 gupnp-1.0.pc
 gupnp-1.0-uninstalled.pc
 ])
+AC_OUTPUT



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]