From af1e279c1530a2df76136a466bccddadcdd9bc7b Mon Sep 17 00:00:00 2001
From: Jeff Walsh <fejfighter@gmail.com>
Date: Thu, 2 Jul 2020 16:27:30 +1000
Subject: [PATCH] Restore support for terminal only emacs in PGTK (add
 --with-pgtk)

* configure.ac: add "--with-pgtk" switch for building pgtk terminal
support.
Adjust X11 window system tests to no clobber pgtk preferences
---
 configure.ac | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 16f7ef0e7be..66f9b7e8cee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,7 @@ AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
 [use Nextstep (macOS Cocoa or GNUstep) windowing system.
 On by default on macOS.])],[],[with_ns=maybe])
 OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
+OPTION_DEFAULT_OFF([pgtk], [use pure GTK build without reliance on X libs (Wayland support) - Experimental])
 
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
 OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
@@ -1830,13 +1831,17 @@ AC_SUBST(AUTO_DEPEND)
 ## window-system-specific substs.
 
 window_system=none
-AC_PATH_X
-if test "$no_x" != yes; then
-  window_system=x11
-else
+
+if test "${with_pgtk}" = "yes"; then
   window_system=pgtk
 fi
 
+
+AC_PATH_X
+if test "$no_x" != yes && test "${with_pgtk}" != "yes"; then
+  window_system=x11
+fi
+
 LD_SWITCH_X_SITE_RPATH=
 if test "${x_libraries}" != NONE; then
   if test -n "${x_libraries}"; then