Rebuild configure using autoconf 1.3 (with aclocal from automake 1.4).

aclocal.m4

@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -27,7 +27,7 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -37,8 +37,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -50,15 +50,6 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
 #
 # Check to make sure that the build environment is sane.
 #
@@ -476,7 +467,8 @@ AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
   fi
   ])
   if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
-    AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+    AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1,
+              [Define if TIOCGWINSZ requires sys/ioctl.h])
   fi
 ])
 
@@ -504,7 +496,7 @@ AC_DEFUN(AM_TYPE_PTRDIFF_T,
      [AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
 		     am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
    if test $am_cv_type_ptrdiff_t = yes; then
-     AC_DEFINE(HAVE_PTRDIFF_T)
+     AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
    fi
 ])
 

configure.in

@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
 dnl Do not use AutoConf 2.12; it produces a configuration script
 dnl that causes an "internal 2K buffer" error on HPUX when run
 dnl with /bin/sh.  Autoconf 2.10 seems to be okay.
-AC_PREREQ(2.10)dnl Required Autoconf version
+AC_PREREQ(2.13)dnl Required Autoconf version
 
 AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
 

include/portable.h.in

@@ -122,9 +122,6 @@
 /* define this if sys_errlist is not defined in stdio.h or errno.h */
 #undef DECL_SYS_ERRLIST
 
-/* define this if TIOCGWINSZ is defined in sys/ioctl.h */
-#undef GWINSZ_IN_SYS_IOCTL
-
 /* define if you have berkeley db */
 #undef HAVE_BERKELEY_DB
 
@@ -176,9 +173,6 @@
 /* define if your POSIX Threads implementation is circa Draft 4 */
 #undef HAVE_PTHREADS_D4
 
-/* define if you have ptrdiff_t */
-#undef HAVE_PTRDIFF_T
-
 /* define if you have res_search() */
 #ifdef __notdef__
 /* see second res_search define */
@@ -615,6 +609,19 @@
 
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
+
+/* Define if TIOCGWINSZ requires sys/ioctl.h */
+#undef GWINSZ_IN_SYS_IOCTL
+
+/* Define if system has ptrdiff_t type */
+#undef HAVE_PTRDIFF_T
+
+/* 1 */
+#undef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
+
+/* 1 */
+#undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+
 /* portable.h.bot begin */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA

servers/slapd/slap.h

@@ -344,7 +344,7 @@ typedef struct slap_conn {
 	{ \
 		if ( ldap_debug & level ) \
 			fprintf( stderr, fmt, connid, opid, arg1, arg2, arg3 );\
-		if ( ldap_syslog & level ) \
+		if ( 0 && (ldap_syslog & level) ) \
 			syslog( ldap_syslog_level, fmt, connid, opid, arg1, \
 			    arg2, arg3 ); \
 	}