1.1 --- a/common/autoconf/configure Wed Apr 11 04:42:33 2018 -0700
1.2 +++ b/common/autoconf/configure Wed Apr 11 09:36:13 2018 -0700
1.3 @@ -23,22 +23,23 @@
1.4 #
1.5
1.6 if test "x$1" != xCHECKME; then
1.7 - echo "This script cannot be run directly."
1.8 + echo "WARNING: Calling the wrapper script directly is deprecated and unsupported."
1.9 + echo "Not all features of configure will be available."
1.10 echo "Use the 'configure' script in the top-level directory instead."
1.11 - exit 1
1.12 + TOPDIR=$(cd $(dirname $0)/../.. > /dev/null && pwd)
1.13 +else
1.14 + # Now the next argument is the absolute top-level directory path.
1.15 + # The TOPDIR variable is passed on to configure.ac.
1.16 + TOPDIR="$2"
1.17 + # Remove these two arguments to get to the user supplied arguments
1.18 + shift
1.19 + shift
1.20 fi
1.21
1.22 # Force autoconf to use bash. This also means we must disable autoconf re-exec.
1.23 export CONFIG_SHELL=$BASH
1.24 export _as_can_reexec=no
1.25
1.26 -# Now the next argument is the absolute top-level directory path.
1.27 -# The TOPDIR variable is passed on to configure.ac.
1.28 -TOPDIR="$2"
1.29 -# Remove these two arguments to get to the user supplied arguments
1.30 -shift
1.31 -shift
1.32 -
1.33 conf_script_dir="$TOPDIR/common/autoconf"
1.34
1.35 if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
