[libvirt] [libvirt-glib][PATCH] Don't redefine _FORTIFY_SOURCE macro

[Daniel P. Berrange]

On Tue, Jan 22, 2013 at 06:32:49PM +0100, Michal Privoznik wrote:
> If the _FORTIFY_SOURCE has been already defined, we unconditionally
> redefine it, leaving us with warning/error thrown at compilation time.
> ---
>  m4/virt-compile-warnings.m4 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
> index 99d214e..d07872a 100644
> --- a/m4/virt-compile-warnings.m4
> +++ b/m4/virt-compile-warnings.m4
> @@ -87,7 +87,7 @@ AC_DEFUN([LIBVIRT_GLIB_COMPILE_WARNINGS],[
>      AH_VERBATIM([FORTIFY_SOURCE],
>      [/* Enable compile-time and run-time bounds-checking, and some warnings,
>          without upsetting newer glibc. */
> -     #if defined __OPTIMIZE__ && __OPTIMIZE__
> +     #if defined __OPTIMIZE__ && __OPTIMIZE__ && !defined _FORTIFY_SOURCE
>       # define _FORTIFY_SOURCE 2
>       #endif
>      ])

ACK

Though I'd prefer if you checked in the same order as the same file
in libvirt. ie check !defined _FORTIFY_SOURCE first

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|