pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/erlang Add --without-odbc to CONFIGURE_ARGS when ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/17ca5a1efee6
branches:  trunk
changeset: 650544:17ca5a1efee6
user:      hiramatsu <hiramatsu%pkgsrc.org@localhost>
date:      Fri Apr 24 18:25:54 2015 +0000

description:
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:

 lang/erlang/options.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 018033cf85da -r 17ca5a1efee6 lang/erlang/options.mk
--- a/lang/erlang/options.mk    Fri Apr 24 16:06:18 2015 +0000
+++ b/lang/erlang/options.mk    Fri Apr 24 18:25:54 2015 +0000
@@ -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 @@
 .  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
 
 ###



Home | Main Index | Thread Index | Old Index