jorton 2002/11/14 10:30:03
Modified: build apr_common.m4
. acconfig.h
Log:
Have APR_CHECK_SIZEOF_EXTENDED and APR_CHECK_DEFINE pass the third
argument to AC_DEFINE(_UNQUOTED); remove corresponding lines from
acconfig.h.
(dropping the third argument to APR_CHECK_DEFINE)
Revision Changes Path
1.46 +3 -3 apr/build/apr_common.m4
Index: apr_common.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_common.m4,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- apr_common.m4 14 Nov 2002 18:07:11 -0000 1.45
+++ apr_common.m4 14 Nov 2002 18:30:02 -0000 1.46
@@ -249,7 +249,7 @@
dnl
-dnl APR_CHECK_DEFINE( symbol, header_file [, description ])
+dnl APR_CHECK_DEFINE(symbol, header_file)
dnl
AC_DEFUN(APR_CHECK_DEFINE,[
AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
@@ -261,7 +261,7 @@
], ac_cv_define_$1=yes, ac_cv_define_$1=no)
])
if test "$ac_cv_define_$1" = "yes"; then
- AC_DEFINE(HAVE_$1, 1, [$3])
+ AC_DEFINE(HAVE_$1, 1, [Define if $1 is defined in $2])
fi
])
@@ -398,7 +398,7 @@
}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,,
AC_CV_NAME=$3))])dnl
AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The size of ]$2)
undefine([AC_TYPE_NAME])dnl
undefine([AC_CV_NAME])dnl
])
1.59 +0 -18 apr/acconfig.h
Index: acconfig.h
===================================================================
RCS file: /home/cvs/apr/acconfig.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- acconfig.h 14 Nov 2002 18:07:14 -0000 1.58
+++ acconfig.h 14 Nov 2002 18:30:02 -0000 1.59
@@ -4,15 +4,9 @@
@TOP@
/* Various #defines we need to know about */
-#undef HAVE_LOCK_EX
-#undef HAVE_F_SETLK
-#undef HAVE_SEM_UNDO
-#undef HAVE_PTHREAD_PROCESS_SHARED
#undef DEV_RANDOM
#undef EGD_DEFAULT_SOCKET
#undef HAVE_isascii
-#undef HAVE_SO_ACCEPTFILTER
-#undef HAVE_MAP_ANON
/* Cross process serialization techniques */
#undef USE_FLOCK_SERIALIZE
@@ -26,19 +20,7 @@
#undef FCNTL_IS_GLOBAL
#undef FLOCK_IS_GLOBAL
-#undef SIZEOF_SSIZE_T
-#undef SIZEOF_SIZE_T
-#undef SIZEOF_OFF_T
-#undef SIZEOF_PID_T
-
#undef HAVE_INT64_C
-
-/* BeOS specific flag */
-#undef HAVE_BONE_VERSION
-
-/* Does this system have a corkable TCP? */
-#undef HAVE_TCP_CORK
-#undef HAVE_TCP_NOPUSH
@BOTTOM@
