You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2001/04/29 08:45:35 UTC
cvs commit: httpd-2.0/os/unix config.m4
fielding 01/04/28 23:45:35
Modified: . CHANGES acinclude.m4
os/unix config.m4
Log:
Remove some obsolete macros and rename one that wasn't name protected.
Revision Changes Path
1.189 +4 -1 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- CHANGES 2001/04/29 05:24:08 1.188
+++ CHANGES 2001/04/29 06:45:34 1.189
@@ -7,7 +7,10 @@
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....@improx.com>]
1.79 +2 -40 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- acinclude.m4 2001/04/29 05:24:08 1.78
+++ acinclude.m4 2001/04/29 06:45:34 1.79
@@ -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
@@ -113,31 +108,12 @@
APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
])
-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>
@@ -151,20 +127,6 @@
if test "$ac_cv_type_rlim_t" = "no" ; then
AC_DEFINE(rlim_t, int,
[Define to 'int' if <sys/resource.h> doesn't define it for us])
- 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
])
1.6 +1 -1 httpd-2.0/os/unix/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/os/unix/config.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.m4 2001/02/11 03:35:41 1.5
+++ config.m4 2001/04/29 06:45:35 1.6
@@ -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)