mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 01:49:11 +00:00
Some more ${foo} -> $(foo) conversion for consistent Makefiles.
This commit is contained in:
Todd C. Miller
parent
c016ecf006
commit
5ba4a35a78
54
configure
vendored
54
configure
vendored
@ -2850,15 +2850,6 @@ shadow_libs=
|
||||
shadow_libs_optional=
|
||||
CONFIGURE_ARGS="$@"
|
||||
|
||||
if test X"$prefix" = X"NONE"; then
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(prefix)/man'
|
||||
else
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(datarootdir)/man'
|
||||
fi
|
||||
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
|
||||
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
|
||||
test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
|
||||
|
||||
|
||||
|
||||
|
||||
@ -6563,13 +6554,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
(eval echo "\"\$as_me:6566: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6557: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:6569: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:6560: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:6572: output\"" >&5)
|
||||
(eval echo "\"\$as_me:6563: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@ -7774,7 +7765,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 7777 "configure"' > conftest.$ac_ext
|
||||
echo '#line 7768 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -9166,11 +9157,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9169: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9160: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9173: \$? = $ac_status" >&5
|
||||
echo "$as_me:9164: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -9505,11 +9496,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9508: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9512: \$? = $ac_status" >&5
|
||||
echo "$as_me:9503: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -9610,11 +9601,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9613: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9604: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9617: \$? = $ac_status" >&5
|
||||
echo "$as_me:9608: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -9665,11 +9656,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9668: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9659: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9672: \$? = $ac_status" >&5
|
||||
echo "$as_me:9663: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -12032,7 +12023,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12035 "configure"
|
||||
#line 12026 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12128,7 +12119,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12131 "configure"
|
||||
#line 12122 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12825,7 +12816,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
||||
if test -z "$NROFFPROG"; then
|
||||
MAN_POSTINSTALL=' /bin/rm -f $(mandirsu)/sudo.$(mansectsu).z $(mandirsu)/visudo.$(mansectsu).z $(mandirform)/sudoers.$(mansectform).z ; /usr/bin/pack $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform)'
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '$(prefix)/man'; then
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||
if test -d /usr/share/catman/local; then
|
||||
mandir="/usr/share/catman/local"
|
||||
else
|
||||
@ -12833,7 +12824,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '$(prefix)/man'; then
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||
if test -d "/usr/share/man/local"; then
|
||||
mandir="/usr/share/man/local"
|
||||
else
|
||||
@ -18033,6 +18024,19 @@ EOF
|
||||
exec_prefix="$oexec_prefix"
|
||||
fi
|
||||
|
||||
if test X"$prefix" = X"NONE"; then
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(prefix)/man'
|
||||
else
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(datarootdir)/man'
|
||||
fi
|
||||
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
|
||||
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
|
||||
test "$libexecdir" = '${exec_prefix}/libexec' && libexecdir='$(exec_prefix)/libexec'
|
||||
test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
|
||||
test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
|
||||
test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
|
||||
test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
|
||||
|
||||
ac_config_files="$ac_config_files Makefile common/Makefile compat/Makefile doc/Makefile include/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/sample_group/Makefile plugins/sudoers/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
||||
32
configure.in
32
configure.in
@ -171,18 +171,6 @@ shadow_libs=
|
||||
shadow_libs_optional=
|
||||
CONFIGURE_ARGS="$@"
|
||||
|
||||
dnl
|
||||
dnl Override default configure dirs...
|
||||
dnl
|
||||
if test X"$prefix" = X"NONE"; then
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(prefix)/man'
|
||||
else
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(datarootdir)/man'
|
||||
fi
|
||||
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
|
||||
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
|
||||
test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
|
||||
|
||||
dnl
|
||||
dnl libc replacement functions live in compat
|
||||
dnl
|
||||
@ -1592,7 +1580,7 @@ case "$host" in
|
||||
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
||||
if test -z "$NROFFPROG"; then
|
||||
MAN_POSTINSTALL=' /bin/rm -f $(mandirsu)/sudo.$(mansectsu).z $(mandirsu)/visudo.$(mansectsu).z $(mandirform)/sudoers.$(mansectform).z ; /usr/bin/pack $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform)'
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '$(prefix)/man'; then
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||
if test -d /usr/share/catman/local; then
|
||||
mandir="/usr/share/catman/local"
|
||||
else
|
||||
@ -1600,7 +1588,7 @@ case "$host" in
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '$(prefix)/man'; then
|
||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||
if test -d "/usr/share/man/local"; then
|
||||
mandir="/usr/share/man/local"
|
||||
else
|
||||
@ -2757,6 +2745,22 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
|
||||
exec_prefix="$oexec_prefix"
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Override default configure dirs for the Makefile
|
||||
dnl
|
||||
if test X"$prefix" = X"NONE"; then
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(prefix)/man'
|
||||
else
|
||||
test "$mandir" = '${datarootdir}/man' && mandir='$(datarootdir)/man'
|
||||
fi
|
||||
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
|
||||
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
|
||||
test "$libexecdir" = '${exec_prefix}/libexec' && libexecdir='$(exec_prefix)/libexec'
|
||||
test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
|
||||
test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
|
||||
test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
|
||||
test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
|
||||
|
||||
dnl
|
||||
dnl Substitute into the Makefile and man pages
|
||||
dnl
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user