meta-stx/recipes-support/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch

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