Re: [Xen-devel] [PATCH 2/2] configure: check for argp

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, Jun 19, 2015 at 10:58:25AM +0200, Roger Pau Monne wrote:
> argp is only present in the GNU C library, so add a specific check for it in
> configure. Also check if -largp is needed for linking against it.
> 
> Please run autoconf after applying.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> Cc: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> Cc: Olaf Hering <olaf@xxxxxxxxx>

Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>

> ---
>  config/Tools.mk.in      | 1 +
>  tools/configure.ac      | 4 ++++
>  tools/xentrace/Makefile | 2 +-
>  3 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index aef9ed6..9bd5f6c 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -78,5 +78,6 @@ CONFIG_GCRYPT       := @libgcrypt@
>  EXTFS_LIBS          := @EXTFS_LIBS@
>  CURSES_LIBS         := @CURSES_LIBS@
>  TINFO_LIBS          := @TINFO_LIBS@
> +ARGP_LDFLAGS        := @argp_ldflags@
>  
>  FILE_OFFSET_BITS    := @FILE_OFFSET_BITS@
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 1a06ddf..5eb4799 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -356,6 +356,10 @@ AC_CHECK_LIB([yajl], [yajl_alloc], [],
>  AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])
>  AC_CHECK_LIB([iconv], [libiconv_open], [libiconv="y"], [libiconv="n"])
>  AC_SUBST(libiconv)
> +AC_CHECK_HEADER([argp.h], [
> +AC_CHECK_LIB([argp], [argp_usage], [argp_ldflags="-largp"])
> +], [AC_MSG_ERROR([Could not find argp])])
> +AC_SUBST(argp_ldflags)
>  
>  # FDT is needed only on ARM
>  case "$host_cpu" in
> diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
> index 7d874a3..2f57bda 100644
> --- a/tools/xentrace/Makefile
> +++ b/tools/xentrace/Makefile
> @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
>  CFLAGS += -Werror
>  
>  CFLAGS += $(CFLAGS_libxenctrl)
> -LDLIBS += $(LDLIBS_libxenctrl)
> +LDLIBS += $(LDLIBS_libxenctrl) $(ARGP_LDFLAGS)
>  
>  BIN-$(CONFIG_X86) = xenalyze
>  BIN      = $(BIN-y)
> -- 
> 1.9.5 (Apple Git-50.3)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel