From e4effa514eeefa5da099e1fb8e4508a2749c2479 Mon Sep 17 00:00:00 2001
From: "Tobias S. Josefowitz" <tobij@tobij.de>
Date: Tue, 6 Aug 2019 00:14:11 +0200
Subject: [PATCH] sybase: Use ABI suffixes when looking for sybase lib dir
---
CHANGES | 5 +++++
src/modules/sybase/configure.in | 21 +++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CHANGES b/CHANGES
index 99528b2e5d..2ef647fd73 100644
--- a/CHANGES
+++ b/CHANGES
@@ -164,6 +164,11 @@ o SSL.File
This in turn caused errors like "Not open" from
functions like read() and set_nonblocking().
+o sybase
+
+ The module's configure script now respects ABI suffixes when searching
+ for the sybase library dir.
+
o Thread.Queue
Attempt to work around glibc bugs.
diff --git a/src/modules/sybase/configure.in b/src/modules/sybase/configure.in
index 38441bb77c..4846ae3723 100755
--- a/src/modules/sybase/configure.in
+++ b/src/modules/sybase/configure.in
@@ -101,7 +101,6 @@ else
fi
if test "$pike_cv_framework_sybaseopenclient" = "no"; then
-AC_MSG_CHECKING(for library files location)
if test x$pike_sybase_lib_dir != x; then
AC_MSG_RESULT(user-provided: $pike_sybase_lib_dir)
pike_cv_sybase_lib_dir=$pike_sybase_lib_dir
@@ -117,13 +116,17 @@ else
for sybpath in $pike_sybase_reasonable_paths
do
dnl AC_MSG_CHECKING(in $sybroot/$sybprefix/$sybpath)
- for syblib in $pike_sybase_reasonable_libs_tosearch
- do
- if test -f $sybroot/$sybprefix/$sybpath/$syblib; then
- pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath"
-dnl AC_MSG_RESULT(found)
- break 4;
- fi
+ for suff in $pike_cv_abi_suffixes; do
+ PIKE_CHECK_ABI_DIR($sybroot/$sybprefix/$sybpath$suff, [
+ for syblib in $pike_sybase_reasonable_libs_tosearch
+ do
+ if test -f $sybroot/$sybprefix/$sybpath$suff/$syblib; then
+ pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath$suff"
+ dnl AC_MSG_RESULT(found)
+ break 5;
+ fi
+ done
+ ])
done
dnl AC_MSG_RESULT(not found)
done
@@ -131,6 +134,8 @@ dnl AC_MSG_RESULT(not found)
done
])
+ AC_MSG_CHECKING(for library files location)
+
if test x$pike_cv_sybase_lib_dir != x; then
AC_MSG_RESULT(found: $pike_cv_sybase_lib_dir)
LDFLAGS="-L$pike_cv_sybase_lib_dir $LDFLAGS"
--
GitLab