[evolution-data-server] Bug 595327 - Bump libtool to 2.2 and remove dolt

[Matthew Barnes <mbarnes src gnome org>]

commit 368a36f78f91d1cb02a968d1d732d90ddc76e16b
Author: H.Habighorst <tearofadragon googlemail com>
Date:   Wed Sep 23 10:42:02 2009 -0400

    Bug 595327 - Bump libtool to 2.2 and remove dolt

 Makefile.am  |    2 -
 autogen.sh   |    2 +-
 configure.ac |   12 +---
 m4/dolt.m4   |  177 ----------------------------------------------------------
 4 files changed, 4 insertions(+), 189 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3183feb..26819be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,8 +40,6 @@ EXTRA_DIST = 						\
 	$(LIBDB_FILES)
 
 DISTCLEANFILES = \
-	doltcompile					\
-	doltlibtool					\
 	intltool-extract				\
 	intltool-merge					\
 	intltool-update					\
diff --git a/autogen.sh b/autogen.sh
index 12ccfef..785e86b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="evolution-data-server"
 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 90f8388..9939554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,16 +226,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