common/autoconf/configure

*** 20,41 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! if test "x$BASH_VERSION" = x; then
!   echo This script needs bash to run.
!   echo It is recommended to use the configure script in the source tree root instead.
    exit 1
  fi
  
! conf_script_dir=`dirname $0`
  
  if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
!   conf_custom_script_dir="$conf_script_dir/../../closed/autoconf"
  else
!   conf_custom_script_dir=$CUSTOM_CONFIG_DIR
  fi
  
  ###
  ### Test that the generated configure is up-to-date
  ###
--- 20,48 ----
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! if test "x$1" != xCHECKME; then
!   echo "This script cannot be run directly."
!   echo "Use the 'configure' script in the top-level directory instead."
    exit 1
  fi
  
! # Now the next argument is the absolute top-level directory path.
! # The TOPDIR variable is passed on to configure.ac.
! TOPDIR="$2"
! # Remove these two arguments to get to the user supplied arguments
! shift
! shift
! 
! conf_script_dir="$TOPDIR/common/autoconf"
  
  if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
!   conf_custom_script_dir="$TOPDIR/closed/autoconf"
  else
!   conf_custom_script_dir="$CUSTOM_CONFIG_DIR"
  fi
  
  ###
  ### Test that the generated configure is up-to-date
  ###
*** 224,237 ****
  ###
  ### Call the configure script
  ###
  if test -e $conf_custom_script_dir/generated-configure.sh; then
    # Custom source configure available; run that instead
!   echo Running custom generated-configure.sh
    conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
  else
!   echo Running generated-configure.sh
    conf_script_to_run=$conf_script_dir/generated-configure.sh
  fi
  
  if test "x$conf_debug_configure" != x; then
    # Turn on shell debug output if requested (initial or recursive)
--- 231,244 ----
  ###
  ### Call the configure script
  ###
  if test -e $conf_custom_script_dir/generated-configure.sh; then
    # Custom source configure available; run that instead
!   echo "Running custom generated-configure.sh"
    conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
  else
!   echo "Running generated-configure.sh"
    conf_script_to_run=$conf_script_dir/generated-configure.sh
  fi
  
  if test "x$conf_debug_configure" != x; then
    # Turn on shell debug output if requested (initial or recursive)