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
157a041b
Commit
157a041b
authored
Aug 23, 2004
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
fix for bdb not ending up into libmysqld.a
parent
52731bec
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
bdb/dist/configure.ac
bdb/dist/configure.ac
+1
-1
configure.in
configure.in
+1
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+1
-1
No files found.
bdb/dist/configure.ac
View file @
157a041b
...
@@ -555,7 +555,7 @@ fi
...
@@ -555,7 +555,7 @@ fi
LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
LTLIBOBJS=`echo "$LIB@&t@OBJS" |
LTLIBOBJS=`echo "$LIB@&t@OBJS" |
sed
's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'
`
sed
"s,\.[[^.]]* ,$o ,g;s,\.[[^.]]*$,$o,"
`
AC_SUBST(LTLIBOBJS)
AC_SUBST(LTLIBOBJS)
# Initial output file list.
# Initial output file list.
...
...
configure.in
View file @
157a041b
...
@@ -2823,7 +2823,7 @@ then
...
@@ -2823,7 +2823,7 @@ then
AC_CONFIG_FILES
(
bdb/Makefile
)
AC_CONFIG_FILES
(
bdb/Makefile
)
echo
"CONFIGURING FOR BERKELEY DB"
echo
"CONFIGURING FOR BERKELEY DB"
bdb_conf_flags
=
bdb_conf_flags
=
"--disable-shared"
if
test
$with_debug
=
"yes"
if
test
$with_debug
=
"yes"
then
then
bdb_conf_flags
=
"
$bdb_conf_flags
--enable-debug --enable-diagnostic"
bdb_conf_flags
=
"
$bdb_conf_flags
--enable-debug --enable-diagnostic"
...
...
libmysqld/examples/Makefile.am
View file @
157a041b
...
@@ -16,7 +16,7 @@ DEFS = -DEMBEDDED_LIBRARY
...
@@ -16,7 +16,7 @@ DEFS = -DEMBEDDED_LIBRARY
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
$(openssl_includes)
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
$(openssl_includes)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @
bdb_libs_with_path@ @
LIBDL@
$(CXXLDFLAGS)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@
$(CXXLDFLAGS)
mysqltest_LINK
=
$(CXXLINK)
mysqltest_LINK
=
$(CXXLINK)
...
...
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