Skip to content

Commit 16834cd

Browse files
committed
install: no domainname cmd check if option not set
Do not check for the domainname command in configure script if --with-domainname option is not set. It preserves this way the behavior of previous Modules versions. Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 479046b commit 16834cd

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

configure

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ libarglist=()
4848
# flags to know if argument has been specified on command-line
4949
defpageropts=1
5050
defloggeropts=1
51+
defdomainname=1
5152
defdomainnameopts=1
5253

5354
# set argument default values
@@ -861,7 +862,8 @@ for arg in "$@"; do
861862
--with-tclsh=*|--without-tclsh)
862863
tclshbin=$(get_package_value "$arg") ;;
863864
--with-domainname=*|--without-domainname)
864-
domainname=$(get_package_value "$arg" "") ;;
865+
domainname=$(get_package_value "$arg" "")
866+
defdomainname=0 ;;
865867
--with-domainname-opts=*|--without-domainname-opts)
866868
domainnameopts=$(get_package_value "$arg" "")
867869
defdomainnameopts=0 ;;
@@ -1146,9 +1148,9 @@ check_requirement 'basename' '' "PATH=$binsearchpath"
11461148
# shellcheck disable=SC2034
11471149
BASENAME=$reqpath
11481150

1149-
# get domainname program location from standard PATHs or /usr/local/bin
1151+
# if option defined, get domainname program location from standard PATHs or /usr/local/bin
11501152
# or validate location passed as argument
1151-
if [ -n "$domainname" ]; then
1153+
if [ $defdomainname -eq 0 ] && [ -n "$domainname" ]; then
11521154
check_requirement "$domainname" '' "PATH=$binsearchpath"
11531155
domainname=$reqpath
11541156
fi

0 commit comments

Comments
 (0)