[evolution] Bug 595326 - Bump libtool to 2.2 and remove dolt

[Matthew Barnes <mbarnes src gnome org>]

commit ce05a504b7cfc725f17aa71b1b5303a816ddd465
Author: H.Habighorst <tearofadragon googlemail com>
Date:   Wed Sep 23 11:02:39 2009 -0400

    Bug 595326 - Bump libtool to 2.2 and remove dolt

 Makefile.am  |    2 -
 autogen.sh   |    2 +-
 configure.ac |   11 +---
 m4/dolt.m4   |  177 ----------------------------------------------------------
 4 files changed, 4 insertions(+), 188 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3738e5c..41955fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,8 +70,6 @@ SUBDIRS = 			\
 	$(HELP_SUBDIR)
 
 DISTCLEANFILES = 			\
-	$(builddir)/doltcompile		\
-	$(builddir)/doltlibtool		\
 	$(builddir)/iconv-detect.h
 
 MAINTAINERCLEANFILES =			\
diff --git a/autogen.sh b/autogen.sh
index 548802d..f2fd1c3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="Evolution"
 REQUIRED_AUTOCONF_VERSION=2.58
 REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_LIBTOOL_VERSION=1.5
+REQUIRED_LIBTOOL_VERSION=2.2
 REQUIRED_INTLTOOL_VERSION=0.35.5
 
 (test -f $srcdir/configure.ac \
diff --git a/configure.ac b/configure.ac
index 12ef0d3..58dce7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,15 +173,10 @@ localedir='$(prefix)/$(DATADIRNAME)/locale'
 AC_SUBST(localedir)
 
 dnl ******************************
-dnl Initialize libtool \ DOLT
-dnl if switch to libtool >= 2.2, replace existing with following:
-dnl LT_PREREQ(2.2)
-dnl LT_INIT(disable-static win32-dll)
+dnl Initialize libtool
 dnl ******************************
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-DOLT
+LT_PREREQ(2.2)
+LT_INIT(disable-static win32-dll)
 
 PKG_PROG_PKG_CONFIG