procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Repair mailutils configury

Browse source 
* configure.ac (with_mailutils): When processing defaults,
set to yes-unless-android if with_features.
(HAVE_MAILUTILS): Later, disable Mailutils if yes-on-android
and with_android is set.  This is the minimal Emacs build
for the build machine.  (bug#65190)
This commit is contained in:
Po Lu 2023-08-11 08:57:04 +08:00
parent a71a96f6ef
commit cc6fed326a
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
configure.ac
View file

@ -345,22 +345,13 @@ AC_ARG_WITH([mailutils],
options are irrelevant; this is the default if GNU Mailutils is
installed])],
[],
[with_mailutils=$with_features
AS_IF([test "$with_mailutils" = yes],
[AS_IF([test "x$XCONFIGURE" != "xandroid" \
&& test "$with_android" = "no"],
[(movemail --version) >/dev/null 2>&1 || with_mailutils=no],
[dnl Don't check for movemail if cross-compiling.
dnl instead, default to false.
with_mailutils=no])])])
AS_IF([test "$with_mailutils" = no],
[with_mailutils=])
AS_IF([test x"$with_mailutils" = xyes],
[AC_DEFINE([HAVE_MAILUTILS], [1],
[Define to 1 if Emacs was configured with mailutils])])
AC_SUBST([with_mailutils])
[AS_IF([test "$with_features" != "no"],
[with_mailutils=yes-unless-android
AS_IF([test "x$XCONFIGURE" != "xandroid"],
[(movemail --version) >/dev/null 2>&1 || with_mailutils=no],
[dnl Don't check for movemail if cross-compiling.
dnl instead, default to false.
with_mailutils=no])])])
AC_ARG_WITH([pop],
[AS_HELP_STRING([--with-pop],
@ -597,6 +588,25 @@ OPTION_DEFAULT_OFF([small-ja-dic],[generate a smaller-size Japanese dictionary])
OPTION_DEFAULT_OFF([android],[cross-compile Android application package])
OPTION_DEFAULT_ON([android-debug],[don't build Emacs as a debug package on Android])
# Find out of Android support is enabled and mailutils has defaulted
# to `yes-unless-android'. Disable it if so.
AS_IF([test "x$with_mailutils" = "xyes-unless-android"],
[AS_IF([test "x$with_android" != "xno"],
[with_mailutils=no],
[with_mailutils=yes])])
# Clear with_mailutils if it's set to no.
AS_IF([test "$with_mailutils" = no],
[with_mailutils=])
AS_IF([test x"$with_mailutils" = xyes],
[AC_DEFINE([HAVE_MAILUTILS], [1],
[Define to 1 if Emacs was configured with mailutils])])
AC_SUBST([with_mailutils])
AC_ARG_WITH([shared-user-id],
[AS_HELP_STRING([--with-shared-user-id=ID],
[use the given shared user ID in Android builds])])