diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 03f3af9eb..9d3eb41f0 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,10 @@ GNUPG_BUILD_PROGRAM(symcryptrun, no) # We use gpgtar to unpack test data, hence we always build it. If the # user opts out, we simply don't install it. GNUPG_BUILD_PROGRAM(gpgtar, yes) -GNUPG_BUILD_PROGRAM(wks-tools, no) +# We also install the gpg-wks-server tool by default but disable it +# later for platforms where it can't be build. +GNUPG_BUILD_PROGRAM(wks-tools, yes) + AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_GT) @@ -623,7 +626,6 @@ AC_ARG_VAR(YAT2M, [tool to convert texi to man pages]) AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M") AC_ISC_POSIX AC_SYS_LARGEFILE -GNUPG_CHECK_USTAR # We need to compile and run a program on the build machine. A @@ -682,6 +684,7 @@ case "${host}" in try_gettext="no" use_simple_gettext=yes mmap_needed=no + build_wks_tools=no ;; i?86-emx-os2 | i?86-*-os2*emx ) # OS/2 with the EMX environment @@ -689,6 +692,7 @@ case "${host}" in AC_DEFINE(HAVE_DRIVE_LETTERS) have_dosish_system=yes try_gettext="no" + build_wks_tools=no ;; i?86-*-msdosdjgpp*) @@ -697,6 +701,7 @@ case "${host}" in AC_DEFINE(HAVE_DRIVE_LETTERS) have_dosish_system=yes try_gettext="no" + build_wks_tools=no ;; *-*-hpux*) @@ -727,6 +732,7 @@ case "${host}" in # Android is fully utf-8 and we do not want to use iconv to # keeps things simple require_iconv=no + build_wks_tools=no ;; *-apple-darwin*) AC_DEFINE(_DARWIN_C_SOURCE, 900000L, @@ -1482,7 +1488,7 @@ if test "$use_regex" = yes ; then use_regex=no else if test x"$cross_compiling" = xyes; then - AC_MSG_WARN([cross compiling; assuming regexp libray is not broken]) + AC_MSG_WARN([cross compiling; assuming regexp library is not broken]) else AC_CACHE_CHECK([whether your system's regexp library is broken], [gnupg_cv_regex_broken], @@ -2044,7 +2050,6 @@ agent/Makefile scd/Makefile g13/Makefile dirmngr/Makefile -tools/gpg-zip tools/Makefile doc/Makefile tests/Makefile |