Skip to content

Commit 41d7307

Browse files
native-apirjbs
authored andcommitted
Make -O behaviour the default
1 parent e9548aa commit 41d7307

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Configure

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,6 @@ alldone=''
16621662
error=''
16631663
silent=''
16641664
extractsh=''
1665-
override=''
16661665
knowitall=''
16671666
rm -f optdef.sh posthint.sh
16681667
cat >optdef.sh <<EOS
@@ -1692,7 +1691,7 @@ while test $# -gt 0; do
16921691
-s) shift; silent=true; realsilent=true;;
16931692
-E) shift; alldone=exit;;
16941693
-K) shift; knowitall=true;;
1695-
-O) shift; override=true;;
1694+
-O) shift;;
16961695
-S) shift; silent=true; extractsh=true;;
16971696
-D)
16981697
shift
@@ -1801,7 +1800,7 @@ Usage: $me [-dehrsEKOSV] [-f config.sh] [-D symbol] [-D symbol=value]
18011800
-Dprefix=/opt/perl5 choose your destination
18021801
-E : stop at the end of questions, after having produced config.sh.
18031802
-K : do not use unless you know what you are doing.
1804-
-O : let -D and -U override definitions from loaded configuration file.
1803+
-O : ignored for backward compatibility
18051804
-S : perform variable substitutions on all .SH files (can mix with -f)
18061805
-U : undefine symbol:
18071806
-U symbol symbol gets the value 'undef'
@@ -2023,7 +2022,7 @@ true)
20232022
echo "Fetching answers from $config_sh..."
20242023
cd ..
20252024
. $config_sh
2026-
test "$override" && . ./optdef.sh
2025+
. ./optdef.sh
20272026
echo " "
20282027
. UU/extract
20292028
rm -rf UU
@@ -3776,7 +3775,7 @@ cd UU
37763775
hint=previous
37773776
;;
37783777
esac
3779-
test "$override" && . ./optdef.sh
3778+
. ./optdef.sh
37803779

37813780
: Restore computed paths
37823781
for file in $loclist $trylist; do

0 commit comments

Comments
 (0)