From d4517e0a1c60749cc7eb0e8993dca4d02a5ddead Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 6 Apr 2021 14:23:38 -0600 Subject: [PATCH] Move autoconf auxiliary files to the scripts directory. --- MANIFEST | 8 ++++---- Makefile.in | 2 +- configure | 3 ++- configure.ac | 1 + doc/Makefile.in | 2 +- examples/Makefile.in | 2 +- include/Makefile.in | 2 +- lib/util/Makefile.in | 2 +- lib/zlib/Makefile.in | 2 +- logsrvd/Makefile.in | 2 +- plugins/audit_json/Makefile.in | 2 +- plugins/group_file/Makefile.in | 2 +- plugins/python/Makefile.in | 2 +- plugins/sample/Makefile.in | 2 +- plugins/sample_approval/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 2 +- plugins/system_group/Makefile.in | 2 +- config.guess => scripts/config.guess | 0 config.sub => scripts/config.sub | 0 install-sh => scripts/install-sh | 0 ltmain.sh => scripts/ltmain.sh | 0 src/Makefile.in | 2 +- 22 files changed, 22 insertions(+), 20 deletions(-) rename config.guess => scripts/config.guess (100%) rename config.sub => scripts/config.sub (100%) rename install-sh => scripts/install-sh (100%) rename ltmain.sh => scripts/ltmain.sh (100%) diff --git a/MANIFEST b/MANIFEST index 7eb11f39e..8e7a9e78b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -9,9 +9,7 @@ README README.LDAP aclocal.m4 autogen.sh -config.guess config.h.in -config.sub configure configure.ac doc/CONTRIBUTORS @@ -101,7 +99,6 @@ include/sudo_plugin.h include/sudo_queue.h include/sudo_rand.h include/sudo_util.h -install-sh lib/eventlog/Makefile.in lib/eventlog/eventlog.c lib/eventlog/eventlog_conf.c @@ -361,7 +358,6 @@ logsrvd/regress/fuzz/fuzz_logsrvd_conf.c logsrvd/regress/fuzz/fuzz_logsrvd_conf.dict logsrvd/sendlog.c logsrvd/sendlog.h -ltmain.sh m4/ax_append_flag.m4 m4/ax_check_compile_flag.m4 m4/ax_check_link_flag.m4 @@ -1077,8 +1073,12 @@ po/zh_CN.mo po/zh_CN.po po/zh_TW.mo po/zh_TW.po +scripts/config.guess +scripts/config.sub scripts/generate_test_coverage.sh +scripts/install-sh scripts/log2cl.pl +scripts/ltmain.sh scripts/mkdep.pl scripts/mkinstalldirs scripts/mkpkg diff --git a/Makefile.in b/Makefile.in index ee430b370..b8c450295 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,7 +72,7 @@ SHELL = @SHELL@ SED = @SED@ -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) ECHO_N = @ECHO_N@ diff --git a/configure b/configure index 9e3a000e8..b481f09cf 100755 --- a/configure +++ b/configure @@ -3236,7 +3236,7 @@ as_fn_append ac_func_c_list " seteuid HAVE_SETEUID" ac_aux_files="ltmain.sh config.guess config.sub" # Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." +ac_aux_dir_candidates="${srcdir}/scripts" # Search for a directory containing all of the required auxiliary files, # $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. @@ -3401,6 +3401,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h pathnames.h" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring Sudo version $PACKAGE_VERSION" >&5 printf "%s\n" "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} diff --git a/configure.ac b/configure.ac index d80d16940..edd06b126 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ AC_PREREQ([2.59]) AC_INIT([sudo], [1.9.6p1], [https://bugzilla.sudo.ws/], [sudo]) AC_CONFIG_HEADERS([config.h pathnames.h]) AC_CONFIG_SRCDIR([src/sudo.c]) +AC_CONFIG_AUX_DIR([scripts]) dnl dnl Note: this must come after AC_INIT dnl diff --git a/doc/Makefile.in b/doc/Makefile.in index a6efcca3d..69b802156 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -38,7 +38,7 @@ MANCOMPRESSEXT = @MANCOMPRESSEXT@ TR = @TRPROG@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) # Where to install things... diff --git a/examples/Makefile.in b/examples/Makefile.in index 823655d79..245705a68 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -31,7 +31,7 @@ docdir = @docdir@ scriptdir = $(top_srcdir)/scripts # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) # Where to install things... diff --git a/include/Makefile.in b/include/Makefile.in index fcddad418..79aefbefb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -31,7 +31,7 @@ scriptdir = $(top_srcdir)/scripts cross_compiling = @CROSS_COMPILING@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) # Where to install things... diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 1c713f96f..0cf2255d0 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -55,7 +55,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index 828486d93..f5860cd47 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -53,7 +53,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index a22597ab3..f8364580a 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -38,7 +38,7 @@ LIBTOOL = @LIBTOOL@ SED = @SED@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/audit_json/Makefile.in b/plugins/audit_json/Makefile.in index 8d0357fc8..1e0f08e7b 100644 --- a/plugins/audit_json/Makefile.in +++ b/plugins/audit_json/Makefile.in @@ -35,7 +35,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 0f86c5fe5..89974dd7e 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -38,7 +38,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index b46fdf7af..f9f7e836b 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -40,7 +40,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index a27e57103..7b27669c0 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -38,7 +38,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/sample_approval/Makefile.in b/plugins/sample_approval/Makefile.in index 15485b18a..f7c4d6033 100644 --- a/plugins/sample_approval/Makefile.in +++ b/plugins/sample_approval/Makefile.in @@ -35,7 +35,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index b98d82770..5cb0c37a4 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -50,7 +50,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index c570bf1dd..bcace6c3f 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -38,7 +38,7 @@ SED = @SED@ AWK = @AWK@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@ diff --git a/config.guess b/scripts/config.guess similarity index 100% rename from config.guess rename to scripts/config.guess diff --git a/config.sub b/scripts/config.sub similarity index 100% rename from config.sub rename to scripts/config.sub diff --git a/install-sh b/scripts/install-sh similarity index 100% rename from install-sh rename to scripts/install-sh diff --git a/ltmain.sh b/scripts/ltmain.sh similarity index 100% rename from ltmain.sh rename to scripts/ltmain.sh diff --git a/src/Makefile.in b/src/Makefile.in index 0f5f216e3..ec2c2970a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -38,7 +38,7 @@ LIBTOOL = @LIBTOOL@ SED = @SED@ # Our install program supports extra flags... -INSTALL = $(SHELL) $(top_srcdir)/install-sh -c +INSTALL = $(SHELL) $(scriptdir)/install-sh -c INSTALL_OWNER = -o $(install_uid) -g $(install_gid) INSTALL_BACKUP = @INSTALL_BACKUP@