development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

allow subdirs with qt; test for glibtoolize on Mac OSX

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-12-06 11:01:04 +00:00
parent 55aefd852e
commit 186a7dde78
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ax_check_qt.m4
View File

@@ -275,7 +275,7 @@ AC_DEFUN([AX_QT_NO_KEYWORDS], [
AC_DEFUN([AX_INIT_QT], [ AC_DEFUN([AX_INIT_QT], [
if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
for f in $(find test src -name makefile.in); do for f in $(find test examples src -name makefile.in); do
test -f "$f" && cat >> "$f" <<EOF test -f "$f" && cat >> "$f" <<EOF
${AX_ADDITIONAL_QT_RULES_HACK} ${AX_ADDITIONAL_QT_RULES_HACK}
EOF EOF

28
scripts/bootstrap.sh
View File

@@ -353,6 +353,11 @@ notice() {
echo -e "\e[1;33m$*\e[0m" echo -e "\e[1;33m$*\e[0m"
} }
error() {
echo -e " \e[31merror\e[0m $*"
exit 1
}
run() { run() {
check=1 check=1
while test $# -gt 0; do while test $# -gt 0; do
@@ -1794,7 +1799,18 @@ $(case "$VCS" in
esac) esac)
fi fi
aclocal aclocal
$(if testtag AX_USE_LIBTOOL; then echo libtoolize --force; fi) $(if testtag AX_USE_LIBTOOL; then
cat <<EOF1
if which -s libtoolize; then
run libtoolize --force;
elif which -s glibtoolize; then
run glibtoolize --force;
else
echo "error: libtoolize not found" 1>&2
exit 1
fi
EOF1
fi)
automake -a automake -a
autoconf autoconf
EOF EOF
@@ -1862,7 +1878,15 @@ else
#### Bootstrap Before Configure #### #### Bootstrap Before Configure ####
run --no-check vcs2cl run --no-check vcs2cl
run aclocal run aclocal
if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi if testtag AX_USE_LIBTOOL; then
if which -s libtoolize; then
run libtoolize --force;
elif which -s glibtoolize; then
run glibtoolize --force;
else
error libtoolize not found
fi
fi
run automake -a run automake -a
run autoconf run autoconf