summaryrefslogtreecommitdiff
path: root/ACE/ace/config-macros.h
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2017-10-05 17:18:40 -0500
committerAdam Mitz <mitza@ociweb.com>2017-10-05 17:18:40 -0500
commit88ce1806d42c2635558b855b2363a7d7f5a62e66 (patch)
tree1ae6a0edfbcfd3e4b2bae32d2fa9b4653aff1e39 /ACE/ace/config-macros.h
parent59e26c1b57e8d38f49a9d1ae1569d2e77d589db0 (diff)
downloadATCD-88ce1806d42c2635558b855b2363a7d7f5a62e66.tar.gz
Set ACE_HAS_DYNAMIC_LINKING=0 when not linking to libdl on linux
Diffstat (limited to 'ACE/ace/config-macros.h')
-rw-r--r--ACE/ace/config-macros.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 2fae4892abd..06909eb5d60 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -114,6 +114,11 @@
# endif
# endif /* ACE_HAS_DYNAMIC_LINKING */
+# if defined (ACE_HAS_DYNAMIC_LINKING) && ACE_HAS_DYNAMIC_LINKING == 0 && \
+ defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
+# undef ACE_HAS_SVR4_DYNAMIC_LINKING
+# endif /* ACE_HAS_DYNAMIC_LINKING == 0 */
+
# if defined (ACE_USES_FIFO_SEM)
# if defined (ACE_HAS_POSIX_SEM) || defined (ACE_LACKS_MKFIFO) || defined (ACE_LACKS_FCNTL)
# undef ACE_USES_FIFO_SEM