From: Po Lu Date: Wed, 22 Feb 2023 03:31:39 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/master' into feature/android X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8356412d6259a8fbfa83380ae0f96361d7223f03;p=emacs.git Merge remote-tracking branch 'origin/master' into feature/android --- 8356412d6259a8fbfa83380ae0f96361d7223f03 diff --cc configure.ac index e6a8c760b10,b484ebdc8ba..4aa8945b8ba --- a/configure.ac +++ b/configure.ac @@@ -7419,7 -6637,7 +7419,8 @@@ AC_DEFINE_UNQUOTED([EMACS_CONFIG_FEATUR [Summary of some of the main features enabled by configure.]) AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D} + Does Emacs use Android? ${ANDROID} + Does Emacs use the X Double Buffer Extension? ${HAVE_XDBE} Does Emacs use -lXpm? ${HAVE_XPM} Does Emacs use -ljpeg? ${HAVE_JPEG} Does Emacs use -ltiff? ${HAVE_TIFF}