--- a/configure.in	Sun Jan 20 00:12:17 2008 +0100
+++ b/configure.in	Sun Jan 20 00:22:09 2008 +0100
@@ -1,5 +1,5 @@
 AC_INIT(lib/mergelib.sh)
-AM_INIT_AUTOMAKE(vmailmgr, 0.96.9)
+AM_INIT_AUTOMAKE(vmailmgr, 0.97)
 AM_CONFIG_HEADER(config.h)
 AC_PROG_MAKE_SET
 
@@ -28,12 +28,8 @@
 	LIBS="$LIBS -lgdbm";;
  *)    AC_MSG_ERROR(bad value ${withval} for --with-vpwtable);;
  esac],[AC_DEFINE(VPWTABLE_CDB)
-	CDBPROGS="vpasswd2cdb vrehash"
-	CDBSCRIPTS="allvpasswd2cdb"
 	dbtype=cdb])
 
-AC_SUBST(CDBPROGS)
-AC_SUBST(CDBSCRIPTS)
 AM_CONDITIONAL(VPWTABLE_CDB, test $dbtype = cdb)
 AM_CONDITIONAL(VPWTABLE_GDBM, test $dbtype = gdbm)
 
@@ -45,8 +41,8 @@
 CXX_NO_RTTI
 CXX_NO_EXCEPTIONS
 
-CFLAGS="$CFLAGS -Wall -W"
-CXXFLAGS="$CXXFLAGS -Wall -W"
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS -Wall"
 
 AC_PROG_INSTALL
 AC_PROG_RANLIB
@@ -129,7 +125,7 @@
           lib/Makefile
 	  lib/cdb++/Makefile
 	  lib/cgi/Makefile
-	  lib/cli/Makefile
+	  lib/cli++/Makefile
 	  lib/config/Makefile
 	  lib/courier-authlib/Makefile
 	  lib/fdbuf/Makefile