couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Noah Slater <nsla...@tumbolia.org>
Subject Re: git commit: Try to determine the location of erl_driver.h at configure time
Date Sun, 30 Oct 2011 18:45:02 GMT
Nice.

I saw you close the issue, but I had to dig around in configure.ac to
check, as I had never seen a patch of this nature land.

Thanks Jan!

On Sun, Oct 30, 2011 at 4:54 PM, <jan@apache.org> wrote:

> Updated Branches:
>  refs/heads/1.2.x 6e077c302 -> 13136475c
>
>
> Try to determine the location of erl_driver.h at configure time
>
> Use the existence of erl in path to try to figure out where the
> file should be located unless the user specified it.
>
> Patch by Trond Norbye.
>
> Closes COUCHDB-162
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/13136475
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/13136475
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/13136475
>
> Branch: refs/heads/1.2.x
> Commit: 13136475cc0a533e454b274f579c4324ee7b0fc2
> Parents: 6e077c3
> Author: Trond Norbye <trond.norbye@gmail.com>
> Authored: Wed Sep 21 09:13:02 2011 +0200
> Committer: Jan Lehnardt <jan@apache.org>
> Committed: Sun Oct 30 17:54:21 2011 +0100
>
> ----------------------------------------------------------------------
>  configure.ac |   27 ++++++++++++++++++---------
>  1 files changed, 18 insertions(+), 9 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/13136475/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index d68106f..697a37f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -112,14 +112,28 @@ else
>     AC_MSG_RESULT([no])
>  fi
>
> +AC_PATH_PROG([ERL], [erl])
> +AS_IF([test x${ERL} = x], [
> +    AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang
> installed?])
> +    ])
> +
>  AC_ARG_WITH([erlang], [AC_HELP_STRING([--with-erlang=PATH],
>     [set PATH to the Erlang include directory])], [
>     ERLANG_FLAGS="-I$withval"
>  ], [
> -    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"
> +    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"
> +          ])
>  ])
>  AC_SUBST(ERLANG_FLAGS)
>
> @@ -356,11 +370,6 @@ case "$(uname -s)" in
>   ;;
>  esac
>
> -AC_PATH_PROG([ERL], [erl])
> -
> -if test x${ERL} = x; then
> -    AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang
> installed?])
> -fi
>
>  erlang_version_error="The installed Erlang version is less than 5.6.5
> (R12B05)."
>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message