# HG changeset patch # User "Yann E. MORIN" # Date 1231330297 0 # Node ID c232833120c1a90a77427c780076a9b57b85d8d8 # Parent b62d14d45fc4a6e2bfda5e4781e96e81ab22e5c9 ./configurei: make FORCE work again: - removed the --force command line option - use FORCE from the environment /trunk/configure | 9 2 7 0 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff -r b62d14d45fc4 -r c232833120c1 configure --- a/configure Tue Jan 06 22:34:36 2009 +0000 +++ b/configure Wed Jan 07 12:11:37 2009 +0000 @@ -60,8 +60,6 @@ MANDIR_set= LOCAL_set= -FORCE=0 - do_quit= CONTRIB_list= @@ -122,7 +120,8 @@ done echo "Either you are missing entirely the needed tool," echo "or the version you have is tool old." - [ ${FORCE} -eq 0 ] && do_error "Bailing out..." + # FORCE can be set in the environment + [ -z "${FORCE}" ] && do_error "Bailing out..." fi IFS="${save_IFS}" return 0 @@ -205,9 +204,6 @@ Configuration: -h, --help display this help and exit - --force force ./configure to complete, even if one or more - tools were not found. Use at your own risk, only if - you know what you are doing! Installation directories: --prefix=PREFIX install files in PREFIX [${PREFIX_DEFAULT}] @@ -273,7 +269,6 @@ --docdir*) set_docdir "$1" "$2" && shift || shift 2;; --mandir*) set_mandir "$1" "$2" && shift || shift 2;; --local) LOCAL_set=1; shift;; - --force) FORCE=1; shift;; --with-contrib*) set_contrib "$1" "$2" && shift || shift 2 [ "${do_quit}" = "1" ] && exit 0