summaryrefslogtreecommitdiffstats
path: root/mak
diff options
context:
space:
mode:
authorjim.wunderlich <jim.wunderlich>2005-08-12 17:52:31 +0000
committerjim.wunderlich <jim.wunderlich>2005-08-12 17:52:31 +0000
commit58366b5934a3a55c33f43408720975d711069a4e (patch)
tree77dbcb290f8e96b8ea2f75a011ca7f74e9da8288 /mak
parentc2935f22e419a42cc0b49d5fceb7b134e150c401 (diff)
downloadtog-pegasus-58366b5934a3a55c33f43408720975d711069a4e.zip
tog-pegasus-58366b5934a3a55c33f43408720975d711069a4e.tar.gz
tog-pegasus-58366b5934a3a55c33f43408720975d711069a4e.tar.xz
BUG#: 3358
TITLE: Can't disable SLP on Windows DESCRIPTION: Added check to assure that not both PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP are set concurrently.
Diffstat (limited to 'mak')
-rw-r--r--mak/config.mak23
1 files changed, 19 insertions, 4 deletions
diff --git a/mak/config.mak b/mak/config.mak
index 064af4d..b9df131 100644
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -442,12 +442,27 @@ ifdef PEGASUS_ENABLE_EMAIL_HANDLER
DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
endif
-# setup function to enable SLP functions in the Pegasus standard compile
-# Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
-# NOTE. Effective with Bug # 2633 some platforms now enable SLP.
+#
+# PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
+#
+# Use PEGASUS_ENABLE_SLP to enable SLP functions in the Pegasus standard
+# compile on those platforms that do not enable it by default.
+#
+# Use PEGASUS_DISABLE_SLP to disable SLP on those platforms that enable
+# it by default.
+#
+# Currently (Aug. 12, 2005) Windows is the only platform that enables SLP
+# by default.
+#
+# NOTE. Effective with Bug # 2633 some platforms enable SLP.
# To see which platforms look for platform make files that set
-# the variable PEGASUS_ENABLE_SLP
+# the variable PEGASUS_ENABLE_SLP.
+#
+#
ifdef PEGASUS_ENABLE_SLP
+ ifdef PEGASUS_DISABLE_SLP
+ $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
+ endif
DEFINES += -DPEGASUS_ENABLE_SLP
endif