summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-04 14:10:13 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-04 14:10:13 +0300
commit99042aa646d4895ed3736e7a955adcceaa7d7dbb (patch)
tree57995652cd36f76fed837e4e9f542e7dfdbf4ed8
parent37445ada347ec9028d16a0d20378bb009e734409 (diff)
downloadmv-99042aa646d4895ed3736e7a955adcceaa7d7dbb.tar.gz
mv-99042aa646d4895ed3736e7a955adcceaa7d7dbb.tar.bz2
mv-99042aa646d4895ed3736e7a955adcceaa7d7dbb.tar.xz
mv-99042aa646d4895ed3736e7a955adcceaa7d7dbb.zip
Disable building dyecmd on Android.
-rwxr-xr-xconfigure.ac2
-rw-r--r--src/Makefile.am4
2 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 0edeca5f4..d1bf4cd8a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AC_ARG_ENABLE(androidbuild,
*) AC_MSG_ERROR(bad value ${enableval} for --enable-androidbuild) ;;
esac],[androidbuild_enabled=false])
+AM_CONDITIONAL(ENABLE_DYECMD, test x$androidbuild_enabled = xyes)
+
# Enable nacl build
AC_ARG_ENABLE(naclbuild,
[ --enable-naclbuild Turn on nacl building],
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d40b4c18..ba83b5fcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,10 @@
AUTOMAKE_OPTIONS = subdir-objects
+if ENABLE_DYECMD
bin_PROGRAMS = manaplus dyecmd
+else
+bin_PROGRAMS = manaplus
+endif
dyecmd_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\" \