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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f2f6f6d3
Commit
f2f6f6d3
authored
Sep 23, 2002
by
serg@build.mysql2.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql-4.0
into build.mysql2.com:/home/serg/mysql-4.0
parents
108f2ccb
88ce8f68
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+2
-1
configure.in
configure.in
+4
-4
No files found.
BitKeeper/etc/logging_ok
View file @
f2f6f6d3
...
@@ -58,6 +58,7 @@ root@x3.internalnet
...
@@ -58,6 +58,7 @@ root@x3.internalnet
salle@geopard.(none)
salle@geopard.(none)
salle@geopard.online.bg
salle@geopard.online.bg
sasha@mysql.sashanet.com
sasha@mysql.sashanet.com
serg@build.mysql2.com
serg@serg.mysql.com
serg@serg.mysql.com
serg@sergbook.mysql.com
serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
sinisa@rhols221.adsl.netsonic.fi
...
@@ -75,9 +76,9 @@ tonu@volk.internalnet
...
@@ -75,9 +76,9 @@ tonu@volk.internalnet
tonu@x153.internalnet
tonu@x153.internalnet
tonu@x3.internalnet
tonu@x3.internalnet
venu@work.mysql.com
venu@work.mysql.com
vva@genie.(none)
walrus@mysql.com
walrus@mysql.com
worm@altair.is.lan
worm@altair.is.lan
zak@balfor.local
zak@balfor.local
zak@linux.local
zak@linux.local
zgreant@mysql.com
zgreant@mysql.com
vva@genie.(none)
configure.in
View file @
f2f6f6d3
...
@@ -479,8 +479,8 @@ AC_ARG_WITH(other-libc,
...
@@ -479,8 +479,8 @@ AC_ARG_WITH(other-libc,
then
then
# libc has been compiled with --enable-static-nss
# libc has been compiled with --enable-static-nss
# 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
=
"-
Wl,--start-group -lc -lnss_files -lnss_dns -lresolv
\
STATIC_NSS_FLAGS
=
"-
lc -lnss_files -lnss_dns -lresolv"
-Wl,--end-group
"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
OTHER_LIBC_LIB
=
"-L
$other_libc_lib
"
OTHER_LIBC_LIB
=
"-L
$other_libc_lib
"
static_nss
=
1
static_nss
=
1
else
else
...
@@ -520,8 +520,8 @@ then
...
@@ -520,8 +520,8 @@ then
tmp
=
`
nm /usr/lib/libc.a |
grep
_nss_files_getaliasent_r
`
tmp
=
`
nm /usr/lib/libc.a |
grep
_nss_files_getaliasent_r
`
if
test
-n
"
$tmp
"
if
test
-n
"
$tmp
"
then
then
STATIC_NSS_FLAGS
=
"-
Wl,--start-group -lc -lnss_files -lnss_dns -lresolv
\
STATIC_NSS_FLAGS
=
"-
lc -lnss_files -lnss_dns -lresolv"
-Wl,--end-group
"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
static_nss
=
1
static_nss
=
1
fi
fi
fi
fi
...
...
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