Commit 5f9de42e authored by Davi Arnaut's avatar Davi Arnaut

Do not generate autotools configuration scripts when cmake is to be used.

parent 2857a849
...@@ -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\""
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
EXTRA_DIST = FINISH.sh \ EXTRA_DIST = FINISH.sh \
SETUP.sh \ SETUP.sh \
autorun.sh \ autorun.sh \
choose_configure.sh \ cmake_configure.sh \
build_mccge.sh \ build_mccge.sh \
check-cpu \ check-cpu \
cleanup \ cleanup \
......
...@@ -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"
# --force means overwrite ltmain.sh script if it already exists
$LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize"
# --add-missing instructs automake to install missing auxiliary files # Ensure that cmake and perl are available. Required for cmake based builds.
# and --force to overwrite them if they already exist cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
automake --add-missing --force --copy || die "Can't execute automake" perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
autoconf || die "Can't execute autoconf"
# Do not use autotools generated configure directly. Instead, use a script # Whether to use the autotools configuration script or cmake.
# that will either call CMake or original configure shell script at build if test "$HAVE_CMAKE" = "no"
# time (CMake is preferred if installed). then
mv configure configure.am aclocal || die "Can't execute aclocal"
cp BUILD/choose_configure.sh configure autoheader || die "Can't execute autoheader"
chmod a+x configure # --force means overwrite ltmain.sh script if it already exists
$LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize"
# --add-missing instructs automake to install missing auxiliary files
# and --force to overwrite them if they already exist
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment