diff -r 30113bfbe723 -r b3afb9f1e801 lib/Makefile.in
--- a/lib/Makefile.in	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/Makefile.in	Sun Jan 20 00:22:09 2008 +0100
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,10 +46,9 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -58,12 +57,15 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 CC = @CC@
-CDBPROGS = @CDBPROGS@
-CDBSCRIPTS = @CDBSCRIPTS@
 CXX = @CXX@
+HAVE_LIB = @HAVE_LIB@
 HTML2TXT = @HTML2TXT@
+LIB = @LIB@
 LN = @LN@
+LTLIB = @LTLIB@
 LYNX = @LYNX@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
@@ -81,7 +83,7 @@
 phpdir = @phpdir@
 pythonlibdir = @pythonlibdir@
 
-SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli fdbuf mystring config 	courier-authlib
+SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config 	courier-authlib
 
 noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
 EXTRA_DIST = mergelib.sh
@@ -113,7 +115,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libvmailmgr_a_SOURCES) $(libcgi_a_SOURCES) $(libcli_a_SOURCES)
 OBJECTS = $(libvmailmgr_a_OBJECTS) $(libcgi_a_OBJECTS) $(libcli_a_OBJECTS)
@@ -193,7 +195,7 @@
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -293,7 +295,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -353,9 +355,9 @@
 	sh mergelib.sh $@ cdb++/libcdb++.a misc/libmisc.a \
 	config/libconfig.a vpwentry/libvpwentry.a vpwtable/libvpwtable.a \
 	vdomain/libvdomain.a fdbuf/libfdbuf.a mystring/libmystring.a
-libcli.a: cli/libcli.a mergelib.sh
+libcli.a: cli++/libcli++.a mergelib.sh
 	$(RM) -f $@
-	sh mergelib.sh $@ cli/libcli.a
+	sh mergelib.sh $@ cli++/libcli++.a
 libcgi.a: cgi/libcgi.a mergelib.sh
 	$(RM) -f $@
 	sh mergelib.sh $@ cgi/libcgi.a