-#undef HAVE_APACHE_FNMATCH
#undef HAVE_DBUS_GLIB
#undef HAVE_DIRENT_D_TYPE
#undef HAVE_GPGME_PKA_TRUST
#undef USE_JPILOT
#undef USE_LDAP
#undef USE_LDAP_TLS
-#undef USE_NEW_ADDRBOOK
+#undef USE_ALT_ADDRBOOK
#undef USE_PTHREAD
#undef USE_SPAMASSASSIN_PLUGIN
-#undef MAEMO
-#undef CHINOOK
#undef __CYGWIN__