remove APACHE_CHECK_DBM and the usage of srclib/sdbm/. this stuff is part of

APRUTIL now.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87231 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index ae562da4cc49e65dd3c71dc52c8333c9f65f2ca1..f08f1746832990d252e875c6b7da4b837a4d7ad4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -395,44 +395,3 @@ AC_DEFUN(APACHE_REQUIRE_CXX,[
     apache_cxx_done=yes
   fi
 ])
-
-dnl
-dnl APACHE_CHECK_DBM
-dnl
-AC_DEFUN(APACHE_CHECK_DBM,[
-
-apu_use_sdbm=0
-apu_use_gdbm=0
-AC_MSG_CHECKING(for chosen DBM type)
-AC_ARG_WITH(dbm,
-  [  --with-dbm=DBM          Choose the DBM type to use. DBM={sdbm,gdbm}],[
-  if test "$withval" = "yes"; then
-    AC_MSG_ERROR([You need to specify a DBM type to use. One of: sdbm, gdbm])
-  fi
-  case "$withval" in
-    sdbm)
-      apache_need_sdbm=yes
-      apu_use_sdbm=1
-      AC_MSG_RESULT(sdbm)
-      ;;
-    gdbm)
-      apu_use_gdbm=1
-      AC_MSG_RESULT(gdbm)
-
-      dnl ### probably need more work in here to locate GDBM
-      AC_ADD_LIBRARY(gdbm)
-      ;;
-    *)
-      AC_MSG_ERROR([$withval is an unknown DBM type. Use one of: sdbm, gdbm])
-      ;;
-  esac
-],[
-  apache_need_sdbm=yes
-  apu_use_sdbm=1
-  AC_MSG_RESULT([sdbm (default)])
-])
-APACHE_SUBST(apu_use_sdbm)
-APACHE_SUBST(apu_use_gdbm)
-APACHE_OUTPUT(lib/aputil/apu_private.h)
-
-])

diff --git a/configure.in b/configure.in
index 39e8174eca0764907eb8073ba99b953125ebabb7..9119b15c1fa40f526a17d5f695493fa20ccc728a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ dnl
 dnl Process command line arguments. This is done early in the process so the
 dnl user can get feedback quickly in case of an error.
 dnl
-APACHE_CHECK_DBM
+dnl ### need to move some of the arguments "up here"
 
 dnl ## Check for programs
 
@@ -177,11 +177,6 @@ dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
 dnl AP_LIBS specifies the actual libraries. note we have some required libs.
 AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
 
-if test "$apache_need_sdbm" = "yes"; then
-  AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
-  AP_LIBS="$AP_LIBS srclib/sdbm/libsdbm.la"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/sdbm"
-fi
 if test "$apache_need_expat" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
   AP_LIBS="$AP_LIBS srclib/expat-lite/libexpat.la"