* acconfig.h: Remove file.

* configure.in: Use autoheader AH_BOTTOM macro to hard-code tail end
of apr_private.h.

* threadproc/unix/signals.c (apr_sigwait): Define here rather than in
apr_private.h since it's only used here.

* build/apr_common.m4 (APR_DECIDE): AC_DEFUN the macro, use
AH_TEMPLATE to define the template for apr_private.h.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125062 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 31 insertions, 41 deletions

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 28ac63aa1..000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-@TOP@
-
-/* Various #defines we need to know about */
-#undef EGD_DEFAULT_SOCKET
-
-/* Cross process serialization techniques */
-#undef USE_FLOCK_SERIALIZE
-#undef USE_SYSVSEM_SERIALIZE
-#undef USE_FCNTL_SERIALIZE
-#undef USE_PROC_PTHREAD_SERIALIZE
-#undef USE_PTHREAD_SERIALIZE
-
-@BOTTOM@
-
-/* Make sure we have ssize_t defined to be something */
-#undef ssize_t
-
-/* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
-#define BEOS_R5 1
-#else
-#define BEOS_BONE 1
-#endif
-
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define apr_sigwait(a,b) sigwait((a),(b))
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif /* APR_PRIVATE_H */
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 8dd0ac156..82d3e087c 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -379,7 +379,9 @@ ac_decision=''
 ])
 
 
-define(APR_DECIDE,[dnl
+AC_DEFUN([APR_DECIDE],[dnl
+dnl Define the flag (or not) in apr_private.h via autoheader
+AH_TEMPLATE($1, [Define if $2 will be used])
 ac_decision='$1'
 ac_decision_msg='$2'
 ac_decision_$1=yes
diff --git a/configure.in b/configure.in
index 178005ac7..f4dfeecfc 100644
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,27 @@ sinclude(build/apr_hints.m4)
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
 
+dnl Hard-coded inclusion at the tail end of apr_private.h:
+AH_BOTTOM([
+/* switch this on if we have a BeOS version below BONE */
+#if BEOS && !HAVE_BONE_VERSION
+#define BEOS_R5 1
+#else
+#define BEOS_BONE 1
+#endif
+
+#ifdef SIGWAIT_TAKES_ONE_ARG
+#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
+#else
+#define apr_sigwait(a,b) sigwait((a),(b))
+#endif
+
+/*
+ * Include common private declarations.
+ */
+#include "../apr_private_common.h"
+])
+
 dnl Save user-defined environment settings for later restoration
 dnl
 APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c
index 7ecac1b97..4b8f2af97 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/signals.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,12 @@
 #include <pthread.h>
 #endif
 
+#ifdef SIGWAIT_TAKES_ONE_ARG
+#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
+#else
+#define apr_sigwait(a,b) sigwait((a),(b))
+#endif
+
 APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int signum)
 {
 #ifdef OS2