Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pike
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pikelang
pike
Commits
e4effa51
Commit
e4effa51
authored
Aug 5, 2019
by
Tobias S. Josefowitz
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGES
+5
-0
5 additions, 0 deletions
CHANGES
src/modules/sybase/configure.in
+13
-8
13 additions, 8 deletions
src/modules/sybase/configure.in
with
18 additions
and
8 deletions
CHANGES
+
5
−
0
View file @
e4effa51
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
src/modules/sybase/configure.in
+
13
−
8
View file @
e4effa51
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment