From 6b0fa2221a782504a0f1d6907e8c492e3a09d5d1 Mon Sep 17 00:00:00 2001
From: Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
Date: Sat, 3 Oct 2015 14:32:29 +0200
Subject: [PATCH] Revert the automated build option
This reverts commits:
* d6413fe29fbdcd72a04b3d5820ba2e134dbaf558.
* 4f266e1a8c78cec2c425b17784576db56125bbbd.
Signed-off-by: Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
---
Makefile.in | 1 -
config/global/logging.in | 7 +------
configure.ac | 10 ----------
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c7494f55..895983b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,6 @@ all: Makefile build
# Stuff found by ./configure
export DATE := @DATE@
export LOCAL := @enable_local@
-export AUTOMATED := @enable_automated@
export PROG_SED := @program_transform_name@
export PACKAGE_TARNAME := @PACKAGE_TARNAME@
export VERSION := @PACKAGE_VERSION@
diff --git a/config/global/logging.in b/config/global/logging.in
index 5fe794d4..0c77e88a 100644
--- a/config/global/logging.in
+++ b/config/global/logging.in
@@ -74,7 +74,7 @@ config LOG_PROGRESS_BAR
bool
prompt "Progress bar"
default y
- depends on ! LOG_ALL && ! LOG_DEBUG && ! AUTOMATED_BUILD
+ depends on ! LOG_ALL && ! LOG_DEBUG
help
If you say 'y' here, you'll be able to see the elapsed time.
@@ -104,8 +104,3 @@ config LOG_FILE_COMPRESS
depends on LOG_TO_FILE
help
Compress the log file once the toolchain is successfully built.
-
-config AUTOMATED_BUILD
- bool
- default y
- depends on CONFIGURE_has_automated
diff --git a/configure.ac b/configure.ac
index 5670a03c..adde2abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,16 +66,6 @@ AC_ARG_ENABLE(
[--enable-local],
[do not install, and use current directory])])
AC_SUBST([enable_local], [${enable_local:-no}])
-AC_ARG_ENABLE(
- [automated],
- [AS_HELP_STRING(
- [--enable-automated],
- [Tell ct-ng that this is an automated build])],
- [if test "x$automated" = "x" -o "x$automated" = "xyes"; then
- automated=y
- fi])
-AC_SUBST([enable_automated], [${enable_automated:-no}])
-ACX_SET_KCONFIG_OPTION([automated])
AC_ARG_ENABLE(
[shared],
[AS_HELP_STRING(