+--- cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:53:54.051271496 +0300
++++ cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:54:30.469377429 +0300
+@@ -44,11 +44,13 @@
+ # $Id$
+ #
+ srcdir = @srcdir@
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
+
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+@@ -62,15 +64,15 @@
+
+ all: makedepend
+
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+
+-makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
+- $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
+- main.o parse.o pr.o $(DEPLIBS) $(LIBS)
++makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o makedepend cppsetup.lo ifparser.lo include.lo \
++ main.lo parse.lo pr.lo $(DEPLIBS) $(LIBS)
+
+ clean:
+- rm -f *.o Makefile.bak makedepend
++ rm -f *.lo Makefile.bak makedepend
+
+ distclean: clean
+ rm -f Makefile
+--- cyrus-imapd-2.3.12p2/com_err/et/Makefile.in~ 2008-03-24 20:53:40.000000000 +0200
++++ cyrus-imapd-2.3.12p2/com_err/et/Makefile.in 2008-09-23 22:08:08.228664820 +0300
+@@ -44,11 +44,13 @@
+ # $Id$
+
+ srcdir = @srcdir@
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
+ ARCHIVE = ar cr
+
+ AWK = @AWK@
+@@ -63,19 +65,19 @@
+
+ SHELL = /bin/sh
+
+-LIBOBJS= error_message.o et_name.o init_et.o com_err.o
++LIBOBJS= error_message.lo et_name.lo init_et.lo com_err.lo
+ # for et_lex.lex.c include in error_table.y
+ LOCALINCLUDE=-I. -I.. -I$(srcdir)
+
+-all: compile_et libcom_err.a
++all: compile_et libcom_err.la
+
+ install:
+
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
+
+ # solaris make loses on com_err.c but not on init_et.c, but this helps
+-com_err.o: com_err.c
++com_err.lo: com_err.c
+
+ #
+ # real entries...
+@@ -92,13 +94,13 @@
+ $(CP) $(srcdir)/et_h.awk et_h.awk
+
+ clean:
+- rm -f compile_et compile_et.o error_table.o
+- rm -f libcom_err.a
++ rm -f compile_et compile_et.lo error_table.lo
++ rm -f libcom_err.la
+ rm -f $(LIBOBJS)
+
+ distclean: clean
+- rm -f compile_et compile_et.o error_table.o
+- rm -f libcom_err.a
++ rm -f compile_et compile_et.lo error_table.lo
++ rm -f libcom_err.la
+ rm -f $(LIBOBJS)
+ rm Makefile
+
+@@ -119,21 +121,15 @@
+
+ ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
+
+-libcom_err.a: $(LIBOBJS)
+- rm -f libcom_err.a
+- $(ARCHIVE) $@ $(LIBOBJS)
+- $(RANLIB) $@
++libcom_err.la: $(LIBOBJS)
++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcom_err.la $(LIBOBJS)
+
+ #install::
+-# $(INSTALLLIB) libcom_err.a $(DESTDIR)$(LIBDIR)/libcom_err.a
+-# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.a
+-# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.a
+-# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.a
++# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
+ ##
+
+-libcom_err.o: $(LIBOBJS)
+- ld -r -s -o libcom_err.o $(LIBOBJS)
+- chmod -x libcom_err.o
++libcom_err.lo: $(LIBOBJS)
++ $(LIBTOOL) --mode=link --tag=CC ld -r -o libcom_err.lo $(LIBOBJS)
+
+ TAGS: et_name.c error_message.c compile_et.c error_table.c \
+ lex.yy.c init_et.c
+--- cyrus-imapd-2.3.12p2/syslog/Makefile.in~ 2008-03-24 22:15:59.000000000 +0200
++++ cyrus-imapd-2.3.12p2/syslog/Makefile.in 2008-09-23 22:13:49.520393331 +0300
+@@ -44,12 +44,14 @@
+ # $Id$
+
+ srcdir = @srcdir@
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ CC = @CC@
+
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
+
+ DEFS = @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+@@ -61,23 +63,22 @@
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
+
+-all: libsyslog.a syslogd
++all: libsyslog.la syslogd
+
+ install:
+ @echo "Install syslogd and syslog.conf as appropriate"
+
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
+
+-libsyslog.a: syslog.o
+- ar cr libsyslog.a syslog.o
+- $(RANLIB) libsyslog.a
++libsyslog.la: syslog.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsyslog.la syslog.lo
+
+-syslogd: syslogd.o
+- $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
++syslogd: syslogd.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo $(LIBS)
+
+ clean:
+- rm -f *.o *.a Makefile.bak
++ rm -f *.lo *.la Makefile.bak
+
+ distclean: clean
+ rm -f Makefile
+--- cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:16:22.353226136 +0300
++++ cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:20:08.678306577 +0300
+@@ -2,7 +2,7 @@
+ AC_INIT(cppsetup.c)
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+ AC_CHECK_HEADERS(stdarg.h)
+ AC_SUBST(CPPFLAGS)