diff -up pegasus/env_var_Linux.status_orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status_orig	2011-05-17 15:05:31.568195433 +0200
+++ pegasus/env_var_Linux.status	2011-05-17 15:12:09.216249476 +0200
@@ -17,7 +17,9 @@ ifndef PEGASUS_STAGING_DIR
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_ENABLE_CQL=false
+PEGASUS_ENABLE_EXECQUERY=true
+PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
 PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
@@ -25,7 +27,6 @@ PEGASUS_HAS_SSL=yes
 PEGASUS_USE_SSL_RANDOMFILE=false
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -36,7 +37,7 @@ PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
 PEGASUS_ENABLE_INTEROP_PROVIDER=false
 PEGASUS_ENABLE_PROTOCOL_WSMAN=false
 
-PEGASUS_ENABLE_SLP=false
+PEGASUS_ENABLE_SLP=true
 ifeq ($(PEGASUS_ENABLE_SLP), true)
 PEGASUS_ENABLE_INTEROP_PROVIDER=true
 PEGASUS_SLP_REG_TIMEOUT=1090
@@ -127,7 +128,7 @@ PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)
 
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
 PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
      $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket