rbb 00/01/28 09:42:53
Modified: src/lib/apr configure.in
src/lib/apr/include apr.h.in apr_general.h
Log:
Fix the APR build process on UNIX. We need to include signal.h if we have
it.
Revision Changes Path
1.50 +2 -1 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- configure.in 2000/01/27 23:49:23 1.49
+++ configure.in 2000/01/28 17:42:45 1.50
@@ -223,7 +223,7 @@
AC_CHECK_HEADERS(pwd.h)
AC_CHECK_HEADERS(sys/sem.h)
AC_CHECK_HEADERS(setjmp.h)
-AC_CHECK_HEADERS(signal.h)
+AC_CHECK_HEADERS(signal.h, signalh="1", signalh="0")
AC_CHECK_HEADERS(stdarg.h, stdargh="1", stdargh="0")
AC_CHECK_HEADERS(stddef.h)
AC_CHECK_HEADERS(stdio.h, stdioh="1", stdioh"0")
@@ -384,6 +384,7 @@
AC_SUBST(stdioh)
AC_SUBST(sys_typesh)
AC_SUBST(sys_uioh)
+AC_SUBST(signalh)
AC_SUBST(threads)
AC_SUBST(pthreadh)
AC_SUBST(short_value)
1.13 +1 -0 apache-2.0/src/lib/apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr.h.in 2000/01/27 23:49:26 1.12
+++ apr.h.in 2000/01/28 17:42:51 1.13
@@ -33,6 +33,7 @@
#define APR_HAVE_STDIO_H @stdioh@
#define APR_HAVE_SYS_TYPES_H @sys_typesh@
#define APR_HAVE_SYS_UIO_H @sys_uioh@
+#define APR_HAVE_SIGNAL_H @signalh@
#define APR_USE_FLOCK_SERIALIZE @flockser@
#define APR_USE_SYSVSEM_SERIALIZE @sysvser@
1.16 +6 -3 apache-2.0/src/lib/apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_general.h 2000/01/19 01:14:56 1.15
+++ apr_general.h 2000/01/28 17:42:52 1.16
@@ -53,6 +53,9 @@
*
*/
+#ifndef APR_GENERAL_H
+#define APR_GENERAL_H
+
#ifdef WIN32
#include "apr_win.h"
#else
@@ -65,10 +68,10 @@
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#if APR_HAVE_SIGNAL_H
+#include <signal.h>
+#endif
#include "apr_errno.h"
-
-#ifndef APR_GENERAL_H
-#define APR_GENERAL_H
#ifdef __cplusplus
extern "C" {
