From 02cfe004458f20f95539db14251f2473a842fc95 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@pefoley.com>
Date: Thu, 31 Mar 2016 14:04:16 -0400
Subject: [PATCH] Don't use deprecated acconfig.h for DEBUGGING

Use the 3-arg form of AC_DEFINE.

winsup/cygwin/ChangeLog:
acconfig.h: Remove DEBUGGING define.
configure.ac: Add description to DEBUGGING define.
config.h.in: Regenerate.
configure: Ditto.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
---
 winsup/cygwin/acconfig.h   | 3 ---
 winsup/cygwin/config.h.in  | 6 +++---
 winsup/cygwin/configure    | 3 ++-
 winsup/cygwin/configure.ac | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/winsup/cygwin/acconfig.h b/winsup/cygwin/acconfig.h
index 2f8d58c75..ffe9f8118 100644
--- a/winsup/cygwin/acconfig.h
+++ b/winsup/cygwin/acconfig.h
@@ -1,6 +1,3 @@
-/* Define if DEBUGGING support is requested.  */
-#undef DEBUGGING
-
 /* Define if MALLOC_DEBUGGING support is requested.  */
 #undef MALLOC_DEBUG
 
diff --git a/winsup/cygwin/config.h.in b/winsup/cygwin/config.h.in
index 39eb968d4..32f191af1 100644
--- a/winsup/cygwin/config.h.in
+++ b/winsup/cygwin/config.h.in
@@ -1,13 +1,13 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-/* Define if DEBUGGING support is requested.  */
-#undef DEBUGGING
-
 /* Define if MALLOC_DEBUGGING support is requested.  */
 #undef MALLOC_DEBUG
 
 /* Define if using new vfork functionality. */
 #undef NEWVFORK
 
+/* Define if DEBUGGING support is requested. */
+#undef DEBUGGING
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index aa26015f1..30a1405e4 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -4427,7 +4427,8 @@ fi
 # Check whether --enable-debugging was given.
 if test "${enable_debugging+set}" = set; then :
   enableval=$enable_debugging; case "${enableval}" in
-yes)	 $as_echo "#define DEBUGGING 1" >>confdefs.h
+yes)
+$as_echo "#define DEBUGGING 1" >>confdefs.h
  ;;
 no)	 ;;
 esac
diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac
index fe8e038a9..63979319f 100644
--- a/winsup/cygwin/configure.ac
+++ b/winsup/cygwin/configure.ac
@@ -64,7 +64,7 @@ AC_PROG_MAKE_SET
 AC_ARG_ENABLE(debugging,
 [ --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging],
 [case "${enableval}" in
-yes)	 AC_DEFINE(DEBUGGING) ;;
+yes)	 AC_DEFINE([DEBUGGING],[1],[Define if DEBUGGING support is requested.]) ;;
 no)	 ;;
 esac
 ])
-- 
2.43.5