meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/0004-configure.ac-fix-install-sh-not-found.patch

   1 From e2dff24c2d99e91c88a5532405a668f995b24a86 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Mon, 27 Apr 2020 11:55:33 +0800
   4 Subject: [PATCH 4/4] configure.ac: fix install-sh not found
   5
   6 Fix configure.ac to cope with new autoconf.
   7 Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is
   8 called as late as it was, ending up thinking that the am_aux_dir is pwd
   9 at the start of the build. Move it up to under AC_INIT to fix that.
  10
  11 Author: William Grant <wgrant@ubuntu.com>
  12
  13 Upstream-Status: Pending
  14
  15 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724116
  16
  17 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  18
  19 Rebase for 4.1.1
  20
  21 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  22 ---
  23  configure.ac | 15 ++++++++-------
  24  1 file changed, 8 insertions(+), 7 deletions(-)
  25
  26 diff --git a/configure.ac b/configure.ac
  27 index 4d5fb96..af7f646 100644
  28 --- a/configure.ac
  29 +++ b/configure.ac
  30 @@ -23,13 +23,20 @@ AC_INIT([resource-agents],
  31         m4_esyscmd([make/git-version-gen .tarball-version]),
  32         [to_be_defined@foobar.org])
  33
  34 +AC_CONFIG_AUX_DIR(.)
  35 +
  36 +dnl
  37 +dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
  38 +dnl
  39 +
  40 +AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
  41 +
  42  AC_USE_SYSTEM_EXTENSIONS
  43
  44  CRM_DTD_VERSION="1.0"
  45
  46  PKG_FEATURES=""
  47
  48 -AC_CONFIG_AUX_DIR(.)
  49  AC_CANONICAL_HOST
  50
  51  dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
  52 @@ -84,12 +91,6 @@ AC_ARG_WITH([systemdtmpfilesdir],
  53       fi
  54  AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdtmpfilesdir" -a "x$with_systemdtmpfilesdir" != xno ])
  55
  56 -dnl
  57 -dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
  58 -dnl
  59 -
  60 -AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
  61 -
  62  AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version)
  63
  64  CC_IN_CONFIGURE=yes
  65 --
  66 2.7.4
  67