[src/trunk]: src/external/gpl2/gmake/dist gmake: Revert configure r1.2 and co...

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7b90d3c1a1ec
branches:  trunk
changeset: 832128:7b90d3c1a1ec
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue May 01 00:39:58 2018 +0000

description:
gmake: Revert configure r1.2 and configure.in r1.2.

> gmake: Apply patch to support GLIBC glob interface v2
>
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116
>
> Fix a build failure on Ubuntu 18.04.

Don't apply an imcompatible license patch.

diffstat:

 external/gpl2/gmake/dist/configure    |  3 ++-
 external/gpl2/gmake/dist/configure.in |  5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r ae91756a2a43 -r 7b90d3c1a1ec external/gpl2/gmake/dist/configure
--- a/external/gpl2/gmake/dist/configure        Tue May 01 00:36:57 2018 +0000
+++ b/external/gpl2/gmake/dist/configure        Tue May 01 00:39:58 2018 +0000
@@ -13619,9 +13619,10 @@
 #include <glob.h>
 #include <fnmatch.h>
 
+#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include <gnu-versions.h>
-# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
    gnu glob
 # endif
 #endif
diff -r ae91756a2a43 -r 7b90d3c1a1ec external/gpl2/gmake/dist/configure.in
--- a/external/gpl2/gmake/dist/configure.in     Tue May 01 00:36:57 2018 +0000
+++ b/external/gpl2/gmake/dist/configure.in     Tue May 01 00:39:58 2018 +0000
@@ -19,7 +19,7 @@
 AC_INIT([GNU make],[3.81],[bug-make%gnu.org@localhost])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.3 2018/05/01 00:39:58 nonaka Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -351,9 +351,10 @@
 #include <glob.h>
 #include <fnmatch.h>
 
+#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include <gnu-versions.h>
-# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
    gnu glob
 # endif
 #endif