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

allow recursive C++ source directories

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-11-29 15:57:41 +00:00
parent 22b8002f9c
commit 55aefd852e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ax_check_qt.m4
View File

@@ -275,8 +275,10 @@ 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
test -f src/makefile.in && cat >> src/makefile.in <<EOF for f in $(find test src -name makefile.in); do
${AX_ADDITIONAL_QT_RULES_HACK} test -f "$f" && cat >> "$f" <<EOF
${AX_ADDITIONAL_QT_RULES_HACK}
EOF EOF
done
fi fi
]) ])

2
scripts/ax_init_standard_project.m4
View File

@@ -1225,9 +1225,9 @@ AC_DEFUN([AX_ALL_DEPEND], [
# finish configuration - to be called instead of AC_OUTPUT # finish configuration - to be called instead of AC_OUTPUT
AC_DEFUN([AX_OUTPUT], [ AC_DEFUN([AX_OUTPUT], [
AX_INIT_QT
AX_DEB_RESOLVE AX_DEB_RESOLVE
AX_RPM_RESOLVE AX_RPM_RESOLVE
AC_OUTPUT AC_OUTPUT
AX_INIT_QT
AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}]) AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}])
]) ])