Fix building with DSO support. If any module is configured to be

compiled for shared support then APR_HAS_DSO is enabled and -ldl is
added to the LIBS variable.  -ldl may need to be modified based on
platform.  If no modules are designated as shared then APR_HAS_DSO is
disabled and nothing is added to LIBS.  In basic testing this compiled
without errors or warnings.


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

2 files changed, 9 insertions, 0 deletions

diff --git a/dso/os2/dso.c b/dso/os2/dso.c
index 4f4f71d62..b95c86801 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -58,6 +58,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#if APR_HAS_DSO
+
 ap_status_t ap_dso_init() 
 {
     return APR_SUCCESS;
@@ -141,3 +143,5 @@ char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
     ap_cpystrn(buffer, message, buflen);
     return buffer;
 }
+
+#endif
diff --git a/dso/os2/dso.h b/dso/os2/dso.h
index 86d82f22a..b37e1a54c 100644
--- a/dso/os2/dso.h
+++ b/dso/os2/dso.h
@@ -62,6 +62,9 @@
 #include "apr_general.h"
 #include "apr_pools.h"
 #include "apr_dso.h"
+#include "apr.h"
+
+#if APR_HAS_DSO
 
 struct ap_dso_handle_t {
     ap_pool_t  *cont;       /* Context for returning error strings */
@@ -71,3 +74,5 @@ struct ap_dso_handle_t {
 };
 
 #endif
+
+#endif