Needed -llutil before @LUTIL_LIBS@

[openldap] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index a1d646526450e700d6b3c0abe0711d7f268b820b..6e8e2e667cd15d0b18275ddb3fe9282bd37bd17f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -112,6 +112,9 @@ AC_DEFUN([OL_BERKELEY_DB2],
                ol_cv_berkeley_db2=yes
        fi
 ])
+ if test $ol_cv_berkeley_db2 = yes ; then
+       AC_DEFINE(HAVE_BERKELEY_DB2,1)
+ fi
 ])dnl
 dnl
 dnl ====================================================================
@@ -175,6 +178,9 @@ AC_DEFUN([OL_BERKELEY_DB],
                ol_cv_berkeley_db=yes
        fi
 ])
+ if test $ol_cv_berkeley_db = yes ; then
+       AC_DEFINE(HAVE_BERKELEY_DB,1)
+ fi
 ])dnl
 dnl
 dnl ====================================================================
@@ -217,6 +223,9 @@ AC_DEFUN([OL_GDBM],
                ol_cv_gdbm=yes
        fi
 ])
+ if test $ol_cv_gdbm = yes ; then
+       AC_DEFINE(HAVE_GDBM,1)
+ fi
 ])dnl
 dnl
 dnl ====================================================================
@@ -231,6 +240,10 @@ dnl                AC_CHECK_FUNC(dbm_open)
 dnl            AC_CHECK_LIB(ndbm,dbm_open)
 dnl            AC_CHECK_LIB(dbm,dbm_open)
 dnl
+dnl restrictions:
+dnl            should also check SVR4 case: dbm_open() in -lucb but that
+dnl            would requiring dealing with -L/usr/ucblib
+dnl
 AC_DEFUN([OL_LIB_NDBM],
 [AC_CACHE_CHECK(for NDBM library, [ol_cv_lib_ndbm],
 [      ol_LIBS="$LIBS"
@@ -253,6 +266,9 @@ dnl uses:
 dnl            OL_LIB_NDBM
 dnl            AC_CHECK_HEADERS(ndbm.h)
 dnl
+dnl restrictions:
+dnl            Doesn't handle SVR4 case (see above)
+dnl
 AC_DEFUN([OL_NDBM],
 [AC_REQUIRE([OL_LIB_NDBM])
  AC_CHECK_HEADERS(ndbm.h)
@@ -263,6 +279,9 @@ AC_DEFUN([OL_NDBM],
                ol_cv_ndbm=yes
        fi
 ])
+ if test $ol_cv_ndbm = yes ; then
+       AC_DEFINE(HAVE_NDBM,1)
+ fi
 ])dnl
 dnl
 dnl ====================================================================
@@ -321,6 +340,30 @@ AC_CACHE_CHECK([for LinuxThreads], [ol_cv_linux_threads], [
 ])
 ])dnl
 dnl
+dnl ====================================================================
+dnl Check if toupper() requires islower() to be called first
+AC_DEFUN([OL_C_UPPER_LOWER],
+[
+AC_MSG_CHECKING([if toupper() requires islower()])
+AC_CACHE_VAL(ol_cv_c_upper_lower,[
+       AC_TRY_RUN([
+#include <ctype.h>
+main()
+{
+       if ('C' == toupper('C'))
+               exit(0);
+       else
+               exit(1);
+}],
+       [ol_cv_c_upper_lower=no],
+       [ol_cv_c_upper_lower=yes],
+       [ol_cv_c_upper_lower=safe])])
+AC_MSG_RESULT($ol_cv_c_upper_lower)
+if test $ol_cv_c_upper_lower != no ; then
+       AC_DEFINE(C_UPPER_LOWER,1)
+fi
+])
+
 dnl ====================================================================
 dnl Check for declaration of sys_errlist in one of stdio.h and errno.h.
 dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration.
@@ -340,7 +383,7 @@ AC_MSG_RESULT($ol_cv_dcl_sys_errlist)
 
 # It's possible (for near-UNIX clones) that sys_errlist doesn't exist
 if test $ol_cv_dcl_sys_errlist = no ; then
-       AC_DEFINE(DECL_SYS_ERRLIST)
+       AC_DEFINE(DECL_SYS_ERRLIST,1)
        AC_MSG_CHECKING([existence of sys_errlist])
        AC_CACHE_VAL(ol_cv_have_sys_errlist,[
                AC_TRY_LINK([#include <errno.h>],