[Xen-changelog] [xen-unstable] autoconf: add -Werror to libutil.h header check

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxx>
# Date 1349695109 -3600
# Node ID cdb48f1742f3274545fa377de1f592f04f2691da
# Parent  0995890022391682a2499a202c3c8608e1d3780a
autoconf: add -Werror to libutil.h header check

libutil.h is only needed on BSDs, but not in Linux. Debian package
libbsd-dev-0.3.0-1 installed a libutil.h overlay that contains a

Perform the libutil.h check with -Werror, so we don't include this
bogus header.

Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 099589002239 -r cdb48f1742f3 tools/configure
--- a/tools/configure   Mon Oct 08 11:45:36 2012 +0100
+++ b/tools/configure   Mon Oct 08 12:18:29 2012 +0100
@@ -6543,6 +6543,10 @@ fi
 
 
 
+
+    saved_CPPFLAGS="$CPPFLAGS"
+
+    CPPFLAGS="$CPPFLAGS -Werror"
     ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" 
"ac_cv_header_libutil_h" "$ac_includes_default"
 if test "x$ac_cv_header_libutil_h" = x""yes; then :
 
@@ -6553,6 +6557,9 @@ if test "x$ac_cv_header_libutil_h" = x""
 fi
 
 
+
+    CPPFLAGS="$saved_CPPFLAGS"
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5
 $as_echo_n "checking for openpty et al... " >&6; }
 if test "${ax_cv_ptyfuncs_libs+set}" = set; then :
diff -r 099589002239 -r cdb48f1742f3 tools/m4/ptyfuncs.m4
--- a/tools/m4/ptyfuncs.m4      Mon Oct 08 11:45:36 2012 +0100
+++ b/tools/m4/ptyfuncs.m4      Mon Oct 08 12:18:29 2012 +0100
@@ -1,7 +1,14 @@
 AC_DEFUN([AX_CHECK_PTYFUNCS], [
+    dnl This is a workaround for a bug in Debian package
+    dnl libbsd-dev-0.3.0-1. Once we no longer support that
+    dnl package we can remove the addition of -Werror to
+    dnl CPPFLAGS.
+    AX_SAVEVAR_SAVE(CPPFLAGS)
+    CPPFLAGS="$CPPFLAGS -Werror"
     AC_CHECK_HEADER([libutil.h],[
       AC_DEFINE([INCLUDE_LIBUTIL_H],[<libutil.h>],[libutil header file name])
     ])
+    AX_SAVEVAR_RESTORE(CPPFLAGS)
     AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [
         for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do
             if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog