mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-29 05:17:54 +00:00
Code Issues Releases Wiki Activity

Move initial values into AC_SUBST() where possible.

Browse Source
This commit is contained in:
Todd C. Miller 2023-02-21 10:17:24 -07:00
parent 7c6f373587
commit 440d9649a8
2 changed files with 126 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
configure vendored
View File

@ -3452,106 +3452,27 @@ ac_config_headers="$ac_config_headers config.h pathnames.h"
PROGS=sudo
LT_LDDEP="\$(shlib_exp)"
LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
BAMAN=0
LCMAN=0
PSMAN=0
SEMAN=0
AAMAN=0
devdir='$(srcdir)'
PRELOAD_MODULE='-module'
LDAP='#'
CONFIGURE_ARGS=$@
SUDO_NLS=disabled
exampledir='$(docdir)/examples'
PYTHON_PLUGIN='#'
LOGSRV_SRC='lib/logsrv'
LOGSRVD_SRC='logsrvd'
LOGSRVD_CONF='sudo_logsrvd.conf'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
PPFILES='$(srcdir)/etc/sudo.pp'
FUZZ_LD='$(CC)'
@ -3647,62 +3568,19 @@ devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev"
# #
# End initial values for man page substitution # End initial values for man page substitution
# #
INSTALL_BACKUP=
INSTALL_INTERCEPT=
INSTALL_NOEXEC=
PRELOAD_MODULE=-module
exampledir='$(docdir)/examples'
devdir='$(srcdir)'
PROGS="sudo"
: ${MANDIRTYPE='man'} : ${MANDIRTYPE='man'}
: ${SHLIB_MODE='0644'} : ${SHLIB_MODE='0644'}
: ${SUDOERS_MODE='0440'} : ${SUDOERS_MODE='0440'}
: ${SUDOERS_UID='0'} : ${SUDOERS_UID='0'}
: ${SUDOERS_GID='0'} : ${SUDOERS_GID='0'}
DEVEL=
LDAP="#"
BAMAN=0
LCMAN=0
PSMAN=0
SEMAN=0
AAMAN=0
LIBINTL=
LIBCRYPTO=
LIBMD=
LIBTLS=
ZLIB=
ZLIB_SRC=
AUTH_OBJS=
AUTH_REG= AUTH_REG=
AUTH_EXCL= AUTH_EXCL=
AUTH_EXCL_DEF= AUTH_EXCL_DEF=
AUTH_DEF=passwd AUTH_DEF=passwd
SUDO_NLS=disabled
LOCALEDIR_SUFFIX=
LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
LT_LDDEP="\$(shlib_exp)"
OS_INIT=os_init_common
INIT_SCRIPT=
INIT_DIR=
RC_LINK=
COMPAT_EXP=
SIGNAME=
FUZZ_ENGINE=
FUZZ_LD='$(CC)'
INTERCEPT_EXP=
WEAK_ALIAS=no
CHECKSHADOW=true CHECKSHADOW=true
shadow_funcs= shadow_funcs=
shadow_libs= shadow_libs=
TMPFILES_D= OS_INIT=os_init_common
CONFIGURE_ARGS="$@"
PYTHON_PLUGIN=#
LOGSRVD=
LOGSRVD_SRC=logsrvd
LOGSRV_SRC=lib/logsrv
LOGSRVD_CONF='sudo_logsrvd.conf'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
PPFILES='$(srcdir)/etc/sudo.pp'
RTLD_PRELOAD_VAR="LD_PRELOAD" RTLD_PRELOAD_VAR="LD_PRELOAD"
RTLD_PRELOAD_ENABLE_VAR= RTLD_PRELOAD_ENABLE_VAR=

251
configure.ac
View File

@ -25,106 +25,106 @@ AC_CONFIG_AUX_DIR([scripts])
dnl dnl
dnl Variables that get substituted in the Makefile and man pages dnl Variables that get substituted in the Makefile and man pages
dnl dnl
AC_SUBST([PROGS]) AC_SUBST([PROGS], [sudo])dnl
AC_SUBST([SUDO_LDFLAGS]) AC_SUBST([SUDO_LDFLAGS])dnl
AC_SUBST([SUDOERS_LDFLAGS]) AC_SUBST([SUDOERS_LDFLAGS])dnl
AC_SUBST([LIBUTIL_LDFLAGS]) AC_SUBST([LIBUTIL_LDFLAGS])dnl
AC_SUBST([ZLIB_LDFLAGS]) AC_SUBST([ZLIB_LDFLAGS])dnl
AC_SUBST([LT_LDFLAGS]) AC_SUBST([LT_LDFLAGS])dnl
AC_SUBST([LT_LDDEP]) AC_SUBST([LT_LDDEP], ["\$(shlib_exp)"])dnl
AC_SUBST([LT_LDEXPORTS]) AC_SUBST([LT_LDEXPORTS], ["-export-symbols \$(shlib_exp)"])dnl
AC_SUBST([LT_STATIC]) AC_SUBST([LT_STATIC])dnl
AC_SUBST([LT_DEP_LIBS]) AC_SUBST([LT_DEP_LIBS])dnl
AC_SUBST([COMMON_OBJS]) AC_SUBST([COMMON_OBJS])dnl
AC_SUBST([SUDOERS_LT_STATIC]) AC_SUBST([SUDOERS_LT_STATIC])dnl
AC_SUBST([SUDOERS_OBJS]) AC_SUBST([SUDOERS_OBJS])dnl
AC_SUBST([SUDO_OBJS]) AC_SUBST([SUDO_OBJS])dnl
AC_SUBST([SUDO_LIBS]) AC_SUBST([SUDO_LIBS])dnl
AC_SUBST([SUDOERS_LIBS]) AC_SUBST([SUDOERS_LIBS])dnl
AC_SUBST([STATIC_SUDOERS]) AC_SUBST([STATIC_SUDOERS])dnl
AC_SUBST([NET_LIBS]) AC_SUBST([NET_LIBS])dnl
AC_SUBST([AFS_LIBS]) AC_SUBST([AFS_LIBS])dnl
AC_SUBST([REPLAY_LIBS]) AC_SUBST([REPLAY_LIBS])dnl
AC_SUBST([GETGROUPS_LIB]) AC_SUBST([GETGROUPS_LIB])dnl
AC_SUBST([AUTH_OBJS]) AC_SUBST([AUTH_OBJS])dnl
AC_SUBST([MANTYPE]) AC_SUBST([MANTYPE])dnl
AC_SUBST([MANDIRTYPE]) AC_SUBST([MANDIRTYPE])dnl
AC_SUBST([MANCOMPRESS]) AC_SUBST([MANCOMPRESS])dnl
AC_SUBST([MANCOMPRESSEXT]) AC_SUBST([MANCOMPRESSEXT])dnl
AC_SUBST([SHLIB_ENABLE]) AC_SUBST([SHLIB_ENABLE])dnl
AC_SUBST([SHLIB_MODE]) AC_SUBST([SHLIB_MODE])dnl
AC_SUBST([SUDOERS_MODE]) AC_SUBST([SUDOERS_MODE])dnl
AC_SUBST([SUDOERS_UID]) AC_SUBST([SUDOERS_UID])dnl
AC_SUBST([SUDOERS_GID]) AC_SUBST([SUDOERS_GID])dnl
AC_SUBST([DEVEL]) AC_SUBST([DEVEL])dnl
AC_SUBST([EXAMPLES]) AC_SUBST([EXAMPLES])dnl
AC_SUBST([BAMAN]) AC_SUBST([BAMAN], [0])dnl
AC_SUBST([LCMAN]) AC_SUBST([LCMAN], [0])dnl
AC_SUBST([PSMAN]) AC_SUBST([PSMAN], [0])dnl
AC_SUBST([SEMAN]) AC_SUBST([SEMAN], [0])dnl
AC_SUBST([AAMAN]) AC_SUBST([AAMAN], [0])dnl
AC_SUBST([devdir]) AC_SUBST([devdir], ['$(srcdir)'])dnl
AC_SUBST([mansectsu]) AC_SUBST([mansectsu])dnl
AC_SUBST([mansectform]) AC_SUBST([mansectform])dnl
AC_SUBST([mansectmisc]) AC_SUBST([mansectmisc])dnl
AC_SUBST([INTERCEPTFILE]) AC_SUBST([INTERCEPTFILE])dnl
AC_SUBST([INTERCEPTDIR]) AC_SUBST([INTERCEPTDIR])dnl
AC_SUBST([intercept_file]) AC_SUBST([intercept_file])dnl
AC_SUBST([NOEXECFILE]) AC_SUBST([NOEXECFILE])dnl
AC_SUBST([NOEXECDIR]) AC_SUBST([NOEXECDIR])dnl
AC_SUBST([noexec_file]) AC_SUBST([noexec_file])dnl
AC_SUBST([sesh_file]) AC_SUBST([sesh_file])dnl
AC_SUBST([INSTALL_BACKUP]) AC_SUBST([INSTALL_BACKUP])dnl
AC_SUBST([INSTALL_INTERCEPT]) AC_SUBST([INSTALL_INTERCEPT])dnl
AC_SUBST([INSTALL_NOEXEC]) AC_SUBST([INSTALL_NOEXEC])dnl
AC_SUBST([PRELOAD_MODULE]) AC_SUBST([PRELOAD_MODULE], ['-module'])dnl
AC_SUBST([DONT_LEAK_PATH_INFO]) AC_SUBST([DONT_LEAK_PATH_INFO])dnl
AC_SUBST([BSDAUTH_USAGE]) AC_SUBST([BSDAUTH_USAGE])dnl
AC_SUBST([SELINUX_USAGE]) AC_SUBST([SELINUX_USAGE])dnl
AC_SUBST([LDAP]) AC_SUBST([LDAP], ['#'])dnl
AC_SUBST([LOGINCAP_USAGE]) AC_SUBST([LOGINCAP_USAGE])dnl
AC_SUBST([ZLIB]) AC_SUBST([ZLIB])dnl
AC_SUBST([ZLIB_SRC]) AC_SUBST([ZLIB_SRC])dnl
AC_SUBST([LIBTOOL_DEPS]) AC_SUBST([LIBTOOL_DEPS])dnl
AC_SUBST([CONFIGURE_ARGS]) AC_SUBST([CONFIGURE_ARGS], [$@])dnl
AC_SUBST([LIBDL]) AC_SUBST([LIBDL])dnl
AC_SUBST([LIBRT]) AC_SUBST([LIBRT])dnl
AC_SUBST([LIBINTL]) AC_SUBST([LIBINTL])dnl
AC_SUBST([LIBCRYPTO]) AC_SUBST([LIBCRYPTO])dnl
AC_SUBST([LIBMD]) AC_SUBST([LIBMD])dnl
AC_SUBST([LIBTLS]) AC_SUBST([LIBTLS])dnl
AC_SUBST([LIBPTHREAD]) AC_SUBST([LIBPTHREAD])dnl
AC_SUBST([SUDO_NLS]) AC_SUBST([SUDO_NLS], [disabled])dnl
AC_SUBST([LOCALEDIR_SUFFIX]) AC_SUBST([LOCALEDIR_SUFFIX])dnl
AC_SUBST([COMPAT_TEST_PROGS]) AC_SUBST([COMPAT_TEST_PROGS])dnl
AC_SUBST([SUDOERS_TEST_PROGS]) AC_SUBST([SUDOERS_TEST_PROGS])dnl
AC_SUBST([CROSS_COMPILING]) AC_SUBST([CROSS_COMPILING])dnl
AC_SUBST([ASAN_LDFLAGS]) AC_SUBST([ASAN_LDFLAGS])dnl
AC_SUBST([ASAN_CFLAGS]) AC_SUBST([ASAN_CFLAGS])dnl
AC_SUBST([PIE_LDFLAGS]) AC_SUBST([PIE_LDFLAGS])dnl
AC_SUBST([PIE_CFLAGS]) AC_SUBST([PIE_CFLAGS])dnl
AC_SUBST([HARDENING_LDFLAGS]) AC_SUBST([HARDENING_LDFLAGS])dnl
AC_SUBST([HARDENING_CFLAGS]) AC_SUBST([HARDENING_CFLAGS])dnl
AC_SUBST([INIT_SCRIPT]) AC_SUBST([INIT_SCRIPT])dnl
AC_SUBST([INIT_DIR]) AC_SUBST([INIT_DIR])dnl
AC_SUBST([RC_LINK]) AC_SUBST([RC_LINK])dnl
AC_SUBST([COMPAT_EXP]) AC_SUBST([COMPAT_EXP])dnl
AC_SUBST([TMPFILES_D]) AC_SUBST([TMPFILES_D])dnl
AC_SUBST([exampledir]) AC_SUBST([exampledir], ['$(docdir)/examples'])dnl
AC_SUBST([DIGEST]) AC_SUBST([DIGEST])dnl
AC_SUBST([devsearch]) AC_SUBST([devsearch])dnl
AC_SUBST([SIGNAME]) AC_SUBST([SIGNAME])dnl
AC_SUBST([PYTHON_PLUGIN]) AC_SUBST([PYTHON_PLUGIN], ['#'])dnl
AC_SUBST([PYTHON_PLUGIN_SRC]) AC_SUBST([PYTHON_PLUGIN_SRC])dnl
AC_SUBST([LOGSRV]) AC_SUBST([LOGSRV])dnl
AC_SUBST([LOGSRV_SRC]) AC_SUBST([LOGSRV_SRC], ['lib/logsrv'])dnl
AC_SUBST([LOGSRVD_SRC]) AC_SUBST([LOGSRVD_SRC], ['logsrvd'])dnl
AC_SUBST([LOGSRVD_CONF]) AC_SUBST([LOGSRVD_CONF], ['sudo_logsrvd.conf'])dnl
AC_SUBST([LIBLOGSRV]) AC_SUBST([LIBLOGSRV], ['$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'])dnl
AC_SUBST([PPFILES]) AC_SUBST([PPFILES], ['$(srcdir)/etc/sudo.pp'])dnl
AC_SUBST([FUZZ_ENGINE]) AC_SUBST([FUZZ_ENGINE])dnl
AC_SUBST([FUZZ_LD]) AC_SUBST([FUZZ_LD], ['$(CC)'])dnl
AC_SUBST([INTERCEPT_EXP]) AC_SUBST([INTERCEPT_EXP])dnl
dnl dnl
dnl Variables that get substituted in docs (not overridden by environment) dnl Variables that get substituted in docs (not overridden by environment)
@ -233,65 +233,22 @@ dnl
dnl Initial values for Makefile variables listed above dnl Initial values for Makefile variables listed above
dnl May be overridden by environment variables.. dnl May be overridden by environment variables..
dnl dnl
INSTALL_BACKUP=
INSTALL_INTERCEPT=
INSTALL_NOEXEC=
PRELOAD_MODULE=-module
exampledir='$(docdir)/examples'
devdir='$(srcdir)'
PROGS="sudo"
: ${MANDIRTYPE='man'} : ${MANDIRTYPE='man'}
: ${SHLIB_MODE='0644'} : ${SHLIB_MODE='0644'}
: ${SUDOERS_MODE='0440'} : ${SUDOERS_MODE='0440'}
: ${SUDOERS_UID='0'} : ${SUDOERS_UID='0'}
: ${SUDOERS_GID='0'} : ${SUDOERS_GID='0'}
DEVEL= dnl
LDAP="#" dnl Other variables
BAMAN=0 dnl
LCMAN=0
PSMAN=0
SEMAN=0
AAMAN=0
LIBINTL=
LIBCRYPTO=
LIBMD=
LIBTLS=
ZLIB=
ZLIB_SRC=
AUTH_OBJS=
AUTH_REG= AUTH_REG=
AUTH_EXCL= AUTH_EXCL=
AUTH_EXCL_DEF= AUTH_EXCL_DEF=
AUTH_DEF=passwd AUTH_DEF=passwd
SUDO_NLS=disabled
LOCALEDIR_SUFFIX=
LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
LT_LDDEP="\$(shlib_exp)"
OS_INIT=os_init_common
INIT_SCRIPT=
INIT_DIR=
RC_LINK=
COMPAT_EXP=
SIGNAME=
FUZZ_ENGINE=
FUZZ_LD='$(CC)'
INTERCEPT_EXP=
dnl
dnl Other variables
dnl
WEAK_ALIAS=no
CHECKSHADOW=true CHECKSHADOW=true
shadow_funcs= shadow_funcs=
shadow_libs= shadow_libs=
TMPFILES_D= OS_INIT=os_init_common
CONFIGURE_ARGS="$@"
PYTHON_PLUGIN=#
LOGSRVD=
LOGSRVD_SRC=logsrvd
LOGSRV_SRC=lib/logsrv
LOGSRVD_CONF='sudo_logsrvd.conf'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
PPFILES='$(srcdir)/etc/sudo.pp'
dnl dnl
dnl LD_PRELOAD equivalents dnl LD_PRELOAD equivalents