Skip to content

Commit b2f25bf

Browse files
committed
Update configure script
Make configure script consistent with configure.in. Signed-off-by: Sebastien GODARD <[email protected]>
1 parent 1cf6580 commit b2f25bf

File tree

1 file changed

+10
-28
lines changed

1 file changed

+10
-28
lines changed

configure

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3805,7 +3805,7 @@ else
38053805
ac_cv_prog_ZIP="$ZIP" # Let the user override the test.
38063806
else
38073807
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3808-
for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin
3808+
for as_dir in $PATH
38093809
do
38103810
IFS=$as_save_IFS
38113811
test -z "$as_dir" && as_dir=.
@@ -3840,10 +3840,8 @@ INSTALL_DATA="\${INSTALL} -m 644"
38403840
INSTALL_BIN="\${INSTALL} -m 755"
38413841
38423842
3843-
for ac_prog in cp
3844-
do
3845-
# Extract the first word of "$ac_prog", so it can be a program name with args.
3846-
set dummy $ac_prog; ac_word=$2
3843+
# Extract the first word of "cp", so it can be a program name with args.
3844+
set dummy cp; ac_word=$2
38473845
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
38483846
$as_echo_n "checking for $ac_word... " >&6; }
38493847
if ${ac_cv_path_PATH_CP+:} false; then :
@@ -3855,7 +3853,7 @@ else
38553853
;;
38563854
*)
38573855
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3858-
for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin
3856+
for as_dir in $PATH
38593857
do
38603858
IFS=$as_save_IFS
38613859
test -z "$as_dir" && as_dir=.
@@ -3882,14 +3880,8 @@ $as_echo "no" >&6; }
38823880
fi
38833881
38843882
3885-
test -n "$PATH_CP" && break
3886-
done
3887-
test -n "$PATH_CP" || PATH_CP="cp"
3888-
3889-
for ac_prog in chkconfig
3890-
do
3891-
# Extract the first word of "$ac_prog", so it can be a program name with args.
3892-
set dummy $ac_prog; ac_word=$2
3883+
# Extract the first word of "chkconfig", so it can be a program name with args.
3884+
set dummy chkconfig; ac_word=$2
38933885
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
38943886
$as_echo_n "checking for $ac_word... " >&6; }
38953887
if ${ac_cv_path_PATH_CHKCONFIG+:} false; then :
@@ -3901,7 +3893,7 @@ else
39013893
;;
39023894
*)
39033895
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3904-
for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin
3896+
for as_dir in $PATH
39053897
do
39063898
IFS=$as_save_IFS
39073899
test -z "$as_dir" && as_dir=.
@@ -3928,10 +3920,6 @@ $as_echo "no" >&6; }
39283920
fi
39293921
39303922
3931-
test -n "$PATH_CHKCONFIG" && break
3932-
done
3933-
test -n "$PATH_CHKCONFIG" || PATH_CHKCONFIG="chkconfig"
3934-
39353923
39363924
# Check for systemd
39373925
# Extract the first word of "pkg-config", so it can be a program name with args.
@@ -3971,10 +3959,8 @@ $as_echo "no" >&6; }
39713959
fi
39723960
39733961
3974-
for ac_prog in systemctl
3975-
do
3976-
# Extract the first word of "$ac_prog", so it can be a program name with args.
3977-
set dummy $ac_prog; ac_word=$2
3962+
# Extract the first word of "systemctl", so it can be a program name with args.
3963+
set dummy systemctl; ac_word=$2
39783964
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
39793965
$as_echo_n "checking for $ac_word... " >&6; }
39803966
if ${ac_cv_path_SYSTEMCTL+:} false; then :
@@ -3986,7 +3972,7 @@ else
39863972
;;
39873973
*)
39883974
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3989-
for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin
3975+
for as_dir in $PATH
39903976
do
39913977
IFS=$as_save_IFS
39923978
test -z "$as_dir" && as_dir=.
@@ -4013,10 +3999,6 @@ $as_echo "no" >&6; }
40133999
fi
40144000
40154001
4016-
test -n "$SYSTEMCTL" && break
4017-
done
4018-
test -n "$SYSTEMCTL" || SYSTEMCTL="systemctl"
4019-
40204002
40214003
# Check whether --with-systemdsystemunitdir was given.
40224004
if test "${with_systemdsystemunitdir+set}" = set; then :

0 commit comments

Comments
 (0)