summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2011-10-24 03:10:27 +0100
committerJavier Jardón <jjardon@gnome.org>2011-10-24 03:22:26 +0100
commitccf99bf484de1ea01c7cfcc72a560173edb2a1f6 (patch)
treed42e2af819e076a2df889c7e8652694414c66660
parent68fa2cde9fdd7757bba2ac83e855ba390ae53ed7 (diff)
downloadgupnp-vala-ccf99bf484de1ea01c7cfcc72a560173edb2a1f6.tar.gz
configure.ac: Update autotools configuration
Replace autoconf deprecated macros
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac13
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index dbc139d..3d625b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.decls
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
SUBDIRS = . tests
pkgconfig_DATA= gupnp-vala-1.0.pc
diff --git a/configure.ac b/configure.ac
index 058c1a1..faa5719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,15 +5,15 @@ AC_INIT([gupnp-vala],
[gupnp-vala],
[http://www.gupnp.org])
-AC_CANONICAL_SYSTEM
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([README])
+AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
AM_MAINTAINER_MODE([enable])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
AM_SILENT_RULES([enable])
VALA_REQUIRED=0.11.3
@@ -53,11 +53,12 @@ AM_CONDITIONAL(WITH_GUPNP_DLNA, [test "x$has_gupnp_dlna" = "xyes"])
VAPIDIR=`echo ${datadir}/vala/vapi`
AC_SUBST(VAPIDIR)
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
gupnp-vala-1.0.pc
tests/Makefile
])
+AC_OUTPUT
echo ""
echo " GUPnP Vala bindings"