summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch')
-rw-r--r--meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch b/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch
deleted file mode 100644
index 6861f2110..000000000
--- a/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 93dbd3319232613ff8f5f3f08bf5f57b21980ef1 Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier at gentoo.org>
3Date: Thu, 18 Nov 2010 17:14:21 -0500
4Subject: [PATCH gnulib] argp: fix program_invocation_name detection
5
6The current program_invocation_name symbol detection fails if the argp.h
7header is missing. So check for the header first before detecting if the
8symbol exists.
9
10Signed-off-by: Mike Frysinger <vapier at gentoo.org>
11---
12 m4/argp.m4 | 15 +++++++++++++--
13 1 files changed, 13 insertions(+), 2 deletions(-)
14
15diff --git a/m4/argp.m4 b/m4/argp.m4
16index d3ca5ba..efa562c 100644
17--- a/m4/argp.m4
18+++ b/m4/argp.m4
19@@ -31,8 +31,14 @@ AC_DEFUN([gl_ARGP],
20 # are defined elsewhere. It is improbable that only one of them will
21 # be defined and other not, I prefer to stay on the safe side and to
22 # test each one separately.
23+ AC_CHECK_HEADERS_ONCE([argp.h])
24 AC_MSG_CHECKING([whether program_invocation_name is defined])
25- AC_TRY_LINK([#include <argp.h>],
26+ AC_TRY_LINK([
27+#include <errno.h>
28+#ifdef HAVE_ARGP_H
29+# include <argp.h>
30+#endif
31+],
32 [ program_invocation_name = "test"; ],
33 [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], [1],
34 [Define if program_invocation_name is defined])
35@@ -40,7 +46,12 @@ AC_DEFUN([gl_ARGP],
36 [ AC_MSG_RESULT([no])] )
37
38 AC_MSG_CHECKING([whether program_invocation_short_name is defined])
39- AC_TRY_LINK([#include <argp.h>],
40+ AC_TRY_LINK([
41+#include <errno.h>
42+#ifdef HAVE_ARGP_H
43+# include <argp.h>
44+#endif
45+],
46 [ program_invocation_short_name = "test"; ],
47 [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
48 [Define if program_invocation_short_name is defined])
49--
501.7.3.2
51