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
5f9de42e
Commit
5f9de42e
authored
Jul 22, 2010
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not generate autotools configuration scripts when cmake is to be used.
parent
2857a849
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
16 deletions
+23
-16
BUILD/FINISH.sh
BUILD/FINISH.sh
+1
-0
BUILD/Makefile.am
BUILD/Makefile.am
+1
-1
BUILD/autorun.sh
BUILD/autorun.sh
+21
-15
BUILD/cmake_configure.sh
BUILD/cmake_configure.sh
+0
-0
No files found.
BUILD/FINISH.sh
View file @
5f9de42e
...
@@ -6,6 +6,7 @@ configure="./configure $base_configs $extra_configs"
...
@@ -6,6 +6,7 @@ configure="./configure $base_configs $extra_configs"
commands
=
"
\
commands
=
"
\
$make
-k maintainer-clean || true
$make
-k maintainer-clean || true
/bin/rm -rf */.deps/*.P configure config.cache storage/*/configure storage/*/config.cache autom4te.cache storage/*/autom4te.cache;
/bin/rm -rf */.deps/*.P configure config.cache storage/*/configure storage/*/config.cache autom4te.cache storage/*/autom4te.cache;
/bin/rm -rf CMakeCache.txt CMakeFiles/
path=
`
dirname
$0
`
path=
`
dirname
$0
`
.
\"
$path
/autorun.sh
\"
"
.
\"
$path
/autorun.sh
\"
"
...
...
BUILD/Makefile.am
View file @
5f9de42e
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
EXTRA_DIST
=
FINISH.sh
\
EXTRA_DIST
=
FINISH.sh
\
SETUP.sh
\
SETUP.sh
\
autorun.sh
\
autorun.sh
\
c
hoos
e_configure.sh
\
c
mak
e_configure.sh
\
build_mccge.sh
\
build_mccge.sh
\
check-cpu
\
check-cpu
\
cleanup
\
cleanup
\
...
...
BUILD/autorun.sh
View file @
5f9de42e
...
@@ -21,18 +21,24 @@ done
...
@@ -21,18 +21,24 @@ done
IFS
=
"
$save_ifs
"
IFS
=
"
$save_ifs
"
rm
-rf
configure
rm
-rf
configure
aclocal
||
die
"Can't execute aclocal"
autoheader
||
die
"Can't execute autoheader"
# Ensure that cmake and perl are available. Required for cmake based builds.
# --force means overwrite ltmain.sh script if it already exists
cmake
-P
cmake/check_minimal_version.cmake
>
/dev/null 2>&1
||
HAVE_CMAKE
=
no
$LIBTOOLIZE
--automake
--force
--copy
||
die
"Can't execute libtoolize"
perl
--version
>
/dev/null 2>&1
||
HAVE_CMAKE
=
no
# --add-missing instructs automake to install missing auxiliary files
# Whether to use the autotools configuration script or cmake.
# and --force to overwrite them if they already exist
if
test
"
$HAVE_CMAKE
"
=
"no"
automake
--add-missing
--force
--copy
||
die
"Can't execute automake"
then
autoconf
||
die
"Can't execute autoconf"
aclocal
||
die
"Can't execute aclocal"
# Do not use autotools generated configure directly. Instead, use a script
autoheader
||
die
"Can't execute autoheader"
# that will either call CMake or original configure shell script at build
# --force means overwrite ltmain.sh script if it already exists
# time (CMake is preferred if installed).
$LIBTOOLIZE
--automake
--force
--copy
||
die
"Can't execute libtoolize"
mv
configure configure.am
# --add-missing instructs automake to install missing auxiliary files
cp
BUILD/choose_configure.sh configure
# and --force to overwrite them if they already exist
chmod
a+x configure
automake
--add-missing
--force
--copy
||
die
"Can't execute automake"
autoconf
||
die
"Can't execute autoconf"
else
path
=
`
dirname
$0
`
cp
$path
/cmake_configure.sh
$path
/../configure
chmod
+x
$path
/../configure
fi
BUILD/c
hoos
e_configure.sh
→
BUILD/c
mak
e_configure.sh
View file @
5f9de42e
File moved
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