From 63d8aab43d70150d10284f36d1b7e259944f6cb7 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Sun, 7 Feb 2010 14:55:35 +0100
Subject: [PATCH] use glibtoolize instead of libtoolize where appropriate  (by
 Tony Theodore)

---
 Makefile     | 27 ++++++++++++++-------------
 src/vmime.mk |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 07a9d780..353d32fa 100644
--- a/Makefile
+++ b/Makefile
@@ -5,19 +5,20 @@ JOBS               := 1
 TARGET             := i686-pc-mingw32
 SOURCEFORGE_MIRROR := kent.dl.sourceforge.net
 
-PREFIX    := $(PWD)/usr
-LOG_DIR   := $(PWD)/log
-TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
-PKG_DIR   := $(PWD)/pkg
-DIST_DIR  := $(PWD)/dist
-TMP_DIR    = $(PWD)/tmp-$(1)
-MAKEFILE  := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-TOP_DIR   := $(patsubst %/,%,$(dir $(MAKEFILE)))
-PATH      := $(PREFIX)/bin:$(PATH)
-SHELL     := bash
-SED       := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
-INSTALL   := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
-VERSION   := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html')
+PREFIX     := $(PWD)/usr
+LOG_DIR    := $(PWD)/log
+TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
+PKG_DIR    := $(PWD)/pkg
+DIST_DIR   := $(PWD)/dist
+TMP_DIR     = $(PWD)/tmp-$(1)
+MAKEFILE   := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))
+PATH       := $(PREFIX)/bin:$(PATH)
+SHELL      := bash
+SED        := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
+INSTALL    := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
+LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize
+VERSION    := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html')
 
 # unset any environment variables which might cause trouble
 AR =
diff --git a/src/vmime.mk b/src/vmime.mk
index e43482e7..ee9eba1e 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -19,6 +19,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap
     cd '$(1)' && ./bootstrap
     cd '$(1)' && ./configure \
       --prefix='$(PREFIX)/$(TARGET)' \