From 89d994ad6b0e8ebe9a2cd4e0e37119ff4c917550 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Fri, 24 Jun 2011 12:24:44 -0600
Subject: [PATCH] build: update gnulib for intprops

Done as a separate commit to make backporting the next patch easier.
We are already using "intprops.h", but this makes it explicit.

* .gnulib: Update, for syntax-check fix.
* bootstrap.conf (gnulib_modules): Make intprops use explicit.
* src/locking/domain_lock.c (includes): Drop unused header.
* src/nwfilter/nwfilter_learnipaddr.c (includes): Use "", not <>,
for gnulib.
---
 .gnulib                             | 2 +-
 bootstrap.conf                      | 1 +
 src/locking/domain_lock.c           | 2 --
 src/nwfilter/nwfilter_learnipaddr.c | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gnulib b/.gnulib
index 478c2dcc83..cbfd25f0ed 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 478c2dcc839e5f4765e6417684ce414e2d4973a8
+Subproject commit cbfd25f0edf5f4b853e8ed2e01a4782ec80faba2
diff --git a/bootstrap.conf b/bootstrap.conf
index 769e57cd86..7b2cd608b4 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -46,6 +46,7 @@ gitlog-to-changelog
 gnumakefile
 ignore-value
 inet_pton
+intprops
 ioctl
 maintainer-makefile
 manywarnings
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index feb3f98387..56b535f2c5 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#include <intprops.h>
-
 #include "domain_lock.h"
 #include "memory.h"
 #include "uuid.h"
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index ce845ac7a8..cf818a2121 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -37,10 +37,10 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <net/if_arp.h>
-#include <intprops.h>
 
 #include "internal.h"
 
+#include "intprops.h"
 #include "buf.h"
 #include "memory.h"
 #include "logging.h"