From c4aa6000236c00294ee60d847b016f4ba0a73810 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Thu, 8 Jan 2004 20:47:29 +0000
Subject: [PATCH] Use -export-dynamic only when linking an httpd which includes
 mod_so, not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/aaa/config.m4         | 2 --
 modules/arch/win32/config.m4  | 2 --
 modules/cache/config.m4       | 2 --
 modules/echo/config.m4        | 2 --
 modules/filters/config.m4     | 2 --
 modules/generators/config5.m4 | 2 --
 modules/mappers/config9.m4    | 4 ++++
 modules/metadata/config.m4    | 2 --
 8 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index eb8fa7b9bd..2018f0c778 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -44,6 +44,4 @@ APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   fi
 ])
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODPATH_FINISH
diff --git a/modules/arch/win32/config.m4 b/modules/arch/win32/config.m4
index 25f7a85092..584e76d9c2 100644
--- a/modules/arch/win32/config.m4
+++ b/modules/arch/win32/config.m4
@@ -6,6 +6,4 @@ APACHE_MODPATH_INIT(arch/win32)
 
 APACHE_MODULE(isapi, isapi extension support, , , no)
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODPATH_FINISH
diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 9eabf54127..cdec8c56eb 100644
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -6,6 +6,4 @@ APACHE_MODPATH_INIT(cache)
 
 APACHE_MODULE(file_cache, File cache, , , no)
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODPATH_FINISH
diff --git a/modules/echo/config.m4 b/modules/echo/config.m4
index 234a7d5e9a..02c42b1522 100644
--- a/modules/echo/config.m4
+++ b/modules/echo/config.m4
@@ -6,6 +6,4 @@ APACHE_MODPATH_INIT(echo)
 
 APACHE_MODULE(echo, ECHO server, , , no)
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODPATH_FINISH
diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 385dbe3038..89b564cdb1 100644
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -7,8 +7,6 @@ APACHE_MODPATH_INIT(filters)
 APACHE_MODULE(ext_filter, external filter module, , , most)
 APACHE_MODULE(include, Server Side Includes, , , yes)
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   AC_ARG_WITH(z, APACHE_HELP_STRING(--with-z=DIR,use a specific zlib library),
   [
diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 7113018226..f88ce33bff 100644
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -11,8 +11,6 @@ APACHE_MODULE(info, server information, , , most)
 APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [
               other_targets=suexec ] )
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
 # if we are using a threaded MPM, we will get better performance with
 # mod_cgid, so make it the default.
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index adb66ea8da..198a953dc3 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -41,6 +41,10 @@ if test "x$enable_so" = "xyes"; then
     enable_so="static"
 fi
 
+if test "x$enable_so" = "xstatic"; then
+    APR_ADDTO(HTTPD_LDFLAGS, [-export-dynamic])
+fi
+
 if test "$sharedobjs" = "yes"; then
     if test $ac_cv_define_APR_HAS_DSO = "no"; then
         AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4
index e20e1dd612..4efd4a1683 100644
--- a/modules/metadata/config.m4
+++ b/modules/metadata/config.m4
@@ -19,6 +19,4 @@ APACHE_MODULE(usertrack, user-session tracking, , , , [
 APACHE_MODULE(unique_id, per-request unique ids)
 APACHE_MODULE(setenvif, basing ENV vars on headers, , , yes)
 
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
 APACHE_MODPATH_FINISH
-- 
2.50.1