[tomcat-native] 06/08: Fixed a bug in configure.in enabling the maintainer mode when --disable-maintainer-mode is specified

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat-native.

commit 07fb76c8e99d8028ea56351b2f9b061f9e65619f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 17 18:44:14 2016 +0100

    Fixed a bug in configure.in enabling the maintainer mode when --disable-maintainer-mode is specified
---
 debian/changelog                                |  2 ++
 debian/patches/01-disable-maintainer-mode.patch | 28 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a28f393..e8c5f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ tomcat-native (1.2.10-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+  * Fixed a bug in configure.in enabling the maintainer mode when
+    --disable-maintainer-mode is specified
   * Switch to debhelper level 10
   * Replaced override_dh_auto_clean in debian/rules with debian/clean
 
diff --git a/debian/patches/01-disable-maintainer-mode.patch b/debian/patches/01-disable-maintainer-mode.patch
new file mode 100644
index 0000000..65cda0c
--- /dev/null
+++ b/debian/patches/01-disable-maintainer-mode.patch
@@ -0,0 +1,28 @@
+Description: No longer enable the maintainer mode when --disable-maintainer-mode is specified
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60388
+--- a/native/configure.in
++++ b/native/configure.in
+@@ -198,12 +198,16 @@
+ maintainer-mode,
+ [  --enable-maintainer-mode   Turn on debugging and compile time warnings],
+ [
+-  if test "$GCC" = "yes"; then
+-    CFLAGS="${CFLAGS} -DDEBUG -Wall"
+-  else
+-    CFLAGS="${CFLAGS} -DDEBUG"
+-  fi
+-AC_MSG_RESULT([...Enabling Maintainer mode...])
++  case "${enableval}" in
++    yes )
++       if test "$GCC" = "yes"; then
++         CFLAGS="${CFLAGS} -DDEBUG -Wall"
++       else
++         CFLAGS="${CFLAGS} -DDEBUG"
++       fi
++       AC_MSG_RESULT([...Enabling Maintainer mode...])
++       ;;
++  esac
+ ])
+ 
+ dnl
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1f1a9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-disable-maintainer-mode.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat-native.git