summaryrefslogtreecommitdiff
path: root/lang/erlang
diff options
context:
space:
mode:
authorhiramatsu <hiramatsu>2015-04-24 18:25:54 +0000
committerhiramatsu <hiramatsu>2015-04-24 18:25:54 +0000
commitb216f4e32dc35c973c507fe2baf19dad094fcf4e (patch)
tree279529c07cf0820fb81dd6e1b6477f53dce6b166 /lang/erlang
parent033d682096275a27839dbd9f5992e233a2e893a3 (diff)
downloadpkgsrc-b216f4e32dc35c973c507fe2baf19dad094fcf4e.tar.gz
Add --without-odbc to CONFIGURE_ARGS when neither "iodbc" nor
"unixodbc" option is selected. This change prevent configure from picking up system installed iodbc on Mac OS X 10.10.
Diffstat (limited to 'lang/erlang')
-rw-r--r--lang/erlang/options.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/erlang/options.mk b/lang/erlang/options.mk
index 0ee19ca0791..70375bd6ba5 100644
--- a/lang/erlang/options.mk
+++ b/lang/erlang/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2013/07/05 12:42:48 jperkin Exp $
+# $NetBSD: options.mk,v 1.7 2015/04/24 18:25:54 hiramatsu Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.erlang
PKG_SUPPORTED_OPTIONS= java erlang-hipe
@@ -48,12 +48,12 @@ CONFIGURE_ARGS+= --disable-hipe
. include "../../databases/iodbc/buildlink3.mk"
CONFIGURE_ARGS+= --with-odbc=${BUILDLINK_PREFIX.iodbc}
PLIST.odbc= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Munixodbc)
+.elif !empty(PKG_OPTIONS:Munixodbc)
. include "../../databases/unixodbc/buildlink3.mk"
CONFIGURE_ARGS+= --with-odbc=${BUILDLINK_PREFIX.unixodbc}
PLIST.odbc= yes
+.else
+CONFIGURE_ARGS+= --without-odbc
.endif
###