libglu: Changes to 'debian-unstable'
configure.ac | 7 ++++---
debian/changelog | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c3efb5e514b127e347172f13bc765d1e4ea13b58
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Sep 18 14:34:23 2013 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 0d826c9..bdf094d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libglu (9.0.0-2) UNRELEASED; urgency=low
[ Andreas Boll ]
* Disable silent rules.
+ * Cherry-pick commit 0692115 (Add -D(N)DEBUG to CFLAGS dependent on --
+ enable-debug) from upstream (Closes: #723577)
-- Julien Cristau <jcristau@debian.org> Mon, 01 Jul 2013 18:23:15 +0200
commit 06b019bd3afd1f59c929d38de0a4fcd3df0092a3
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Feb 21 20:40:31 2013 -0800
Add -D(N)DEBUG to CFLAGS dependent on --enable-debug
Tested-by: Blaž Hrastnik <speed.the.bboy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61003
(cherry picked from commit 069211570c32a8d5848e127975a2943e9d8fc6b9)
diff --git a/configure.ac b/configure.ac
index cbfd047..45abf17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[Enable debugging information]),
- [CFLAGS="$CFLAGS -g -O0"
- CXXFLAGS="$CXXFLAGS -g -O0"],
- [])
+ [CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"],
+ [CFLAGS="$CFLAGS -DNDEBUG"
+ CXXFLAGS="$CXXFLAGS -DNDEBUG"])
dnl Make sure the pkg-config macros are defined
m4_ifndef([PKG_PROG_PKG_CONFIG],
Reply to: