Disable building the feature/android branch

* configure.ac: Disable building Emacs from this branch.

* README: Mention that this branch is no longer receiving updates.

diff --git a/ChangeLog.android b/ChangeLog.android
index 3cb88b6f10ca0810116fe7e36cf7413ce70af8b3..2dfe9b540d0da12e352011f4ecddb1e88e8df53c 100644 (file)
--- a/ChangeLog.android
+++ b/ChangeLog.android
@@ -1,5 +1,9 @@
 2023-08-07  Po Lu  <luangruo@yahoo.com>
 
+       * configure.ac: Disable building Emacs from this branch.
+
+       * README: Mention that this branch is no longer receiving updates.
+
        * nt/mingw-cfg.site: Remove additions for Gnulib printf.
 
        * m4, lib: Update from Gnulib.

diff --git a/README b/README
index 694b3aa4c94b46951b2821a3a1e786194b249f6f..512af9706037ab72b240bf37051306fe0a4d5666 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
+The feature/android branch is no longer being updated.
+Android support has been integrated into the 'master' branch,
+and will be released in conjunction with Emacs 30.1.
+
 Copyright (C) 2001-2023 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 

diff --git a/configure.ac b/configure.ac
index c77fab3eefd0e8e5e19d8fb29cf144541d12c7b8..c6081f73de273b19831c12d7670fbd2c52a52bbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,9 @@ dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
 AC_INIT([GNU Emacs], [30.0.50], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
+AC_MSG_ERROR([The feature/android branch is no longer being updated,\
+ as the Android support has been introduced to `master'.])
+
 if test "$XCONFIGURE" = "android"; then
   # configure is being called recursively to configure Emacs for
   # Android!