From 84183912e07552578cb322bc009fd2e8ca9e6682 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 4 Apr 2024 15:10:51 +0200 Subject: [PATCH] Remove outdated Autoconf macro. * aclocal.m4 (CL_PROG_INSTALL): Remove macro. * doc/configure.ac: Invoke AC_PROG_INSTALL instead of CL_PROG_INSTALL. * lib/configure.ac: Likewise. * src/configure.ac: Likewise. --- ChangeLog | 8 ++++++ aclocal.m4 | 70 +----------------------------------------------- doc/configure.ac | 4 +-- lib/configure.ac | 4 +-- src/configure.ac | 4 +-- 5 files changed, 15 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d82508..c1b96a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-04-04 Bruno Haible + + Remove outdated Autoconf macro. + * aclocal.m4 (CL_PROG_INSTALL): Remove macro. + * doc/configure.ac: Invoke AC_PROG_INSTALL instead of CL_PROG_INSTALL. + * lib/configure.ac: Likewise. + * src/configure.ac: Likewise. + 2023-12-30 Bruno Haible Mark autoconf 2.72 as supported. diff --git a/aclocal.m4 b/aclocal.m4 index 41598df..25a255c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,69 +1 @@ -AC_PREREQ(2.12) - -AC_DEFUN(CL_PROG_INSTALL, -[dnl This is mostly copied from AC_PROG_INSTALL. -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -AC_MSG_CHECKING(for a BSD compatible install) -if test -z "$INSTALL"; then -AC_CACHE_VAL(cl_cv_path_install, -[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. - : - else - if test $ac_prog = installbsd && - strings $ac_dir/$ac_prog | grep src/bos >/dev/null 2>&1; then - # AIX installbsd doesn't work without option "-g". - : - else - cl_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - fi - done - ;; - esac - done - IFS="$ac_save_ifs" - # As a last resort, use cp. - test -z "$cl_cv_path_install" && cl_cv_path_install="cp" -])dnl - INSTALL="$cl_cv_path_install" -fi -dnl We do special magic for INSTALL instead of AC_SUBST, to get -dnl relative paths right. -AC_MSG_RESULT($INSTALL) -AC_SUBST(INSTALL)dnl -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' -AC_SUBST(INSTALL_PROGRAM)dnl -if test -z "$INSTALL_DATA"; then - case "$INSTALL" in - cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; - * ) INSTALL_DATA='$(INSTALL) -m 644' ;; - esac -fi -AC_SUBST(INSTALL_DATA)dnl -]) - +AC_PREREQ([2.64]) diff --git a/doc/configure.ac b/doc/configure.ac index 4b93c1b..77d83f2 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/doc -dnl Copyright (C) 1998-2020 Free Software Foundation, Inc. +dnl Copyright (C) 1998-2024 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -28,7 +28,7 @@ AC_PROG_MAKE_SET dnl dnl checks for programs dnl -CL_PROG_INSTALL +AC_PROG_INSTALL dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM dnl dnl That's it. diff --git a/lib/configure.ac b/lib/configure.ac index da40663..c776467 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/lib -dnl Copyright (C) 1998-2020 Free Software Foundation, Inc. +dnl Copyright (C) 1998-2024 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -38,7 +38,7 @@ AC_CHECK_TOOL([AR], [ar]) dnl sets variable AR AC_PROG_RANLIB dnl sets variable RANLIB -CL_PROG_INSTALL +AC_PROG_INSTALL dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM dnl dnl That's it. diff --git a/src/configure.ac b/src/configure.ac index 892a053..604146c 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/src -dnl Copyright (C) 1998-2020 Free Software Foundation, Inc. +dnl Copyright (C) 1998-2024 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -35,7 +35,7 @@ AC_PROG_CXX dnl sets variable CXX AC_PROG_CXXCPP dnl sets variable CXXCPP -CL_PROG_INSTALL +AC_PROG_INSTALL dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM dnl dnl checks for compiler characteristics