From 4ac4035a8d97b4c002936a03e880ca319b35c3db Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Fri, 4 Jun 2021 14:43:18 +0100
Subject: [PATCH] Actively prevent user from specifying --enable-xrdpdebug

---
 .github/workflows/build.yml | 2 +-
 configure.ac                | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 529edf59dc..89fa0ce1c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
             arch: amd64
             os: ubuntu-latest
             name_extra: and DEBUG
-            CONF_FLAGS_EXTRA: "--enable-xrdpdebug"
+            CONF_FLAGS_EXTRA: "--enable-devel-all"
 
           # Maximal 32-bit arch builds
           - CC: gcc
diff --git a/configure.ac b/configure.ac
index 57cc79a2ae..0081ff4953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,14 @@ AC_ARG_ENABLE(rdpsndaudin, AS_HELP_STRING([--enable-rdpsndaudin],
               [], [enable_rdpsndaudin=no])
 AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes])
 
+# Obsolete options
+AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
+              [This option is no longer supported - use --enable-devel-all]))
+
+if test "x$enable_xrdpdebug" != x; then
+  AC_MSG_ERROR([--enable-xrdpdebug must be replaced with one or more --enable-devel-* options])
+fi
+
 # configure compiler options and CFLAGS
 AX_GCC_FUNC_ATTRIBUTE([format])
 AX_TYPE_SOCKLEN_T