summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-01 00:34:31 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-01 01:01:53 +0200
commitb81031292b21555be6f63f94b7d4dcc01e69cd7b (patch)
tree7852e14251faa084e8909a288aa1ac30d47fbc77
parentea291e3004182257399a53f95b236e57d1adf989 (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: I3b6d9ad4e5af44c2bdf3844c7bf8e8517bd61d8e
-rw-r--r--openbsc/configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 173c6c8ec..4b00af73f 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -3,6 +3,9 @@ AC_INIT([openbsc],
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)