From 54dab092fd1f375716a5d42a285cb0e3790da9f0 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 2 Nov 2018 09:01:27 +0100
Subject: Don't use expand, just add the new variables to the paths, in some
 way the changes conflicted with the ACE gnuace template making TAO security
 to break

    * config/openssl.mpb:
    * config/xerces.mpb:
---
 config/openssl.mpb | 13 ++-----------
 config/xerces.mpb  | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'config')

diff --git a/config/openssl.mpb b/config/openssl.mpb
index 8af0fef4..c9d6f873 100644
--- a/config/openssl.mpb
+++ b/config/openssl.mpb
@@ -4,17 +4,8 @@
 // default. If we ever add a new ssl library, then you
 // would likely enable only one ssl library feature.
 feature(openssl) {
-  expand(SSL_INCDIR) {
-    $SSL_INCDIR
-    $(SSL_ROOT)/include
-  }
-  expand(SSL_LIBDIR) {
-    $SSL_LIBDIR
-    $(SSL_ROOT)/lib
-  }
-
-  includes += $(SSL_INCDIR)
-  libpaths += $(SSL_LIBDIR)
+  includes += $(SSL_INCDIR) $(SSL_ROOT)/include
+  libpaths += $(SSL_LIBDIR) $(SSL_ROOT)/lib
 
   specific(prop:windows) {
     lit_libs += libeay32 ssleay32
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 85f7e8aa..84e1c82b 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -29,17 +29,8 @@ feature(xerces2) {
   lit_libs += $(XERCESLIB)
 }
 feature(xerces3) {
-  expand(XERCESC_INCDIR) {
-    $XERCESC_INCDIR
-    $(XERCESCROOT)/include
-  }
-  expand(XERCESC_LIBDIR) {
-    $XERCESC_LIBDIR
-    $(XERCESCROOT)/lib
-  }
-
-  includes += $(XERCESC_INCDIR)
-  libpaths += $(XERCESC_LIBDIR)
+  includes += $(XERCESC_INCDIR) $(XERCESCROOT)/include
+  libpaths += $(XERCESC_LIBDIR) $(XERCESCROOT)/lib
 
   specific(prop:microsoft) {
     xerceslib = xerces-c_3
-- 
cgit v1.2.1