From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm579-0005Au-Vw for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm574-0006nk-Ev for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:23 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:37867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm574-0006nf-AF for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:18 -0500 Received: by mail-ie0-f181.google.com with SMTP id 16so6490730iea.12 for ; Fri, 21 Dec 2012 08:06:17 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 21 Dec 2012 17:05:29 +0100 Message-Id: <1356105948-13216-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> References: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/27] libcacard: require libtool to build it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Do not fail at build time, instead just disable the library if libtool is not present. Signed-off-by: Paolo Bonzini --- Makefile | 2 ++ configure | 3 ++- libcacard/Makefile | 8 -------- rules.mak | 6 +----- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 52759c1..68e3a83 100644 --- a/Makefile +++ b/Makefile @@ -157,12 +157,14 @@ libqemustub.a: $(stub-obj-y) ###################################################################### # Support building shared library libcacard +ifeq ($(CONFIG_SMARTCARD_NSS),y) .PHONY: libcacard.la install-libcacard libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,) install-libcacard: libcacard.la $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) +endif ###################################################################### diff --git a/configure b/configure index 2cdcfce..e3533e2 100755 --- a/configure +++ b/configure @@ -2782,7 +2782,8 @@ EOF if test "$werror" = "yes"; then test_cflags="-Werror $test_cflags" fi - if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ + if test -n "$libtool" && + $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ compile_prog "$test_cflags" "$libcacard_libs"; then smartcard_nss="yes" QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags" diff --git a/libcacard/Makefile b/libcacard/Makefile index 08a47e0..a526eae 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -31,13 +31,6 @@ all: libcacard.la libcacard.pc ######################################################################### # Rules for building libcacard standalone library -ifeq ($(LIBTOOL),) -libcacard.la: - @echo "libtool is missing, please install and rerun configure"; exit 1 - -install-libcacard: - @echo "libtool is missing, please install and rerun configure"; exit 1 -else libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) $(call quiet-command,$(LIBTOOL) --mode=link --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@") @@ -63,4 +56,3 @@ install-libcacard: libcacard.pc libcacard.la vscclient for inc in *.h; do \ $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ done -endif diff --git a/rules.mak b/rules.mak index 494fff8..c6a455d 100644 --- a/rules.mak +++ b/rules.mak @@ -21,11 +21,7 @@ QEMU_CFLAGS += -I$(