aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-30 17:23:43 +0200
committerFredrik Gustafsson <[email protected]>2013-05-30 17:23:43 +0200
commit9226ff2e22e6e17594f26db4d3e7a9e67c869007 (patch)
tree084eed56832e1e20149f7bc36692a7572e7237ba
parent3b82ee998a5057ef01f722f5d0868b15999d9dd7 (diff)
parent9427db3cd66f840ade9649513d914271b0981bf4 (diff)
downloadotp-9226ff2e22e6e17594f26db4d3e7a9e67c869007.tar.gz
otp-9226ff2e22e6e17594f26db4d3e7a9e67c869007.tar.bz2
otp-9226ff2e22e6e17594f26db4d3e7a9e67c869007.zip
Merge branch 'maint'
-rw-r--r--lib/odbc/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index fd28830c0c..83f7a47434 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -167,7 +167,8 @@ AC_SUBST(TARGET_FLAGS)
AC_CHECK_SIZEOF(void *)
AC_MSG_CHECKING([for odbc in standard locations])
for rdir in /usr/local/odbc /usr/local /usr/odbc \
- /usr /opt/local/pgm/odbc /usr/local/pgm/odbc; do
+ /usr /opt/local/pgm/odbc /usr/local/pgm/odbc \
+ "$with_odbc"; do
test -f "$erl_xcomp_isysroot$rdir/include/sql.h" || continue
is_odbc_std_location=yes
libdir="$erl_xcomp_sysroot$rdir/lib"