fixes for cordova

This commit is contained in:
Marc Wäckerlin
2015-11-25 10:05:03 +00:00
parent bd90fddb88
commit c7c4bd731a
3 changed files with 18 additions and 8 deletions

View File

@@ -30,10 +30,20 @@ AX_BUILD_TEST
#AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
#AX_QT_NO_KEYWORDS
AC_CHECK_PROG(ANDROID, [android], [1], [0],
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
AC_CHECK_PROG(CORDOVA, [cordova], [1], [0])
AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} -eq 1 -a ${ANDROID} -eq 1])
AC_PATH_PROG(ANDROID, [android], [0],
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
AC_PATH_PROG(CORDOVA, [cordova], [0],
[${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin])
if test ${CORDOVA} = 0; then
AC_CHECK_PROG(NODE_NPM, [npm node], [1], [0])
if test ${NODE_NPM} -eq 1; then
if npm install cordova; then
AC_PATH_PROG(CORDOVA, [cordova], [0],
[${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin])
fi
fi
fi
AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
AX_SUBST(CORDOVA)
AC_CONFIG_FILES([html/index.html])