Add warning regarding LDAP_MOD_* so poeple won't reuse the LDAP_MOD_SOFTADD

[openldap] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 65d59a0af85b26e7cd3142fd68adb0ae2cf6b315..b94a3ff946c285467cffb03e139e7a6675887a38 100644 (file)
--- a/aclocal.m4
+++ b/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.
 
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 


@@ -10,7 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 

-dnl Copyright 1998 The OpenLDAP Foundation,  All Rights Reserved.
+dnl Copyright 1998-1999 The OpenLDAP Foundation,  All Rights Reserved.

 dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 dnl
 dnl OpenLDAP Autoconf Macros


@@ -27,7 +27,7 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 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]
 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_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.
 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])])
 
 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.
 #
 #
 # 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
   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
 ])
 
   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_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
 ])
 
    fi
 ])