*) fix up buildexports.sh:

   - enable it to be run from any dir by passing a parameter for the
     location of srclib, and using its own location for determining where
     the AWK script is located
   - accept exports files on STDIN, and produce output on STDOUT
   - use "pwd" and cd back to it, rather than assuming ../../.. (which might
     not apply if we feed it other export files)
   - add USAGE reporting

*) generate exports.c during normal build of "server" rather than during the
   buildconf stage. update invocation to match above changes

*) revamp the ap_ugly_hack referencing in main.c: put it at the bottom of
   the file with the other, similar references, and style it similarly.

*) remove the ap_ugly_hack declaration from http_main.h; it is internal to
   the "server" code


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

1 files changed, 14 insertions, 8 deletions

diff --git a/server/main.c b/server/main.c
index 2604dbf40e..4e3497f643 100644
--- a/server/main.c
+++ b/server/main.c
@@ -301,14 +301,6 @@ int main(int argc, const char * const argv[])
 
     apr_initialize();
 
-#ifdef AP_USING_AUTOCONF
-    /* This ugly little hack pulls any function referenced in exports.c into
-     * the web server.  exports.c is generated by buildconf, and it
-     * has all of the apr functions specified by httpd.exp.
-     */
-    ap_ugly_hack = (void *) apr_initialize;
-#endif
-
     process = create_process(argc, argv);
     pglobal = process->pool;
     pconf = process->pconf;
@@ -456,3 +448,17 @@ void suck_in_apr_validate_password(void)
 }
 #endif
 
+#ifdef AP_USING_AUTOCONF
+/* This ugly little hack pulls any function referenced in exports.c into
+ * the web server.  exports.c is generated during the build, and it
+ * has all of the APR functions specified by the apr/apr.exports and
+ * apr-util/aprutil.exports files.
+ */
+const void *suck_in_APR(void);
+const void *suck_in_APR(void)
+{
+    extern const void *ap_ugly_hack;
+
+    return ap_ugly_hack;
+}
+#endif