]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: include errno.h instead of argp.h
authorChen Qi <Qi.Chen@windriver.com>
Mon, 31 Aug 2015 08:23:45 +0000 (16:23 +0800)
committerKarel Zak <kzak@redhat.com>
Mon, 31 Aug 2015 09:27:45 +0000 (11:27 +0200)
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>
configure.ac

index 547393c17cbb4e9fcc6d8c2e55070fb3db3f2b1d..43ea7169cf5142164ab00a8df5946673d00111a1 100644 (file)
@@ -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";
 ]])], [