(file) Return to configure CVS log (file) (dir) Up to [Pegasus] / pegasus_unsupported / config

Diff for /pegasus_unsupported/config/configure between version 1.21 and 1.22

version 1.21, 2008/11/05 21:07:36 version 1.22, 2008/11/06 14:03:10
Line 163 
Line 163 
       ;;       ;;
  
     --with-external-slp-dir=*)     --with-external-slp-dir=*)
       with_external_slp-dir=$optarg        with_external_slp_dir=$optarg
       ;;       ;;
  
     --disable-cmpi)     --disable-cmpi)
Line 206 
Line 206 
       ;;       ;;
  
     --with-test-user-pass=*)     --with-test-user-pass=*)
       with_test_user-pass=$optarg        with_test_user_pass=$optarg
       ;;       ;;
  
     --with-temp-build-dir=*)     --with-temp-build-dir=*)
Line 296 
Line 296 
         Enable SLP feature         Enable SLP feature
     --enable-openslp     --enable-openslp
         Enable OpenSLP feature (implies --enable-slp).         Enable OpenSLP feature (implies --enable-slp).
           Deprecated. Use --with-external-slp
     --with-openslp=DIR     --with-openslp=DIR
         Find OpenSLP installation under DIR (e.g., --with-openslp=/usr).         Find OpenSLP installation under DIR (e.g., --with-openslp=/usr).
           Deprecated. Use --with-external-slp-dir
     --with-external-slp=TYPE     --with-external-slp=TYPE
         Use external slp defined by keyword (e.g., --with-external-slp=openslp).         Use external slp defined by keyword (e.g., --with-external-slp=openslp).
         Superceedes --enable-openslp.         Superceedes --enable-openslp.
Line 343 
Line 345 
  
 if [ "$with_solaris_defaults" = 1 ]; then if [ "$with_solaris_defaults" = 1 ]; then
     enable_ssl=1     enable_ssl=1
     enable_openslp=1      with_external_slp=openslp
     enable_pam_standalone=1     enable_pam_standalone=1
 fi fi
 if [ "$with_solaris_nevada_defaults" = 1 ]; then if [ "$with_solaris_nevada_defaults" = 1 ]; then
Line 517 
Line 519 
 ##============================================================================== ##==============================================================================
 ## ##
 ## Verify --with-openslp directory. ## Verify --with-openslp directory.
   ## Note that this option is deprecated in favor of the --with-external-slp
   ## option that allows multiple slp types defined as external
 ## ##
 ##============================================================================== ##==============================================================================
  
Line 543 
Line 547 
   fi   fi
  
 fi fi
   
 ##============================================================================== ##==============================================================================
 ## ##
 ## Verify --with-external-slp - Test for valid keyword and no openslp option ## Verify --with-external-slp - Test for valid keyword and no openslp option
 ## ##
 ##============================================================================== ##==============================================================================
 if [ ! -z "$with_external_slp" ]; then if [ ! -z "$with_external_slp" ]; then
   external_slp_types="openslp,solarisslp,none"  
   if [ ! -z "with_open_slp" ]; then    if [  "enable_openslp" = 1 ]; then
      echo Error: trying to use both --with-open-slp and --with-external-slp"       echo "$0: Error: trying to use both --enable-openslp and --with-external-slp"
      exit 1      exit 1
   fi   fi
   pos=`expr index ${external_slp_types} ${with_external_slp}`    ## determine if with_external_slp type is a valid keyword
     ## list of valid keywords each surrounded by a space to prevent
   if (( $pos = 0 )); then    ## subset of keywords passing the test.
     echo "$0: Error: $with_external_slp value is not valid external type"    external_slp_types=" openslp solarisslp none "
     posx=`expr match ${external_slp_types} ".*\ ${with_external_slp} "`
   
     if [ "$posx" = "0" ]; then
       echo "$0: Error: --with-external-slp value. $with_external_slp is not valid type"
       echo "Valid types are $external_slp_types"
     exit 1;     exit 1;
   fi   fi
 fi fi
 if  
   
  
 ##============================================================================== ##==============================================================================
 ## ##
Line 573 
Line 581 
 if [ ! -z "$with_external_slp_dir" ]; then if [ ! -z "$with_external_slp_dir" ]; then
  
   if [ ! -d "$with_external_slp_dir" ]; then   if [ ! -d "$with_external_slp_dir" ]; then
     echo "$0: Error: No such directory: --with-openslp=$with_external_slp_dir"      echo "$0: Error: No such directory: --with-external-slp-dir=$with_external_slp_dir"
     exit 1;     exit 1;
   fi   fi
  
Line 593 
Line 601 
   fi   fi
  
 fi fi
   
 ##============================================================================== ##==============================================================================
 ## ##
 ## These options (if non-empty) must denote absolute directory names. ## These options (if non-empty) must denote absolute directory names.
Line 650 
Line 659 
       echo "$0: The test user account ($with_test_user) has insufficient privileges to access the pegasus root directory ($cwd), which will cause the user-context tests to fail. Please configure from a different directory."       echo "$0: The test user account ($with_test_user) has insufficient privileges to access the pegasus root directory ($cwd), which will cause the user-context tests to fail. Please configure from a different directory."
       exit 1       exit 1
     fi     fi
     else
        echo "Warning: Using --with-test-user without --enable_pam or --enable-pam-standalone"
   fi   fi
  
   
 fi fi
  
 ##============================================================================== ##==============================================================================
Line 787 
Line 799 
   echo "export PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true" >> $options   echo "export PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true" >> $options
 fi fi
  
 if [ "$with-test-user" != "1" ]; then  if [ ! -z "$with_test_user" ]; then
   echo "export PEGASUS_TEST_USER_ID=$with_test_user" >> $options   echo "export PEGASUS_TEST_USER_ID=$with_test_user" >> $options
 fi fi
  
 if [ "$with-test-user-pass" != "1" ]; then  if [ ! -z "$with_test_user_pass" ]; then
   echo "export PEGASUS_TEST_USER_PASS=$with_test_user_pass" >> $options   echo "export PEGASUS_TEST_USER_PASS=$with_test_user_pass" >> $options
 fi fi
  

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2