summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorIvan Pozdeev <vano@mail.mipt.ru>2015-08-12 20:33:12 +0300
committerRicardo Signes <rjbs@cpan.org>2015-10-28 11:19:09 -0400
commit41d73075f0801c26794dadb1ff690f305d7e53a7 (patch)
treed6af29fe04cfd9af079607fec020af6024bb57c1 /Configure
parente9548aa6723a88345976cfd7d3b37feb4e405ae9 (diff)
downloadperl-41d73075f0801c26794dadb1ff690f305d7e53a7.tar.gz
Make -O behaviour the default
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure9
1 files changed, 4 insertions, 5 deletions
diff --git a/Configure b/Configure
index 6f2d4ff91c..3df0b1bab2 100755
--- a/Configure
+++ b/Configure
@@ -1662,7 +1662,6 @@ alldone=''
error=''
silent=''
extractsh=''
-override=''
knowitall=''
rm -f optdef.sh posthint.sh
cat >optdef.sh <<EOS
@@ -1692,7 +1691,7 @@ while test $# -gt 0; do
-s) shift; silent=true; realsilent=true;;
-E) shift; alldone=exit;;
-K) shift; knowitall=true;;
- -O) shift; override=true;;
+ -O) shift;;
-S) shift; silent=true; extractsh=true;;
-D)
shift
@@ -1801,7 +1800,7 @@ Usage: $me [-dehrsEKOSV] [-f config.sh] [-D symbol] [-D symbol=value]
-Dprefix=/opt/perl5 choose your destination
-E : stop at the end of questions, after having produced config.sh.
-K : do not use unless you know what you are doing.
- -O : let -D and -U override definitions from loaded configuration file.
+ -O : ignored for backward compatibility
-S : perform variable substitutions on all .SH files (can mix with -f)
-U : undefine symbol:
-U symbol symbol gets the value 'undef'
@@ -2023,7 +2022,7 @@ true)
echo "Fetching answers from $config_sh..."
cd ..
. $config_sh
- test "$override" && . ./optdef.sh
+ . ./optdef.sh
echo " "
. UU/extract
rm -rf UU
@@ -3776,7 +3775,7 @@ cd UU
hint=previous
;;
esac
-test "$override" && . ./optdef.sh
+. ./optdef.sh
: Restore computed paths
for file in $loclist $trylist; do