Fix gcc-ism in python build (John Levon)

diff --git a/ChangeLog b/ChangeLog
index 849d74303fb2b884b7385267c0cf081ebe2278ff..814f905cead6266c4d174e65c4616855e68c44bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 18 12:18:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       Fix gcc-ism in python build (John Levon)
+       * acinclude.m4: Add -Wno-redundant-decls check for compiler
+       * python/Makefile.am: Remove hardcoded -Wno-redundant-decls
+
 Thu Dec 18 12:11:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/remote_internal.c: Don't free event after queueing it

diff --git a/acinclude.m4 b/acinclude.m4
index 0cfc1bc1e6d99ce47dae64c9106f87c1877f0811..e93ac2ad821bedc09c3dc7811ff29676e7bbe1a4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -87,6 +87,12 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
 
     WARN_CFLAGS="$compiler_flags $complCFLAGS"
     AC_SUBST(WARN_CFLAGS)
+
+    dnl Needed to keep compile quiet on python 2.4
+    COMPILER_FLAGS=
+    gl_COMPILER_FLAGS(-Wno-redundant-decls)
+    WARN_PYTHON_CFLAGS=$COMPILER_FLAGS
+    AC_SUBST(WARN_PYTHON_CFLAGS)
 ])
 
 

diff --git a/python/Makefile.am b/python/Makefile.am
index 90b87bb907db6f769ce9f47bdbc071b4fef82109..8d1462b3f0bbd4d9bb434bc3446636ede54626b8 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -34,8 +34,9 @@ all-local: libvirt.py
 python_LTLIBRARIES = libvirtmod.la
 
 libvirtmod_la_SOURCES = libvir.c types.c libvirt-py.c libvirt-py.h
-# Python header files contain a redundant decl, hence:
-libvirtmod_la_CFLAGS = -Wno-redundant-decls
+# Python <= 2.4 header files contain a redundant decl, hence we
+# need extra flags here
+libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@
 
 libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \
        @CYGWIN_EXTRA_LDFLAGS@