From: Eric Blake <eblake@redhat.com>
Date: Thu, 7 Jun 2012 16:48:05 +0000 (-0600)
Subject: maint: make it easier to copy FORTIFY_SOURCE snippet
X-Git-Tag: v0.9.13-rc1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c2edf0fbd4d20b3955cd5a3d8986413e94fba51;p=thirdparty%2Flibvirt.git

maint: make it easier to copy FORTIFY_SOURCE snippet

While libvirt intentionally avoids -Wundef (after all, C99
guarantees sane semantics of treating undefined macros as 0),
the glibc insanity of #warning on _FORTIFY_SOURCE coupled with
what some people feel is the black magic of autoconf means
that other projects are likely to copy our snippet verbatim.
We can be nicer to other projects by making it easier to
integrate into projects that use -Wundef.

Suggested by Christophe Fergeau.

* m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Be nice
to other projects using -Wundef.
---

diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
index a91d69f463..18170474d7 100644
--- a/m4/virt-compile-warnings.m4
+++ b/m4/virt-compile-warnings.m4
@@ -103,8 +103,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     AC_DEFINE([lint], [1],
       [Define to 1 if the compiler is checking for lint.])
     AH_VERBATIM([FORTIFY_SOURCE],
-    [/* Enable compile-time and run-time bounds-checking, and some warnings. */
-     #if __OPTIMIZE__
+    [/* Enable compile-time and run-time bounds-checking, and some warnings,
+        without upsetting newer glibc. */
+     #if defined __OPTIMIZE__ && __OPTIMIZE__
      # define _FORTIFY_SOURCE 2
      #endif
     ])