From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 31 Aug 2015 08:23:45 +0000 (+0800)
Subject: build-sys: include errno.h instead of argp.h
X-Git-Tag: v2.27~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37edac9a0ca83f311279d2e49bacd6ac80310dc8;p=thirdparty%2Futil-linux.git

build-sys: include errno.h instead of argp.h

configure should include errno.h instead of argp.h when
checking for presence of program_invocation_short_name
uclibc defines this to be const char* unlike util-linux-ng
which defines this to be char* so this error goes unnoticed
on glibc/eglibc systems.

here is the error it fixes

in file included from mountP.h:14:0,
                 from cache.c:29:
/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname'
../../../include/c.h:118:14: note: previous declaration of '__progname' was here
make[3]: *** [cache.lo] Error 1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index 547393c17c..43ea7169cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,7 @@ AS_CASE([$have_dirfd:$have_ddfd],
 
 AC_MSG_CHECKING([whether program_invocation_short_name is defined])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-	#include <argp.h>
+	#include <errno.h>
 ]], [[
 	program_invocation_short_name = "test";
 ]])], [