From edf0b9584f1038797758b4ed878e1d9f48beda9f Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@collabora.co.uk>
Date: Mon, 6 Jun 2011 20:05:35 +0000
Subject: Modernize autotools setup.

---
 .gitignore   |  1 +
 configure.ac | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0e8007..a844dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ temp.txt
 /po/POTFILES
 /po/stamp-po
 /po/remove-potcdate.sed
+/po/Makevars.template
 
 /tests/coverage
 /tests/coverage.info
diff --git a/configure.ac b/configure.ac
index 709df65..44ec55b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,18 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([p11-kit],[0.1],[http://bugzilla.example.com])
+AC_INIT([p11-kit],[0.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],[p11-kit],[http://p11-glue.freedesktop.org/p11-kit.html])
 
 AC_CONFIG_SRCDIR([p11-kit/modules.c])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Other initialization
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11])
 AM_SANITY_CHECK
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-LT_INIT
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen disable-static])
 
 LINGUAS=""
 AM_GNU_GETTEXT([external], [need-ngettext])
@@ -124,8 +125,7 @@ AC_SUBST(GENHTML)
 # Debug mode
 
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=no/yes/full],
-              [Turn on or off debugging]))
+              AS_HELP_STRING([--enable-debug=no/yes/full],[Turn on or off debugging]))
 
 if test "$enable_debug" != "no"; then
 	AC_DEFINE_UNQUOTED(WITH_DEBUG, 1, [Print debug output])
@@ -156,4 +156,3 @@ AC_CONFIG_FILES([Makefile
 	tools/Makefile
 ])
 AC_OUTPUT
-
-- 
cgit v1.1