diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
| commit | 05e4094411f861bf29bea2e9c39c1b66f8f267f8 (patch) | |
| tree | 0e1037212fb440b1f8beb3288a0a9e8ee8a452ac /configure.ac | |
| parent | acb279125c0fa377c8b1dbbb8634fba60f7f845b (diff) | |
| parent | 2ee937b603b181bb24768eb4d0e2f918a5377fd3 (diff) | |
Merge branch 'master' into branch-1.5
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a6a9d3c5..3062b13b 100644 --- a/configure.ac +++ b/configure.ac @@ -497,6 +497,14 @@ esac AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes]) +AC_ARG_ENABLE([install-shared-mime-info], + [AS_HELP_STRING([--disable-install-shared-mime-info], + [disable installing shared mime info files (default=yes)])], + [INSTALL_SHARED_MIME_INFO=$enableval], + [INSTALL_SHARED_MIME_INFO=yes]) + +AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xyes]) + AC_OUTPUT([ Makefile src/Makedefs @@ -557,6 +565,7 @@ echo " Android support.............: ${HAVE_ANDROID_SDK}" echo " STlink support..............: ${HAVE_STLINK}" echo " Local pdclib................: ${HAVE_PDCLIB}" echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}" +echo " install shared mime info....: ${INSTALL_SHARED_MIME_INFO}" echo "" echo " Java" echo " freetts.....................: ${FREETTS}" |