[Xfce4-commits] <libxfce4ui:master> Use new libtool macros and versions (bug #6920).

[Nick Schermer]

Updating branch refs/heads/master
         to 5158a3e7f85bf7b10ac95bf0c9168ced54891201 (commit)
       from dbd2bee6494b60acc92c128bed9038ac23634b89 (commit)

commit 5158a3e7f85bf7b10ac95bf0c9168ced54891201
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Nov 3 19:43:25 2011 +0100

    Use new libtool macros and versions (bug #6920).

 Makefile.am     |    5 +++++
 configure.ac.in |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 81b29ff..cac7c80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,11 @@ SUBDIRS = \
 	docs \
 	po
 
+AUTOMAKE_OPTIONS = \
+	1.9 \
+	dist-bzip2 \
+	no-dist-gzip
+
 distclean-local:
 	rm -rf *.spec *.cache *~
 
diff --git a/configure.ac.in b/configure.ac.in
index e8b69e0..4ae5e21 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -33,14 +33,14 @@ dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2007-2011 The Xfce development team])
 AC_INIT([libxfce4ui], [libxfce4ui_version], [http://bugzilla.xfce.org/], [libxfce4ui])
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 AC_REVISION([libxfce4ui_version_build])
 AC_CANONICAL_TARGET()
 
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -81,8 +81,8 @@ AC_CHECK_PROGS([PERL], [perl5 perl])
 dnl **************************
 dnl *** Initialize libtool ***
 dnl **************************
-AC_DISABLE_STATIC()
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl **************************************
 dnl *** Substitute version information ***