Skip to content
Snippets Groups Projects
Commit e4effa51 authored by Tobias S. Josefowitz's avatar Tobias S. Josefowitz
Browse files

sybase: Use ABI suffixes when looking for sybase lib dir

parent 66894500
No related branches found
No related tags found
No related merge requests found
...@@ -164,6 +164,11 @@ o SSL.File ...@@ -164,6 +164,11 @@ o SSL.File
This in turn caused errors like "Not open" from This in turn caused errors like "Not open" from
functions like read() and set_nonblocking(). 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 o Thread.Queue
Attempt to work around glibc bugs. Attempt to work around glibc bugs.
......
...@@ -101,7 +101,6 @@ else ...@@ -101,7 +101,6 @@ else
fi fi
if test "$pike_cv_framework_sybaseopenclient" = "no"; then if test "$pike_cv_framework_sybaseopenclient" = "no"; then
AC_MSG_CHECKING(for library files location)
if test x$pike_sybase_lib_dir != x; then if test x$pike_sybase_lib_dir != x; then
AC_MSG_RESULT(user-provided: $pike_sybase_lib_dir) AC_MSG_RESULT(user-provided: $pike_sybase_lib_dir)
pike_cv_sybase_lib_dir=$pike_sybase_lib_dir pike_cv_sybase_lib_dir=$pike_sybase_lib_dir
...@@ -117,20 +116,26 @@ else ...@@ -117,20 +116,26 @@ else
for sybpath in $pike_sybase_reasonable_paths for sybpath in $pike_sybase_reasonable_paths
do do
dnl AC_MSG_CHECKING(in $sybroot/$sybprefix/$sybpath) dnl AC_MSG_CHECKING(in $sybroot/$sybprefix/$sybpath)
for suff in $pike_cv_abi_suffixes; do
PIKE_CHECK_ABI_DIR($sybroot/$sybprefix/$sybpath$suff, [
for syblib in $pike_sybase_reasonable_libs_tosearch for syblib in $pike_sybase_reasonable_libs_tosearch
do do
if test -f $sybroot/$sybprefix/$sybpath/$syblib; then if test -f $sybroot/$sybprefix/$sybpath$suff/$syblib; then
pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath" pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath$suff"
dnl AC_MSG_RESULT(found) dnl AC_MSG_RESULT(found)
break 4; break 5;
fi fi
done done
])
done
dnl AC_MSG_RESULT(not found) dnl AC_MSG_RESULT(not found)
done done
done done
done done
]) ])
AC_MSG_CHECKING(for library files location)
if test x$pike_cv_sybase_lib_dir != x; then if test x$pike_cv_sybase_lib_dir != x; then
AC_MSG_RESULT(found: $pike_cv_sybase_lib_dir) AC_MSG_RESULT(found: $pike_cv_sybase_lib_dir)
LDFLAGS="-L$pike_cv_sybase_lib_dir $LDFLAGS" LDFLAGS="-L$pike_cv_sybase_lib_dir $LDFLAGS"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment