forked from pool/sssd
Jan Engelhardt
44b6230c6d
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=134
73 lines
2.0 KiB
Diff
73 lines
2.0 KiB
Diff
From d88892b43dc8183a06cd811690fa8af26ad018c9 Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Sat, 11 Oct 2014 15:27:45 +0200
|
|
Subject: [PATCH] build: call AC_BUILD_AUX_DIR before anything else
|
|
X-Upstream: sent 2014-10-11 15:36
|
|
To: sssd-devel@lists.fedorahosted.org
|
|
Cc: Sumit Bose <sbose@redhat.com>,
|
|
Stefano Lattarini <stefano.lattarini@gmail.com>
|
|
|
|
sssd's configure.ac (abridged) contains these lines:
|
|
|
|
AC_INIT([sssd], ...)
|
|
m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
|
[AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])
|
|
AC_CONFIG_AUX_DIR([build])
|
|
|
|
When turned into configure, this will be emitted:
|
|
|
|
ac_aux_dir=
|
|
for ac_dir in build "$srcdir"/build; do
|
|
if test -f "$ac_dir/install-sh"; then
|
|
ac_aux_dir=$ac_dir
|
|
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
break
|
|
|
|
However, with automake commit v1.14.1-36-g7bc5927, this will be emitted
|
|
instead:
|
|
|
|
ac_aux_dir=
|
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
if test -f "$ac_dir/install-sh"; then
|
|
ac_aux_dir=$ac_dir
|
|
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
break
|
|
|
|
As configure no longer looks into build/ for install-sh, running
|
|
./configure fails:
|
|
|
|
configure: error: cannot find install-sh, install.sh,
|
|
or shtool in "." "./.." "./../.."
|
|
|
|
I think the error is that someone placed AC_BUILD_AUX_DIR
|
|
too late. Move it upwards.
|
|
---
|
|
configure.ac | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 660ea8d..e6745cb 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4,6 +4,8 @@ m4_include([version.m4])
|
|
AC_INIT([sssd],
|
|
VERSION_NUMBER,
|
|
[sssd-devel@lists.fedorahosted.org])
|
|
+AC_CONFIG_SRCDIR([BUILD.txt])
|
|
+AC_CONFIG_AUX_DIR([build])
|
|
|
|
m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
|
[AC_USE_SYSTEM_EXTENSIONS],
|
|
@@ -11,8 +13,6 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
|
|
|
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
|
|
|
|
-AC_CONFIG_SRCDIR([BUILD.txt])
|
|
-AC_CONFIG_AUX_DIR([build])
|
|
|
|
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
|
|
AM_PROG_CC_C_O
|
|
--
|
|
2.0.0
|
|
|