--- configure.in	1998/11/08 18:37:03	1.20
+++ configure.in	1998/11/09 18:41:10	1.21
@@ -15,7 +15,7 @@ dnl Do not use AutoConf 2.12; it produce
 dnl that causes an "internal 2K buffer" error on HPUX when run
 dnl with /bin/sh.  Autoconf 2.10 seems to be okay.
 AC_CONFIG_AUX_DIR(build)
-AC_CONFIG_HEADER(include/portable.h)dnl
+AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
 dnl
 dnl Start Args
 AC_MSG_CHECKING(configure arguments)
@@ -27,8 +27,8 @@ dnl OL_ARG_ENABLE(syslog,[  --enable-sys
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
 OL_ARG_ENABLE(libui,[  --enable-libui	enable library user interface], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache	enable caching], yes)dnl
-OL_ARG_ENABLE(dns,[  --enable-dns		enable dns support], no)dnl
-OL_ARG_ENABLE(referrals,[  --enable-referrals	enable referrals], yes)dnl
+OL_ARG_ENABLE(dns,[  --enable--dns		enable V2 DNS  extension], no)dnl
+OL_ARG_ENABLE(referrals,[  --enable-referrals	enable V2 Referrals extension], yes)dnl
 OL_ARG_ENABLE(cldap,[  --enable-cldap	enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	enable cross compiling],
 	no, [yes no])dnl
@@ -953,13 +953,13 @@ if test $ol_enable_cache = no ; then
 	AC_DEFINE(LDAP_NOCACHE,1)
 fi
 if test $ol_enable_dns != no ; then
-	AC_DEFINE(LDAP_DNS,1)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION)
 fi
 if test $ol_enable_proctitle != no ; then
 	AC_DEFINE(LDAP_PROCTITLE,1)
 fi
 if test $ol_enable_referrals != no ; then
-	AC_DEFINE(LDAP_REFERRALS,1)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION)
 fi
 if test $ol_enable_cldap != no ; then
 	AC_DEFINE(LDAP_CONNECTIONLESS,1)
@@ -1036,12 +1036,6 @@ dnl ------------------------------------
 dnl final output
 dnl
 
-dnl AC_OUTPUT( \
-dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
-dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
-dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl [date > stamp-h])
-
 AC_OUTPUT( \
 Makefile:build/top.mk:Makefile.in:build/dir.mk \
 doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \