summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-30 23:45:28 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-01 00:58:53 +0200
commitcbdfa65dbed69fc19ba195d2aa8ead76f1434c5c (patch)
tree9432c8b79753e0fb8f2917a820ec53c80c0b06c8
parent2bb65be159dfdabf664fec569b343320301701b0 (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: If2afbe62e9ceeac8052c7b882ff92a548f3af0bf
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 1b62278f..e3752b4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,9 @@ AC_INIT([libosmocore],
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([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects])
AC_CONFIG_TESTDIR(tests)