summaryrefslogtreecommitdiff
path: root/gnulib-local/m4
diff options
context:
space:
mode:
Diffstat (limited to 'gnulib-local/m4')
-rw-r--r--gnulib-local/m4/alloca.m42
-rw-r--r--gnulib-local/m4/backupfile.m42
-rw-r--r--gnulib-local/m4/curses.m42
-rw-r--r--gnulib-local/m4/gcj.m42
-rw-r--r--gnulib-local/m4/hard-locale.m4.diff16
-rw-r--r--gnulib-local/m4/java.m42
-rw-r--r--gnulib-local/m4/libcroco.m42
-rw-r--r--gnulib-local/m4/libglib.m42
-rw-r--r--gnulib-local/m4/libxml.m420
-rw-r--r--gnulib-local/m4/moo.m42
-rw-r--r--gnulib-local/m4/term-ostream.m42
-rw-r--r--gnulib-local/m4/termcap.m42
-rw-r--r--gnulib-local/m4/terminfo.m42
-rw-r--r--gnulib-local/m4/unionwait.m42
14 files changed, 28 insertions, 32 deletions
diff --git a/gnulib-local/m4/alloca.m4 b/gnulib-local/m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gnulib-local/m4/alloca.m4
+++ b/gnulib-local/m4/alloca.m4
@@ -1,5 +1,5 @@
# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/backupfile.m4 b/gnulib-local/m4/backupfile.m4
index febc532..5e88347 100644
--- a/gnulib-local/m4/backupfile.m4
+++ b/gnulib-local/m4/backupfile.m4
@@ -1,5 +1,5 @@
# backupfile.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/curses.m4 b/gnulib-local/m4/curses.m4
index 9de43d2..38edc30 100644
--- a/gnulib-local/m4/curses.m4
+++ b/gnulib-local/m4/curses.m4
@@ -1,5 +1,5 @@
# curses.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/gcj.m4 b/gnulib-local/m4/gcj.m4
index 021bc7c..521ee7d 100644
--- a/gnulib-local/m4/gcj.m4
+++ b/gnulib-local/m4/gcj.m4
@@ -1,5 +1,5 @@
# gcj.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2002, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff
deleted file mode 100644
index 1071d48..0000000
--- a/gnulib-local/m4/hard-locale.m4.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-*** gnulib/m4/hard-locale.m4 2005-03-21 23:06:27.000000000 +0100
---- gettext-tools/m4/hard-locale.m4 2005-03-09 00:49:02.000000000 +0100
-***************
-*** 5,11 ****
- dnl with or without modifications, as long as this notice is preserved.
-
- dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE],
-! [
-! AC_LIBOBJ([hard-locale])
-! ])
---- 5,8 ----
- dnl with or without modifications, as long as this notice is preserved.
-
- dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE], [:])
diff --git a/gnulib-local/m4/java.m4 b/gnulib-local/m4/java.m4
index 3285dd5..9888af1 100644
--- a/gnulib-local/m4/java.m4
+++ b/gnulib-local/m4/java.m4
@@ -1,5 +1,5 @@
# java.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4
index 859080c..f79ea82 100644
--- a/gnulib-local/m4/libcroco.m4
+++ b/gnulib-local/m4/libcroco.m4
@@ -1,5 +1,5 @@
# libcroco.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4
index f0df4ce..42e55e6 100644
--- a/gnulib-local/m4/libglib.m4
+++ b/gnulib-local/m4/libglib.m4
@@ -1,5 +1,5 @@
# libglib.m4 serial 3 (gettext-0.17)
-dnl Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
index fa8e8e7..480c700 100644
--- a/gnulib-local/m4/libxml.m4
+++ b/gnulib-local/m4/libxml.m4
@@ -1,5 +1,5 @@
# libxml.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2006, 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -44,8 +44,12 @@ AC_DEFUN([gl_LIBXML],
LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
+ #include <libxml/xpath.h>
],
- [xmlCheckVersion (0); xmlFree ((void *) 0);],
+ [xmlCheckVersion (0);
+ xmlFree ((void *) 0);
+ xmlXPathSetContextNode ((void *)0, (void *)0);
+ ],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -55,8 +59,12 @@ AC_DEFUN([gl_LIBXML],
CPPFLAGS="$CPPFLAGS $INCXML2"
AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
+ #include <libxml/xpath.h>
],
- [xmlCheckVersion (0); xmlFree ((void *) 0);],
+ [xmlCheckVersion (0);
+ xmlFree ((void *) 0);
+ xmlXPathSetContextNode ((void *)0, (void *)0);
+ ],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -82,8 +90,12 @@ AC_DEFUN([gl_LIBXML],
CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
+ #include <libxml/xpath.h>
],
- [xmlCheckVersion (0); xmlFree ((void *) 0);],
+ [xmlCheckVersion (0);
+ xmlFree ((void *) 0);
+ xmlXPathSetContextNode ((void *)0, (void *)0);
+ ],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff --git a/gnulib-local/m4/moo.m4 b/gnulib-local/m4/moo.m4
index 3bda672..88e66a9 100644
--- a/gnulib-local/m4/moo.m4
+++ b/gnulib-local/m4/moo.m4
@@ -1,5 +1,5 @@
# moo.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/term-ostream.m4 b/gnulib-local/m4/term-ostream.m4
index c227384..bcc931e 100644
--- a/gnulib-local/m4/term-ostream.m4
+++ b/gnulib-local/m4/term-ostream.m4
@@ -1,5 +1,5 @@
# term-ostream.m4 serial 1
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/termcap.m4 b/gnulib-local/m4/termcap.m4
index 1ab0673..93511d9 100644
--- a/gnulib-local/m4/termcap.m4
+++ b/gnulib-local/m4/termcap.m4
@@ -1,5 +1,5 @@
# termcap.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 2015-2016 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/terminfo.m4 b/gnulib-local/m4/terminfo.m4
index 070e86e..8257e25 100644
--- a/gnulib-local/m4/terminfo.m4
+++ b/gnulib-local/m4/terminfo.m4
@@ -1,5 +1,5 @@
# terminfo.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 2015-2016 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/unionwait.m4 b/gnulib-local/m4/unionwait.m4
index 4ec7bf3..95199f3 100644
--- a/gnulib-local/m4/unionwait.m4
+++ b/gnulib-local/m4/unionwait.m4
@@ -1,5 +1,5 @@
# unionwait.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1993-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2002, 2015-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
View Lorry Controller Status