Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
cf2fec3c
Commit
cf2fec3c
authored
Oct 02, 2002
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- applied fix from 4.0 configure.in required to build shared libraries
with static glibc installed
parent
cca932d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
configure.in
configure.in
+4
-11
No files found.
configure.in
View file @
cf2fec3c
...
@@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc,
...
@@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc,
# we need special flags, but we will have to add those later
# we need special flags, but we will have to add those later
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
OTHER_LIBC_LIB
=
"-L
$other_libc_lib
"
OTHER_LIBC_LIB
=
"-
static -
L
$other_libc_lib
"
static_nss
=
1
static_nss
=
1
else
else
# this is a dirty hack. We if we detect static nss glibc in the special
# this is a dirty hack. We if we detect static nss glibc in the special
...
@@ -529,7 +529,6 @@ fi
...
@@ -529,7 +529,6 @@ fi
AC_ARG_WITH
(
server-suffix,
AC_ARG_WITH
(
server-suffix,
[
--with-server-suffix
Append value to the version string.],
[
--with-server-suffix
Append value to the version string.],
# I heard that 'cut' isn't portable. Isn't there a better way?
[
MYSQL_SERVER_SUFFIX
=
`
echo
"
$withval
"
|
sed
-e
's/^\(...................................\)..*$/\1/'
`
]
,
[
MYSQL_SERVER_SUFFIX
=
`
echo
"
$withval
"
|
sed
-e
's/^\(...................................\)..*$/\1/'
`
]
,
[
MYSQL_SERVER_SUFFIX
=
]
[
MYSQL_SERVER_SUFFIX
=
]
)
)
...
@@ -2122,10 +2121,7 @@ then
...
@@ -2122,10 +2121,7 @@ then
AC_DEFINE(THREAD_SAFE_CLIENT)
AC_DEFINE(THREAD_SAFE_CLIENT)
fi
fi
if test "$static_nss" = "1"
CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
then
CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
fi
AC_SUBST(CLIENT_LIBS)
AC_SUBST(CLIENT_LIBS)
AC_SUBST(sql_client_dirs)
AC_SUBST(sql_client_dirs)
...
@@ -2275,11 +2271,8 @@ fi
...
@@ -2275,11 +2271,8 @@ fi
# I know to add the static NSS magic if we have static NSS libraries with
# I know to add the static NSS magic if we have static NSS libraries with
# glibc - Sasha
# glibc - Sasha
if
test
"
$static_nss
"
=
"1"
LDFLAGS
=
"
$LDFLAGS
$OTHER_LIBC_LIB
"
then
LIBS
=
"
$LIBS
$STATIC_NSS_FLAGS
"
LDFLAGS
=
"
$LDFLAGS
-static
$OTHER_LIBC_LIB
"
LIBS
=
"
$LIBS
$STATIC_NSS_FLAGS
"
fi
AC_SUBST
(
sql_server_dirs
)
AC_SUBST
(
sql_server_dirs
)
AC_SUBST
(
thread_dirs
)
AC_SUBST
(
thread_dirs
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment