Remove some obsolete macros and rename one that wasn't name protected.

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

3 files changed, 7 insertions, 42 deletions

diff --git a/CHANGES b/CHANGES
index febf41c19e..c016f48cb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,10 @@ Changes with Apache 2.0.18-dev
      need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
      of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
      avoid pointless duplications.  Fix the order in which flags are given
-     on the compile and link lines.  [Roy Fielding]
+     on the compile and link lines.  Remove obsolete macros APR_DOEXTRA,
+     AC_ADD_LIBRARY, AC_CHECK_DEFINE, APACHE_PASSTHRU, and APACHE_ONCE.
+     Added APR_SAVE_THE_ENVIRONMENT and APR_RESTORE_THE_ENVIRONMENT macros.
+     Renamed AC_TYPE_RLIM_T macro to APACHE_TYPE_RLIM_T.  [Roy Fielding]
 
   *) Get mod_tls to compile/work better on Windows.  PR #7612
      [Bernhard Schrenk <b.schrenk@improx.com>]
diff --git a/acinclude.m4 b/acinclude.m4
index b63ca248de..e412f55618 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,8 +1,3 @@
- 
-AC_DEFUN(APACHE_PASSTHRU,[
-  unset ac_cv_pass_$1
-  AC_CACHE_VAL(ac_cv_pass_$1, [ac_cv_pass_$1=$$1])
-])
 
 dnl APACHE_SUBST(VARIABLE)
 dnl Makes VARIABLE available in generated files
@@ -114,30 +109,11 @@ AC_DEFUN(APACHE_OUTPUT, [
 ])
 
 dnl
-dnl AC_CHECK_DEFINE(macro, headerfile)
-dnl
-dnl checks for the macro in the header file
-dnl
-AC_DEFUN(AC_CHECK_DEFINE,[
-  AC_CACHE_CHECK(for $1 in $2, ac_cv_define_$1,
-  AC_EGREP_CPP([YES_IS_DEFINED], [
-#include <$2>
-#ifdef $1
-YES_IS_DEFINED
-#endif
-  ], ac_cv_define_$1=yes, ac_cv_define_$1=no))
-  if test "$ac_cv_define_$1" = "yes" ; then
-      AC_DEFINE(HAVE_$1,,
-          [Define if the macro "$1" is defined on this system])
-  fi
-])
-
-dnl
-dnl AC_TYPE_RLIM_T
+dnl APACHE_TYPE_RLIM_T
 dnl
 dnl If rlim_t is not defined, define it to int
 dnl
-AC_DEFUN(AC_TYPE_RLIM_T, [
+AC_DEFUN(APACHE_TYPE_RLIM_T, [
   AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
     AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -154,20 +130,6 @@ AC_DEFUN(AC_TYPE_RLIM_T, [
   fi
 ])
 
-dnl
-dnl APACHE_ONCE(namespace, variable, code)
-dnl
-dnl execute code, if variable is not set in namespace
-dnl
-AC_DEFUN(APACHE_ONCE,[
-  unique=`echo $ac_n "$2$ac_c" | tr -cd a-zA-Z0-9`
-  cmd="echo $ac_n \"\$$1$unique$ac_c\""
-  if test -n "$unique" && test "`eval $cmd`" = "" ; then
-    eval "$1$unique=set"
-    $3
-  fi
-])
-
 dnl APACHE_MODPATH_INIT(modpath)
 AC_DEFUN(APACHE_MODPATH_INIT,[
   current_dir=$1
diff --git a/os/unix/config.m4 b/os/unix/config.m4
index 7d7252557f..688312c4a6 100644
--- a/os/unix/config.m4
+++ b/os/unix/config.m4
@@ -1,5 +1,5 @@
 if test "$OS" = "unix" ; then
-    AC_TYPE_RLIM_T
+    APACHE_TYPE_RLIM_T
 
     AC_CHECK_HEADERS(sys/time.h sys/resource.h)