check for android and cordova separately; depend on npm and nodejs for cordova

2015-11-25 08:57:04 +00:00
parent ed8f0bb759
commit bd90fddb88
5 changed files with 114 additions and 43 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,10 @@ AX_BUILD_TEST
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS

-AC_CHECK_PROG(CORDOVA, [cordova android], [1], [0],
+AC_CHECK_PROG(ANDROID, [android], [1], [0],
                       [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
-AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} = "1"])
+AC_CHECK_PROG(CORDOVA, [cordova], [1], [0])
+AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} -eq 1 -a ${ANDROID} -eq 1])
 AX_SUBST(CORDOVA)

 AC_CONFIG_FILES([html/index.html])