summaryrefslogtreecommitdiffstats
path: root/mak
diff options
context:
space:
mode:
authorh.sterling <h.sterling>2005-04-08 17:41:22 +0000
committerh.sterling <h.sterling>2005-04-08 17:41:22 +0000
commit0ad1b4d481c9f74c1d9732d006778bf9db6862ec (patch)
tree63aa44b5a9340c15c64303fcf64de0561e806974 /mak
parent1c2d0c7b7ca9d36bd412d4be158695cd29292629 (diff)
downloadtog-pegasus-0ad1b4d481c9f74c1d9732d006778bf9db6862ec.zip
tog-pegasus-0ad1b4d481c9f74c1d9732d006778bf9db6862ec.tar.gz
tog-pegasus-0ad1b4d481c9f74c1d9732d006778bf9db6862ec.tar.xz
BUG#:2147
TITLE:connectLocal fails to use correct port if 2 CIMOMs are installed DESCRIPTION: Allow the env var PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET to disable local domain sockets.
Diffstat (limited to 'mak')
-rw-r--r--mak/config.mak14
-rwxr-xr-xmak/platform_VMS_ALPHA_DECCXX.mak4
-rwxr-xr-xmak/platform_VMS_IA64_DECCXX.mak4
-rw-r--r--mak/platform_WIN32_IX86_MSVC.mak4
4 files changed, 16 insertions, 10 deletions
diff --git a/mak/config.mak b/mak/config.mak
index ba772a4..3c64daa 100644
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -69,8 +69,8 @@ REPOSITORY_NAME = repository
REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
# define the repository mode
-# XML = XML format
-# BIN = Binary format
+# XML = XML format
+# BIN = Binary format
#
REPOSITORY_MODE = XML
@@ -145,9 +145,9 @@ LEX = flex
## Here is an example using the DIFFSORT function:
##
## difftest: FORCE
-## @ test > result
+## @ test > result
## @ $(call DIFFSORT,result,standard_result)
-## @ $(ECHO) +++++ all test passed
+## @ $(ECHO) +++++ all test passed
##
define NL
@@ -261,6 +261,12 @@ else
endif
endif
+# Bug 2147
+# Allow local domain socket usage to be disabled.
+ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
+ DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
+endif
+
# PEP 211
# Controls object normalization support.
ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
diff --git a/mak/platform_VMS_ALPHA_DECCXX.mak b/mak/platform_VMS_ALPHA_DECCXX.mak
index 3dc1d60..2422a77 100755
--- a/mak/platform_VMS_ALPHA_DECCXX.mak
+++ b/mak/platform_VMS_ALPHA_DECCXX.mak
@@ -61,5 +61,5 @@ LIB_SUFFIX =.olb
# The Provider User Context feature (PEP 197) is not yet supported on OpenVMS
PEGASUS_DISABLE_PROV_USERCTXT=1
-# Local domain sockets, or an equivalent, is not currently supported on OpenVMS. Bug 2148
-DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
+# Local domain sockets, or an equivalent, is not currently supported on OpenVMS. Bug 2147
+PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
diff --git a/mak/platform_VMS_IA64_DECCXX.mak b/mak/platform_VMS_IA64_DECCXX.mak
index e9e9bb5..9df87a7 100755
--- a/mak/platform_VMS_IA64_DECCXX.mak
+++ b/mak/platform_VMS_IA64_DECCXX.mak
@@ -41,8 +41,8 @@ PEGASUS_ARCHITECTURE_64BIT = yes
PEGASUS_DISABLE_PERFINST = yes
#PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER = yes
-# Local domain sockets, or an equivalent, is not currently supported on OpenVMS. Bug 2148
-DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
+# Local domain sockets, or an equivalent, is not currently supported on OpenVMS. Bug 2147
+PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
CXX = cxx
diff --git a/mak/platform_WIN32_IX86_MSVC.mak b/mak/platform_WIN32_IX86_MSVC.mak
index 3f92ca1..2fdc967 100644
--- a/mak/platform_WIN32_IX86_MSVC.mak
+++ b/mak/platform_WIN32_IX86_MSVC.mak
@@ -126,8 +126,8 @@ PEGASUS_DEST_LIB_DIR = bin
# The Provider User Context feature (PEP 197) is not supported on Windows
PEGASUS_DISABLE_PROV_USERCTXT=1
-# Windows does not support local domain sockets or the equivalent Bug 2148
-DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
+# Windows does not support local domain sockets or the equivalent Bug 2147
+PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
# l10n
ifdef PEGASUS_HAS_MESSAGES