[SCM] Wormux PKG branch, master, updated. ed409c88fd6f7d05810ef898006d159ae18c9aba

[Felix Geyer]

The following commit has been merged in the master branch:
commit 66c6d42b09dc18afa26ef254c1a2b8b83575a9ac
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Jul 17 16:03:38 2010 +0200

    Respect the CFLAGS/CXXFLAGS environment variables in the autoconf script.

diff --git a/debian/changelog b/debian/changelog
index 877599a..28051bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ wormux (1:0.9.2.1-1) unstable; urgency=low
   * wormux-server and wormux-data don't recommend wormux anymore.
   * Use the autoreconf debhelper sequence.
   * Warn about files that aren't installed in any package.
+  * Respect the CFLAGS/CXXFLAGS environment variables in the autoconf script.
+    - Add 03_respect_build_flags_from_env.patch.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 17 Jul 2010 15:53:31 +0200
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 17 Jul 2010 16:01:47 +0200
 
 wormux (1:0.8.5-1) unstable; urgency=low
 
diff --git a/debian/patches/03_respect_build_flags_from_env.patch b/debian/patches/03_respect_build_flags_from_env.patch
new file mode 100644
index 0000000..b869250
--- /dev/null
+++ b/debian/patches/03_respect_build_flags_from_env.patch
@@ -0,0 +1,26 @@
+Description: Don't reset CFLAGS/CXXFLAGS but use the environment variables.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+--- wormux-0.9.2.1.orig/configure.ac
++++ wormux-0.9.2.1/configure.ac
+@@ -51,7 +51,6 @@ dnl ====================================
+ dnl === Options for users                                                   =
+ dnl =========================================================================
+ 
+-AX_CFLAGS_WARN_ALL([CXXFLAGS])
+ 
+ AC_ARG_ENABLE([servers],
+               [AS_HELP_STRING([--enable-servers],
+@@ -195,12 +195,6 @@ if test "x$GCC" = "xyes"; then
+     GCC_FLAGS="$GCC_FLAGS -DWMX_LOG"
+   fi
+ 
+-  dnl Ignore default options set by autoconf
+-  dnl CFLAGS="$CFLAGS $GCC_FLAGS"
+-  CFLAGS="$GCC_FLAGS"
+-  dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS"
+-  CXXFLAGS="$GCC_FLAGS"
+-
+ else
+   if test "x${debug}" = "xyes"; then
+     CFLAGS="$CFLAGS -DDEBUG"
diff --git a/debian/patches/series b/debian/patches/series
index e2d8282..060ca0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_dont_remove_stamp_po.patch
 02_desktop_file.patch
+03_respect_build_flags_from_env.patch
diff --git a/debian/rules b/debian/rules
index 1e5a2ef..5cff36d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+CXXFLAGS += -Wall -Wextra
+
 %:
 	dh --parallel --with autoreconf $@
 

-- 
Wormux PKG