Include -pthread in CFLAGS for ubuntu builds

diff --git a/lib/debian/changelog b/lib/debian/changelog
index 6a47219..f3aa55c 100644 (file)
--- a/lib/debian/changelog
+++ b/lib/debian/changelog
@@ -1,3 +1,9 @@
+libradsec (0.0.2+20110426-4) unstable; urgency=low
+
+  * Work around old oneiric dpkg-buildflags
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 19 Jan 2012 08:03:38 -0500
+
 libradsec (0.0.2+20110426-2) unstable; urgency=low
 
   * Include -threads in CFLAGS for ubuntu builds

diff --git a/lib/debian/rules b/lib/debian/rules
index 84901ea..040a730 100755 (executable)
--- a/lib/debian/rules
+++ b/lib/debian/rules
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_CFLAGS_MAINT_APPEND=-threads
-export DEB_CFLAGS_MAINT_APPEND
+# Directly append until we no longer need oneiric support
+# oneiric doesn't seem to work with this construction
+#DEB_CFLAGS_MAINT_APPEND=-pthread
+#export DEB_CFLAGS_MAINT_APPEND
 
 %:
        dh $@ 
 
 
 override_dh_auto_configure:
-       dh_auto_configure -- --enable-tls LDFLAGS='-Wl,-L/usr/lib/freeradius -Wl,--rpath=/usr/lib/freeradius' CFLAGS='$(shell dpkg-buildflags --get CFLAGS)'
+       dh_auto_configure -- --enable-tls LDFLAGS='-Wl,-L/usr/lib/freeradius -Wl,--rpath=/usr/lib/freeradius' CFLAGS='$(shell dpkg-buildflags --get CFLAGS) -pthread'