aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-30 17:23:37 +0200
committerFredrik Gustafsson <[email protected]>2013-05-30 17:23:37 +0200
commit9427db3cd66f840ade9649513d914271b0981bf4 (patch)
tree62326e281a511c0f8d4d51a5e8aa25d1ce86fab6
parenta218171426a8bc02e20bb9d98a4d30691c8546e0 (diff)
parentc0732f12211f2c7775c5cd86d8c2085d90edbc0b (diff)
downloadotp-9427db3cd66f840ade9649513d914271b0981bf4.tar.gz
otp-9427db3cd66f840ade9649513d914271b0981bf4.tar.bz2
otp-9427db3cd66f840ade9649513d914271b0981bf4.zip
Merge branch 'sla/odbc_in_non_standard_location/OTP-11126' into maint
* sla/odbc_in_non_standard_location/OTP-11126: Fix checking for odbc in standard locations when "with-odbc" flag present.
-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"