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
2de6b520
Commit
2de6b520
authored
Mar 18, 2004
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
parents
7aee7625
4493a24d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
22 deletions
+2
-22
configure.in
configure.in
+2
-22
No files found.
configure.in
View file @
2de6b520
...
@@ -2704,9 +2704,7 @@ then
...
@@ -2704,9 +2704,7 @@ then
/
*
)
rel_srcdir
=
"
$srcdir
"
;;
/
*
)
rel_srcdir
=
"
$srcdir
"
;;
*
)
rel_srcdir
=
"../../
$srcdir
"
;;
*
)
rel_srcdir
=
"../../
$srcdir
"
;;
esac
esac
(
cd
$bdb
/build_unix
&&
\
AC_CONFIG_SUBDIRS
(
$bdb
/dist/configure
)
sh
$rel_srcdir
/
$bdb
/dist/configure
$bdb_conf_flags
)
||
\
AC_MSG_ERROR
([
could not configure Berkeley DB]
)
dnl
echo
"bdb = '
$bdb
'; inc = '
$bdb_includes
', lib = '
$bdb_libs
'"
dnl
echo
"bdb = '
$bdb
'; inc = '
$bdb_includes
', lib = '
$bdb_libs
'"
echo
"END OF BERKELEY DB CONFIGURATION"
echo
"END OF BERKELEY DB CONFIGURATION"
...
@@ -2745,25 +2743,7 @@ EOF
...
@@ -2745,25 +2743,7 @@ EOF
then
then
innodb_conf_flags
=
""
innodb_conf_flags
=
""
sql_server_dirs
=
"
$sql_server_dirs
innobase"
sql_server_dirs
=
"
$sql_server_dirs
innobase"
echo
"CONFIGURING FOR INNODB"
AC_CONFIG_SUBDIRS
(
innobase
)
if
test
!
-d
"innobase"
;
then
# This should only happen when doing a VPATH build
echo
"NOTICE: I have to make the Innobase directory:
`
pwd
`
/innobase"
mkdir
"innobase"
||
exit
1
fi
rel_srcdir
=
case
"
$srcdir
"
in
/
*
)
rel_srcdir
=
"
$srcdir
"
;;
*
)
rel_srcdir
=
"../
$srcdir
"
;;
esac
if
test
"x
$enable_dependency_tracking
"
==
xno
then
innodb_conf_flags
=
--disable-dependency-tracking
fi
(
cd
innobase
&&
sh
$rel_srcdir
/innobase/configure
--host
=
$host
$innodb_conf_flags
)
\
||
AC_MSG_ERROR
([
could not configure INNODB]
)
echo
"END OF INNODB CONFIGURATION"
fi
fi
#
#
# END of configuration for optional table handlers
# END of configuration for optional table handlers
...
...
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