regenerated

1 files changed, 46 insertions, 83 deletions

diff --git a/configure b/configure
index 03483c6d..880dec78 100755
--- a/configure
+++ b/configure
@@ -628,10 +628,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-build_os
-build_vendor
-build_cpu
-build
 target_alias
 host_alias
 build_alias
@@ -1291,9 +1287,6 @@ Fine tuning of the installation directories:
 _ACEOF
 
   cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
 _ACEOF
 fi
 
@@ -1888,74 +1881,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3005,6 +2930,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test x"${CC}" = x -a x"${CXX}" = x; then
    as_fn_error $? "You need 'gcc' and 'g++' to fully run cbuild!" "$LINENO" 5
 fi
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3670,7 +3624,7 @@ fi
 if test "${with_sysroot+set}" = set; then :
   withval=$with_sysroot; SYSROOT=${withval}
 else
-  SYSROOT="${PWD}"
+  SYSROOT="${PWD}"/sysroots
 fi
 
 
@@ -3680,15 +3634,15 @@ fi
 if test "${with_sources+set}" = set; then :
   withval=$with_sources; SOURCES=${withval}
 else
-  SOURCES="${HOME}/cbuild/sources"
+  SOURCES="${PWD}/sources"
 fi
 
 
 
-if test ! -d ${LOCAL_SNAPSHOTS}; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LOCAL_SNAPSHOTS} does not exist so creating directory!" >&5
-$as_echo "$as_me: WARNING: ${LOCAL_SNAPSHOTS} does not exist so creating directory!" >&2;}
-   mkdir -p ${LOCAL_SNAPSHOTS}
+if test ! -d ${SOURCES}; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SOURCES} does not exist so creating directory!" >&5
+$as_echo "$as_me: WARNING: ${SOURCES} does not exist so creating directory!" >&2;}
+   mkdir -p ${SOURCES}
 fi
 
 
@@ -3696,7 +3650,7 @@ fi
 if test "${with_local_snapshots+set}" = set; then :
   withval=$with_local_snapshots; LOCAL_SNAPSHOTS=${withval}
 else
-  LOCAL_SNAPSHOTS="${HOME}/cbuild/snapshots"
+  LOCAL_SNAPSHOTS="${PWD}/snapshots"
 fi
 
 
@@ -3712,7 +3666,7 @@ fi
 if test "${with_local_builds+set}" = set; then :
   withval=$with_local_builds; LOCAL_BUILDS=${withval}
 else
-  LOCAL_BUILDS="${PWD}/`hostname`/${target}/depends"
+  LOCAL_BUILDS="${PWD}/`hostname`/depends"
 fi
 
 
@@ -3727,6 +3681,15 @@ fi
 
 
 
+echo ""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Downloaded snapshots will be stored in: ${LOCAL_SNAPSHOTS}" >&5
+$as_echo "$as_me: Downloaded snapshots will be stored in: ${LOCAL_SNAPSHOTS}" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: My builds will be installed in: ${LOCAL_BUILDS}" >&5
+$as_echo "$as_me: My builds will be installed in: ${LOCAL_BUILDS}" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Remote snapshots will be fetched from: ${REMOTE_SNAPSHOTS}" >&5
+$as_echo "$as_me: Remote snapshots will be fetched from: ${REMOTE_SNAPSHOTS}" >&6;}
+echo ""
+
 # Check whether --enable-ssh was given.
 if test "${enable_ssh+set}" = set; then :
   enableval=$enable_ssh; case "${enableval}" in