diff options
| author | Wendall Cada <wendallc@apache.org> | 2013-03-28 12:04:58 -0700 |
|---|---|---|
| committer | Wendall Cada <wendallc@apache.org> | 2013-03-28 12:04:58 -0700 |
| commit | 535fe3f091fa5dbf463066f71af056155c630cc1 (patch) | |
| tree | 5dfc2b54aa6f36d0b4655bdcf92a8dc6182b8016 | |
| parent | 4b9bdac33d61f3ec50e1ab1995f85efc0c1edd49 (diff) | |
| download | couchdb-1753-detect-non-standard-erlang-headers.tar.gz | |
COUCHDB-1753 Refactored erlang headers detection for non-standard locations.1753-detect-non-standard-erlang-headers
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 53e23f147..2f7e2aff1 100644 --- a/configure.ac +++ b/configure.ac @@ -135,19 +135,18 @@ AC_ARG_WITH([erlang], ], [ ERLANG_FLAGS="-I$withval" ], [ + ERLANG_FLAGS="" realerl=`readlink -f $ERL 2>/dev/null` AS_IF([test $? -eq 0], [ erlbase=`dirname $realerl` erlbase=`dirname $erlbase` ERLANG_FLAGS="-I${erlbase}/usr/include" - ], [ - # Failed to figure out where erl is installed.. - # try to add some default directories to search - ERLANG_FLAGS="-I${libdir}/erlang/usr/include" - ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/lib/erlang/usr/include" - ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/local/lib/erlang/usr/include" - ERLANG_FLAGS="$ERLANG_FLAGS -I/opt/local/lib/erlang/usr/include" ]) + # Add alternative locations for headers. + ERLANG_FLAGS="-I${libdir}/erlang/usr/include" + ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/lib/erlang/usr/include" + ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/local/lib/erlang/usr/include" + ERLANG_FLAGS="$ERLANG_FLAGS -I/opt/local/lib/erlang/usr/include" ]) AC_SUBST(ERLANG_FLAGS) |