From: J. Ali Harlow <ali@juiblex.co.uk>
Date: Wed, 20 Aug 2014 17:46:38 +0000 (+0100)
Subject: Update gnulib
X-Git-Tag: 0.6~25
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=d3c1d8a278cd0c01f8e1dbcef368d41cf03a503c;p=razor.git

Update gnulib
---

diff --git a/autogen.sh b/autogen.sh
index c8448ad..9bbe3f0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,7 +20,7 @@ DIE=0
   DIE=1
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+(grep "^LT_INIT\|^A[MC]_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have libtool installed."
@@ -76,7 +76,7 @@ esac
 
       aclocalinclude="-I gl/m4 $ACLOCAL_FLAGS"
 
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+      if grep "^LT_INIT\|^A[MC]_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
diff --git a/gl/.gitignore b/gl/.gitignore
index f318b4c..4b5a26b 100644
--- a/gl/.gitignore
+++ b/gl/.gitignore
@@ -64,3 +64,13 @@
 /sys_time.in.h
 /tempname.c
 /tempname.h
+/fcntl.in.h
+/msvc-inval.c
+/msvc-inval.h
+/msvc-nothrow.c
+/msvc-nothrow.h
+/pathmax.h
+/secure_getenv.c
+/sys_types.in.h
+/unistd.c
+/wctype-h.c
diff --git a/gl/m4/.gitignore b/gl/m4/.gitignore
index 52cbceb..7ce22dd 100644
--- a/gl/m4/.gitignore
+++ b/gl/m4/.gitignore
@@ -60,3 +60,14 @@
 /stat.m4
 /sys_time_h.m4
 /tempname.m4
+/absolute-header.m4
+/extern-inline.m4
+/fcntl_h.m4
+/msvc-inval.m4
+/msvc-nothrow.m4
+/off_t.m4
+/pathmax.m4
+/secure_getenv.m4
+/ssize_t.m4
+/sys_socket_h.m4
+/sys_types_h.m4
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index dc90745..daed511 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,9 +1,21 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -37,4 +49,4 @@ gl_MAKEFILE_NAME([])
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])
diff --git a/librazor/importer.c b/librazor/importer.c
index e3956e0..7eeff31 100644
--- a/librazor/importer.c
+++ b/librazor/importer.c
@@ -20,6 +20,7 @@
 
 #define _GNU_SOURCE
 
+#include "config.h"
 #include <string.h>
 #include "razor-internal.h"
 #include "razor.h"
diff --git a/librazor/iterator.c b/librazor/iterator.c
index c50ae4f..1bf22e6 100644
--- a/librazor/iterator.c
+++ b/librazor/iterator.c
@@ -20,6 +20,7 @@
 
 #define _GNU_SOURCE
 
+#include "config.h"
 #include <stdarg.h>
 #include <string.h>
 #include <assert.h>
diff --git a/librazor/merger.c b/librazor/merger.c
index 4fcd36d..4038ac8 100644
--- a/librazor/merger.c
+++ b/librazor/merger.c
@@ -18,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include <string.h>
 #include <assert.h>
 #include "razor-internal.h"
diff --git a/librazor/transaction.c b/librazor/transaction.c
index ad73d1b..7879be9 100644
--- a/librazor/transaction.c
+++ b/librazor/transaction.c
@@ -20,6 +20,7 @@
 
 #define _GNU_SOURCE
 
+#include "config.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/import-rpmdb.c b/src/import-rpmdb.c
index 530c122..f1810d6 100644
--- a/src/import-rpmdb.c
+++ b/src/import-rpmdb.c
@@ -18,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/import-yum.c b/src/import-yum.c
index 017754b..fb07544 100644
--- a/src/import-yum.c
+++ b/src/import-yum.c
@@ -19,6 +19,7 @@
 
 #define _GNU_SOURCE
 
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>