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

[Nick Schermer]

Updating branch refs/heads/master
         to c4c6af9eaa4be092a94c9c6a65c3924caebf4692 (commit)
       from ad91814a51613e63f287d31a441b0bb975e12fb3 (commit)

commit c4c6af9eaa4be092a94c9c6a65c3924caebf4692
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Nov 3 19:39:47 2011 +0100

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

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

diff --git a/Makefile.am b/Makefile.am
index 58797b6..5f7bbea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,9 @@ SUBDIRS =								\
 	tests
 
 AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
+	1.9								\
+	dist-bzip2							\
+	no-dist-gzip
 
 distclean-local:
 	rm -rf *.spec *.cache *~
diff --git a/configure.in.in b/configure.in.in
index e465abb..45117e5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -29,7 +29,7 @@ dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2004-2010 os-cillation.
 Copyright (c) 2004-2011 Xfce Development Team])
 AC_INIT([exo], [libexo_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 AC_REVISION([@REVISION@])
 AC_CANONICAL_TARGET()
 
@@ -91,6 +91,12 @@ esac
 AC_MSG_RESULT([$ac_bm_platform_win32])
 AM_CONDITIONAL([PLATFORM_WIN32], [test x"$ac_bm_platform_win32" = x"yes"])
 
+dnl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
@@ -99,7 +105,6 @@ AC_PROG_CC()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL([0.31], [no-xml])
-AC_PROG_LIBTOOL()
 AC_CHECK_PROGS([PERL], [perl5 perl])
 
 dnl ***************************************