diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:33:59 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:33:59 -0600 | 
| commit | 7dccae47537d39a2d56ffd93642bc455d1c5d9a5 (patch) | |
| tree | bac497ac037a58dbbb9e0235aaaf013ed6f9d83d /configure.ac | |
| parent | 8ffc76a42ad5e3bdc7ce0529b6143f076de4a3ac (diff) | |
| parent | 10e31d84ee5cdf10248988079df91354ae6ed612 (diff) | |
Merge branch 'branch-1.5' into debian
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}"  | 
