projects / packages / apache.git / blame
| Commit | Line | Data |
|---|---|---|
| 0e467b1f AM |
1 | |
| 2 | There is no need to "suck in" the apr/apr-util symbols when using | |
| 3 | a shared libapr{,util}, it just bloats the symbol table; so don't. | |
| 4 | ||
| 5 | --- httpd-2.0.48/server/main.c.export | |
| 6 | +++ httpd-2.0.48/server/main.c | |
| 7 | @@ -669,28 +669,6 @@ | |
| 8 | return 0; /* Termination 'ok' */ | |
| 9 | } | |
| 10 | ||
| 11 | -/* force Expat to be linked into the server executable */ | |
| 12 | -#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP) | |
| 13 | -#include "xmlparse.h" | |
| 14 | -const XML_LChar *suck_in_expat(void); | |
| 15 | -const XML_LChar *suck_in_expat(void) | |
| 16 | -{ | |
| 17 | - return XML_ErrorString(XML_ERROR_NONE); | |
| 18 | -} | |
| 19 | -#endif /* USE_EXPAT */ | |
| 20 | - | |
| 21 | -#ifndef SHARED_CORE_BOOTSTRAP | |
| 22 | -/* | |
| 23 | - * Force apr_password_validate() into the image so that modules like | |
| 24 | - * mod_auth can use it even if they're dynamically loaded. | |
| 25 | - */ | |
| 26 | -void suck_in_apr_password_validate(void); | |
| 27 | -void suck_in_apr_password_validate(void) | |
| 28 | -{ | |
| 29 | - apr_password_validate("a", "b"); | |
| 30 | -} | |
| 31 | -#endif | |
| 32 | - | |
| 33 | #ifdef AP_USING_AUTOCONF | |
| 34 | /* This ugly little hack pulls any function referenced in exports.c into | |
| 35 | * the web server. exports.c is generated during the build, and it | |
| 36 | --- httpd-2.0.48/server/Makefile.in.export | |
| 37 | +++ httpd-2.0.48/server/Makefile.in | |
| 38 | @@ -30,7 +30,7 @@ | |
| 39 | ||
| 40 | util.lo: test_char.h | |
| 41 | ||
| 42 | -EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http | |
| 43 | +EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http | |
| 44 | ||
| 45 | # If export_files is a dependency here, but we remove it during this stage, | |
| 46 | # when exports.c is generated, make will not detect that export_files is no |