-OL_ARG_ENABLE(bdb,[enable Berkeley DB backend], yes)dnl
-OL_ARG_WITH(bdb-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(dnssrv,[enable dnssrv backend], no)dnl
-OL_ARG_WITH(dnssrv-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(ldap,[enable ldap backend], no)dnl
-OL_ARG_WITH(ldap-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(ldbm,[enable ldbm backend], no)dnl
-OL_ARG_WITH(ldbm_api,[with LDBM API], auto, [auto berkeley bcompat mdbm gdbm])dnl
-OL_ARG_WITH(ldbm-module,[module type], static, [static dynamic])dnl
-OL_ARG_WITH(ldbm-type,[use LDBM type], auto, [auto btree hash])dnl
-OL_ARG_ENABLE(meta,[enable metadirectory backend], no)dnl
-OL_ARG_WITH(meta-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(monitor,[enable monitor backend], no)dnl
-OL_ARG_WITH(monitor-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(null,[enable null backend], no)dnl
-OL_ARG_WITH(null-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(passwd,[enable passwd backend], no)dnl
-OL_ARG_WITH(passwd-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(perl,[enable perl backend], no)dnl
-OL_ARG_WITH(perl-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(shell,[enable shell backend], no)dnl
-OL_ARG_WITH(shell-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(sql,[enable sql backend], no)dnl
-OL_ARG_WITH(sql-module,[module type], static, [static dynamic])dnl
-OL_ARG_ENABLE(tcl,[enable tcl backend], no)dnl
-OL_ARG_WITH(tcl-module,[module type], static, [static dynamic])dnl
+OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl
+OL_ARG_WITH(bdb_module,[ --with-bdb-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl
+OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend], no)dnl
+OL_ARG_WITH(hdb_module,[ --with-hdb-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
+OL_ARG_WITH(ldap_module,[ --with-ldap-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], no)dnl
+OL_ARG_WITH(ldbm_api,[ --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm], auto,
+ [auto berkeley bcompat mdbm gdbm])
+OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type auto|btree|hash], auto,
+ [auto btree hash])
+OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend], no)dnl
+OL_ARG_WITH(meta_module,[ --with-meta-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], yes)dnl
+OL_ARG_WITH(monitor_module,[ --with-monitor-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(null,[ --enable-null enable null backend], no)dnl
+OL_ARG_WITH(null_module,[ --with-null-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)dnl
+OL_ARG_WITH(passwd_module,[ --with-passwd-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend], no)dnl
+OL_ARG_WITH(perl_module,[ --with-perl-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl
+OL_ARG_WITH(shell_module,[ --with-shell-module module type static|dynamic], static,
+ [static dynamic])
+OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend], no)dnl
+OL_ARG_WITH(sql_module,[ --with-sql-module module type static|dynamic], static,
+ [static dynamic])
+
+dnl ----------------------------------------------------------------
+dnl SLAPD Overlay Options
+AC_ARG_WITH(xxslapoverlays,[
+SLAPD Overlay Options:])
+OL_ARG_WITH(dyngroup,[ --with-dyngroup Dynamic Group overlay no|yes|mod], no,
+ [no yes mod])
+OL_ARG_WITH(proxycache,[ --with-proxycache Proxy Cache overlay no|yes|mod], no,
+ [no yes mod])
+OL_ARG_WITH(rwm,[ --with-rwm Rewrite/Remap overlay no|yes|mod], no,
+ [no yes mod])