Attachment 139167 Details for Bug 106278 – build: Make NSS (and URU4000) driver optional

[patch] build: Make NSS (and URU4000) driver optional

build-Make-NSS-and-URU4000-driver-optional.patch (text/plain), 1.43 KB, created by Bastien Nocera on 2018-04-27 12:09:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2018-04-27 12:09:43 UTC

Size: 1.43 KB

patch

obsolete

>From 06516e6ee7bce1f03f869c676ad9e6caee0b968c Mon Sep 17 00:00:00 2001
>From: Bastien Nocera <hadess@hadess.net>
>Date: Fri, 27 Apr 2018 14:07:20 +0200
>Subject: [PATCH] build: Make NSS (and URU4000) driver optional
>
>In case NSS isn't available.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106278
>---
> configure.ac | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index bc38434..ad88a30 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -29,6 +29,7 @@ require_imaging='no'
> require_aeslib='no'
> require_aesX660='no'
> require_aes3k='no'
>+require_nss='no'
> enable_upeke2='no'
> enable_upekts='no'
> enable_upektc='no'
>@@ -81,6 +82,7 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
> 		uru4000)
> 			AC_DEFINE([ENABLE_URU4000], [], [Build Digital Persona U.are.U 4000 driver])
> 			enable_uru4000="yes"
>+			require_nss="yes"
> 		;;
> 		fdu2000)
> 			AC_DEFINE([ENABLE_FDU2000], [], [Build Secugen FDU 2000 driver])
>@@ -193,8 +195,13 @@ PKG_CHECK_MODULES(LIBUSB, [libusb-1.0 >= 0.9.1])
> AC_SUBST(LIBUSB_CFLAGS)
> AC_SUBST(LIBUSB_LIBS)
> 
>-# check for OpenSSL's libcrypto
>-PKG_CHECK_MODULES(CRYPTO, nss)
>+if test "$require_nss" = "yes"; then
>+	# check for NSS
>+	PKG_CHECK_MODULES(CRYPTO, nss, [nss_found=yes], [nss_found=no])
>+	if test "$nss_found" != "yes"; then
>+		AC_MSG_ERROR([NSS is required for the URU4000/URU4500 driver])
>+	fi
>+fi
> AC_SUBST(CRYPTO_CFLAGS)
> AC_SUBST(CRYPTO_LIBS)
> 
>-- 
>2.17.0

Actions: View | Splinter Review

Attachments on bug 106278: 139167

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.