Align with back-ldbm version

[openldap] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index b7ce6091d09dfe801020c12ef9ae138e1574ae43..cd851058d1b97f094e614cc38f993a406bdf6f36 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -25,44 +25,6 @@ dnl
 divert(-1)
 builtin(include, build/openldap.m4)dnl
 
-
-AC_DEFUN(AC_PROG_SHTOOL,[dnl
-AC_PREREQ(2.13)dnl
-AC_MSG_CHECKING([for GNU shtool])
-AC_CACHE_VAL(ac_cv_shtool,[dnl
-#   canonicalize and split path string
-ac_paths="`echo .:$ac_aux_dir:$PATH |\
-           sed -e 's%/*:%:%g' -e 's%/*$%%' \
-               -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
-               -e 's/:/ /g'`"
-#   iterate over $PATH but prefer CWD
-ac_cv_shtool=""
-for ac_path in $ac_paths; do
-    if test -f "$ac_path/shtool" && test ! -d "$ac_path/shtool"; then
-        ac_cv_shtool="$ac_path/shtool"
-        break
-    fi
-done
-#   check for existance
-if test ".$ac_cv_shtool" = .; then
-    AC_MSG_ERROR([no shtool found in .:$PATH])
-fi
-#   check deeper
-ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'`
-if test ".$ac_rc" = .; then
-    ac_cv_shtool="${CONFIG_SHELL-/bin/sh} $ac_cv_shtool"
-    ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'`
-    if test ".$ac_rc" = .; then
-        AC_MSG_ERROR([$ac_cv_shtool seems not to be GNU shtool])
-    fi
-fi
-])dnl
-AC_MSG_RESULT([$ac_cv_shtool])
-SHTOOL="$ac_cv_shtool"
-AC_SUBST(SHTOOL)
-])
-
-
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.