diff options
| author | Rickard Green <rickard@erlang.org> | 2020-12-21 17:13:27 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-12-21 17:39:58 +0100 |
| commit | c5b04efb55304a7c6f569c33c8e5875a32877f31 (patch) | |
| tree | 1344621035d0751847c06f46dafa77ae0169271a | |
| parent | 2c89431fa867d5b1cc56f26a9282bcfb6fcdec58 (diff) | |
| download | erlang-c5b04efb55304a7c6f569c33c8e5875a32877f31.tar.gz | |
Fix uses of AC_CONFIG_AUX_DIRS() in configure scripts
| -rw-r--r-- | lib/crypto/configure.in | 7 | ||||
| -rw-r--r-- | lib/megaco/configure.in | 7 | ||||
| -rw-r--r-- | lib/odbc/configure.in | 7 | ||||
| -rw-r--r-- | lib/snmp/configure.in | 7 | ||||
| -rw-r--r-- | make/configure.in | 4 |
5 files changed, 6 insertions, 26 deletions
diff --git a/lib/crypto/configure.in b/lib/crypto/configure.in index d9e431a61f..acab542cda 100644 --- a/lib/crypto/configure.in +++ b/lib/crypto/configure.in @@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl AC_INIT(vsn.mk) -if test -z "$ERL_TOP" || test ! -d "$ERL_TOP" ; then - AC_CONFIG_AUX_DIRS(autoconf) -else - erl_top=${ERL_TOP} - AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf) -fi +AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf) if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then AC_CANONICAL_HOST diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in index bf22776ae0..789fbbed04 100644 --- a/lib/megaco/configure.in +++ b/lib/megaco/configure.in @@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl AC_INIT(vsn.mk) -if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - AC_CONFIG_AUX_DIRS(autoconf) -else - erl_top=${ERL_TOP} - AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf) -fi +AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf) if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then AC_CANONICAL_HOST diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in index f13cd8c901..7b02f0d4df 100644 --- a/lib/odbc/configure.in +++ b/lib/odbc/configure.in @@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl dnl Process this file with autoconf to produce a configure script. AC_INIT(c_src/odbcserver.c) -if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - AC_CONFIG_AUX_DIRS(autoconf) -else - erl_top=${ERL_TOP} - AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf) -fi +AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf) if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then AC_CANONICAL_HOST diff --git a/lib/snmp/configure.in b/lib/snmp/configure.in index f9ca8f9ac4..bac042ccca 100644 --- a/lib/snmp/configure.in +++ b/lib/snmp/configure.in @@ -4,12 +4,7 @@ define([AC_CACHE_SAVE], )dnl AC_INIT(vsn.mk) -if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - AC_CONFIG_AUX_DIRS(autoconf) -else - erl_top=${ERL_TOP} - AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf) -fi +AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf) if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then AC_CANONICAL_HOST diff --git a/make/configure.in b/make/configure.in index ee2fa840cf..d603c9d202 100644 --- a/make/configure.in +++ b/make/configure.in @@ -76,13 +76,13 @@ esac # # Now srcdir is absolute and also the top of Erlang distribution, ERL_TOP. # -test "X$ERL_TOP" != "X" || ERL_TOP="$srcdir" +test "X$ERL_TOP" != "X" || AC_MSG_ERROR([ERL_TOP not set]) AC_SUBST(ERL_TOP) dnl dnl Aux programs are found in erts/autoconf dnl -AC_CONFIG_AUX_DIR(${srcdir}/erts/autoconf) +AC_CONFIG_AUX_DIR(${ERL_TOP}/erts/autoconf) dnl dnl Figure out what we are running on. And in violation of autoconf |