Revamp and simplify autoconfiguration.

[cln.git] / m4 / general.m4

diff --git a/m4/general.m4 b/m4/general.m4
index 2a97059fae6d0c02c87f861443188a0cf1823e69..6f375398c3e4a5971d7e69cdc9b95e38675cd66f 100644 (file)
--- a/m4/general.m4
+++ b/m4/general.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2019 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -115,18 +115,6 @@ AC_CONFIG_SUBDIRS([$1])dnl
 
 AC_DEFUN([CL_CANONICAL_HOST],
 [AC_REQUIRE([AC_PROG_CC]) dnl Actually: AC_REQUIRE([CL_CC_WORKS])
-dnl Set ac_aux_dir before the cache check, because AM_PROG_LIBTOOL needs it.
-ac_aux_dir=${srcdir}/$1
-dnl A substitute for AC_CONFIG_AUX_DIR_DEFAULT, so we don't need install.sh.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-dnl We have defined $ac_aux_dir.
-AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-dnl In autoconf-2.52, a single AC_CANONICAL_HOST has the effect of inserting
-dnl the code of AC_CANONICAL_BUILD *before* CL_CANONICAL_HOST, i.e. before
-dnl ac_aux_dir has been set. To work around this, we list AC_CANONICAL_BUILD
-dnl explicitly.
-AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 ])