cvsdist 6356941
cvsdist 6356941
There is no need to "suck in" the apr/apr-util symbols when using
cvsdist 6356941
a shared libapr{,util}, it just bloats the symbol table; so don't.
cvsdist 6356941
cvsdist 6356941
--- httpd-2.0.48/server/main.c.export
cvsdist 6356941
+++ httpd-2.0.48/server/main.c
cvsdist 6356941
@@ -669,28 +669,6 @@
cvsdist 6356941
     return 0; /* Termination 'ok' */
cvsdist 6356941
 }
cvsdist 6356941
 
cvsdist 6356941
-/* force Expat to be linked into the server executable */
cvsdist 6356941
-#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP)
cvsdist 6356941
-#include "xmlparse.h"
cvsdist 6356941
-const XML_LChar *suck_in_expat(void);
cvsdist 6356941
-const XML_LChar *suck_in_expat(void)
cvsdist 6356941
-{
cvsdist 6356941
-    return XML_ErrorString(XML_ERROR_NONE);
cvsdist 6356941
-}
cvsdist 6356941
-#endif /* USE_EXPAT */
cvsdist 6356941
-
cvsdist 6356941
-#ifndef SHARED_CORE_BOOTSTRAP
cvsdist 6356941
-/*
cvsdist 6356941
- * Force apr_password_validate() into the image so that modules like
cvsdist 6356941
- * mod_auth can use it even if they're dynamically loaded.
cvsdist 6356941
- */
cvsdist 6356941
-void suck_in_apr_password_validate(void);
cvsdist 6356941
-void suck_in_apr_password_validate(void)
cvsdist 6356941
-{
cvsdist 6356941
-    apr_password_validate("a", "b");
cvsdist 6356941
-}
cvsdist 6356941
-#endif
cvsdist 6356941
-
cvsdist 6356941
 #ifdef AP_USING_AUTOCONF
cvsdist 6356941
 /* This ugly little hack pulls any function referenced in exports.c into
cvsdist 6356941
  * the web server.  exports.c is generated during the build, and it
cvsdist 6356941
--- httpd-2.0.48/server/Makefile.in.export
cvsdist 6356941
+++ httpd-2.0.48/server/Makefile.in
cvsdist 6356941
@@ -30,7 +30,7 @@
cvsdist 6356941
 
cvsdist 6356941
 util.lo: test_char.h
cvsdist 6356941
 
cvsdist 6356941
-EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
cvsdist 6356941
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http
cvsdist 6356941
 
cvsdist 6356941
 # If export_files is a dependency here, but we remove it during this stage,
cvsdist 6356941
 # when exports.c is generated, make will not detect that export_files is no