From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 8 Jan 2021 11:06:02 +0000 (+0100)
Subject: Fix weird "install-sh not found" error on autotools 2.69
X-Git-Tag: rec-4.5.0-alpha1~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F9920%2Fhead;p=thirdparty%2Fpdns.git

Fix weird "install-sh not found" error on autotools 2.69
---

diff --git a/configure.ac b/configure.ac
index cf4f2ffb22..590e3accf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,19 @@
 AC_PREREQ([2.69])
 
 AC_INIT([pdns], m4_esyscmd([builder-support/gen-version]))
-
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11])
+AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR([pdns/receiver.cc])
 AC_CONFIG_MACRO_DIR([m4])
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_AUX_DIR([build-aux])
+
+AC_CANONICAL_HOST
+# Add some default CFLAGS and CXXFLAGS, can be appended to using the environment variables
+CFLAGS="-g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CFLAGS"
+CXXFLAGS="-std=c++17 -g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CXXFLAGS"
 
 AC_SUBST([pdns_configure_args], ["$ac_configure_args"])
 AC_DEFINE_UNQUOTED([PDNS_CONFIG_ARGS],
@@ -14,38 +21,26 @@ AC_DEFINE_UNQUOTED([PDNS_CONFIG_ARGS],
   [pdns configure arguments]
 )
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11])
-AM_SILENT_RULES([yes])
-
-AC_CANONICAL_HOST
-# Add some default CFLAGS and CXXFLAGS, can be appended to using the environment variables
-CFLAGS="-g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CFLAGS"
-CXXFLAGS="-std=c++17 -g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CXXFLAGS"
-
 AC_PROG_CC
-AM_PROG_CC_C_O
-PDNS_CHECK_BISON
-PDNS_CHECK_FLEX
-AC_PROG_MAKE_SET
-
+# AM_PROG_CC_C_O
 AC_PROG_CXX
-AS_IF([test "x$CXX" = "xno" || test "x$CXX:x$GXX" = "xg++:x"],
-  [AC_MSG_ERROR([no C++ compiler found])]
-)
-
 AC_LANG([C++])
+PDNS_CHECK_BISON
+PDNS_CHECK_FLEX
 
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
 
+AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
+LT_PREREQ([2.2.2])
+LT_INIT([disable-static dlopen])
+
 PDNS_CHECK_OS
 PTHREAD_SET_NAME
 
 PDNS_WITH_LUA([mandatory])
 PDNS_CHECK_LUA_HPP
 
-AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
-
 AC_MSG_CHECKING([whether we will enable compiler security checks])
 AC_ARG_ENABLE([hardening],
   [AS_HELP_STRING([--disable-hardening], [disable compiler security checks @<:@default=no@:>@])],
@@ -66,9 +61,6 @@ PDNS_ENABLE_KISS
 
 PDNS_CHECK_NETWORK_LIBS
 
-LT_PREREQ([2.2.2])
-LT_INIT([disable-static dlopen])
-
 
 MC_TM_GMTOFF