couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wenda...@apache.org
Subject git commit: updated refs/heads/1753-detect-non-standard-erlang-headers to 535fe3f
Date Thu, 28 Mar 2013 19:05:35 GMT
Updated Branches:
  refs/heads/1753-detect-non-standard-erlang-headers [created] 535fe3f09


COUCHDB-1753 Refactored erlang headers detection for non-standard locations.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/535fe3f0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/535fe3f0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/535fe3f0

Branch: refs/heads/1753-detect-non-standard-erlang-headers
Commit: 535fe3f091fa5dbf463066f71af056155c630cc1
Parents: 4b9bdac
Author: Wendall Cada <wendallc@apache.org>
Authored: Thu Mar 28 12:04:58 2013 -0700
Committer: Wendall Cada <wendallc@apache.org>
Committed: Thu Mar 28 12:04:58 2013 -0700

----------------------------------------------------------------------
 configure.ac |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/535fe3f0/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 53e23f1..2f7e2af 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)


Mime
View raw message