aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-01 00:34:08 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-01 01:00:52 +0200
commit48372dad0edb96b4dce194481765a6ad3ad7eb56 (patch)
tree095ab9eb4550ffdbeaad64deb281412536e75f17
parentbfdbde2bd8477c466feadbd563a3caf1e7e704db (diff)
build: be robust against install-sh files above the root dir
Explicitly set AC_CONFIG_AUX_DIR. To reproduce the error avoided by this patch: rm install-sh # in case it was already generated. touch ../install-sh # yes, outside this source tree autoreconf -fi This will produce an error like ... configure.ac:16: error: required file '../ltmain.sh' not found configure.ac:5: installing '../missing' src/Makefile.am: installing '../depcomp' autoreconf: automake failed with exit status: 1 See also automake (vim `which automake`) and look for 'sub locate_aux_dir'. Change-Id: Iec88e41c1fe80b436d6d08005871bead540e387d
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e19c8da..d2501a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,9 @@ AC_INIT([libosmo-sccp],
m4_esyscmd([./git-version-gen .tarball-version]),
[openbsc@lists.osmocom.org])
+dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
+AC_CONFIG_AUX_DIR([.])
+
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_TESTDIR(tests)