1.1 --- a/autogen.sh	Wed Aug 20 18:56:17 2014 +0100
     1.2 +++ b/autogen.sh	Wed Aug 20 18:57:52 2014 +0100
     1.3 @@ -20,7 +20,7 @@
     1.4    DIE=1
     1.5  }
     1.6  
     1.7 -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
     1.8 +(grep "^LT_INIT\|^A[MC]_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
     1.9    (libtool --version) < /dev/null > /dev/null 2>&1 || {
    1.10      echo
    1.11      echo "**Error**: You must have libtool installed."
    1.12 @@ -76,7 +76,7 @@
    1.13  
    1.14        aclocalinclude="-I gl/m4 $ACLOCAL_FLAGS"
    1.15  
    1.16 -      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
    1.17 +      if grep "^LT_INIT\|^A[MC]_PROG_LIBTOOL" configure.ac >/dev/null; then
    1.18  	if test -z "$NO_LIBTOOLIZE" ; then 
    1.19  	  echo "Running libtoolize..."
    1.20  	  libtoolize --force --copy

     2.1 --- a/gl/.gitignore	Wed Aug 20 18:56:17 2014 +0100
     2.2 +++ b/gl/.gitignore	Wed Aug 20 18:57:52 2014 +0100
     2.3 @@ -64,3 +64,13 @@
     2.4  /sys_time.in.h
     2.5  /tempname.c
     2.6  /tempname.h
     2.7 +/fcntl.in.h
     2.8 +/msvc-inval.c
     2.9 +/msvc-inval.h
    2.10 +/msvc-nothrow.c
    2.11 +/msvc-nothrow.h
    2.12 +/pathmax.h
    2.13 +/secure_getenv.c
    2.14 +/sys_types.in.h
    2.15 +/unistd.c
    2.16 +/wctype-h.c

     3.1 --- a/gl/m4/.gitignore	Wed Aug 20 18:56:17 2014 +0100
     3.2 +++ b/gl/m4/.gitignore	Wed Aug 20 18:57:52 2014 +0100
     3.3 @@ -60,3 +60,14 @@
     3.4  /stat.m4
     3.5  /sys_time_h.m4
     3.6  /tempname.m4
     3.7 +/absolute-header.m4
     3.8 +/extern-inline.m4
     3.9 +/fcntl_h.m4
    3.10 +/msvc-inval.m4
    3.11 +/msvc-nothrow.m4
    3.12 +/off_t.m4
    3.13 +/pathmax.m4
    3.14 +/secure_getenv.m4
    3.15 +/ssize_t.m4
    3.16 +/sys_socket_h.m4
    3.17 +/sys_types_h.m4

     4.1 --- a/gl/m4/gnulib-cache.m4	Wed Aug 20 18:56:17 2014 +0100
     4.2 +++ b/gl/m4/gnulib-cache.m4	Wed Aug 20 18:57:52 2014 +0100
     4.3 @@ -1,9 +1,21 @@
     4.4 -# Copyright (C) 2002-2011 Free Software Foundation, Inc.
     4.5 +# Copyright (C) 2002-2014 Free Software Foundation, Inc.
     4.6  #
     4.7 -# This file is free software, distributed under the terms of the GNU
     4.8 -# General Public License.  As a special exception to the GNU General
     4.9 -# Public License, this file may be distributed as part of a program
    4.10 -# that contains a configuration script generated by Autoconf, under
    4.11 +# This file is free software; you can redistribute it and/or modify
    4.12 +# it under the terms of the GNU General Public License as published by
    4.13 +# the Free Software Foundation; either version 3 of the License, or
    4.14 +# (at your option) any later version.
    4.15 +#
    4.16 +# This file is distributed in the hope that it will be useful,
    4.17 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    4.18 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    4.19 +# GNU General Public License for more details.
    4.20 +#
    4.21 +# You should have received a copy of the GNU General Public License
    4.22 +# along with this file.  If not, see <http://www.gnu.org/licenses/>.
    4.23 +#
    4.24 +# As a special exception to the GNU General Public License,
    4.25 +# this file may be distributed as part of a program that
    4.26 +# contains a configuration script generated by Autoconf, under
    4.27  # the same distribution terms as the rest of that program.
    4.28  #
    4.29  # Generated by gnulib-tool.
    4.30 @@ -37,4 +49,4 @@
    4.31  gl_LIBTOOL
    4.32  gl_MACRO_PREFIX([gl])
    4.33  gl_PO_DOMAIN([])
    4.34 -gl_WITNESS_C_DOMAIN([])
    4.35 +gl_WITNESS_C_MACRO([])

     5.1 --- a/librazor/importer.c	Wed Aug 20 18:56:17 2014 +0100
     5.2 +++ b/librazor/importer.c	Wed Aug 20 18:57:52 2014 +0100
     5.3 @@ -20,6 +20,7 @@
     5.4  
     5.5  #define _GNU_SOURCE
     5.6  
     5.7 +#include "config.h"
     5.8  #include <string.h>
     5.9  #include "razor-internal.h"
    5.10  #include "razor.h"

     6.1 --- a/librazor/iterator.c	Wed Aug 20 18:56:17 2014 +0100
     6.2 +++ b/librazor/iterator.c	Wed Aug 20 18:57:52 2014 +0100
     6.3 @@ -20,6 +20,7 @@
     6.4  
     6.5  #define _GNU_SOURCE
     6.6  
     6.7 +#include "config.h"
     6.8  #include <stdarg.h>
     6.9  #include <string.h>
    6.10  #include <assert.h>

     7.1 --- a/librazor/merger.c	Wed Aug 20 18:56:17 2014 +0100
     7.2 +++ b/librazor/merger.c	Wed Aug 20 18:57:52 2014 +0100
     7.3 @@ -18,6 +18,7 @@
     7.4   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     7.5   */
     7.6  
     7.7 +#include "config.h"
     7.8  #include <string.h>
     7.9  #include <assert.h>
    7.10  #include "razor-internal.h"

     8.1 --- a/librazor/transaction.c	Wed Aug 20 18:56:17 2014 +0100
     8.2 +++ b/librazor/transaction.c	Wed Aug 20 18:57:52 2014 +0100
     8.3 @@ -20,6 +20,7 @@
     8.4  
     8.5  #define _GNU_SOURCE
     8.6  
     8.7 +#include "config.h"
     8.8  #include <stdlib.h>
     8.9  #include <stddef.h>
    8.10  #include <stdint.h>

     9.1 --- a/src/import-rpmdb.c	Wed Aug 20 18:56:17 2014 +0100
     9.2 +++ b/src/import-rpmdb.c	Wed Aug 20 18:57:52 2014 +0100
     9.3 @@ -18,6 +18,7 @@
     9.4   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     9.5   */
     9.6  
     9.7 +#include "config.h"
     9.8  #include <stdio.h>
     9.9  #include <stddef.h>
    9.10  #include <string.h>

    10.1 --- a/src/import-yum.c	Wed Aug 20 18:56:17 2014 +0100
    10.2 +++ b/src/import-yum.c	Wed Aug 20 18:57:52 2014 +0100
    10.3 @@ -19,6 +19,7 @@
    10.4  
    10.5  #define _GNU_SOURCE
    10.6  
    10.7 +#include "config.h"
    10.8  #include <string.h>
    10.9  #include <stdio.h>
   10.10  #include <stdint.h>