diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-27 13:56:53 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-04-28 09:17:21 +0000 |
| commit | ffb6a77fc4f0533126a3ff49ec5c03ef8e674520 (patch) | |
| tree | a2697a941141c6d55a11df8fbfee7275f3ef3a9c /configure.ac | |
| parent | 121d248c1da7f2130a2edde6d158f116c89ed407 (diff) | |
Drop handrolled or #ifdef'ed libc replacements
mempcpy, memrchr, rawmemchr, and argp are provided by gnulib now. We
don't need to define them locally and we don't need to search for an
external libargp.
Change-Id: I131ca4bc2d77c597b99c296c28259a3600e5d1b5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index a5aea7fc..a48b13ea 100644 --- a/configure.ac +++ b/configure.ac @@ -290,13 +290,7 @@ zip_LIBS="$LIBS" LIBS="$save_LIBS" AC_SUBST([zip_LIBS]) -AC_CHECK_DECLS([memrchr, rawmemchr],[],[], - [#define _GNU_SOURCE - #include <string.h>]) AC_CHECK_DECLS([powerof2],[],[],[#include <sys/param.h>]) -AC_CHECK_DECLS([mempcpy],[],[], - [#define _GNU_SOURCE - #include <string.h>]) AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])]) @@ -369,31 +363,6 @@ CFLAGS="$old_CFLAGS"]) AM_CONDITIONAL(HAVE_IMPLICIT_FALLTHROUGH_WARNING, [test "x$ac_cv_implicit_fallthrough" != "xno"]) -dnl Check if we have argp available from our libc -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [#include <argp.h>], - [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,&argv,0,0,0); return 0;] - )], - [libc_has_argp="true"], - [libc_has_argp="false"] -) - -dnl If our libc doesn't provide argp, then test for libargp -if test "$libc_has_argp" = "false" ; then - AC_MSG_WARN("libc does not have argp") - AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) - - if test "$have_argp" = "false"; then - AC_MSG_ERROR("no libargp found") - else - argp_LDADD="-largp" - fi -else - argp_LDADD="" -fi -AC_SUBST([argp_LDADD]) - dnl Check if we have <linux/bpf.h> for EM_BPF disassembly. AC_CHECK_HEADERS(linux/bpf.h) AM_CONDITIONAL(HAVE_LINUX_BPF_H, [test "x$ac_cv_header_linux_bpf_h" = "xyes"]) |