blob: fb04130a0a85a2502121fd390675d2641b228797 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- ucommon-6.3.1/configure.ac
+++ ucommon-6.3.1/configure.ac
@@ -38,8 +38,12 @@
OPENSSL_LINK=""
MODULE_FLAGS="-module -shared -avoid-version"
+AM_SILENT_RULES([yes])
+
CHECKFLAGS="$CHECKFLAGS"
+m4_include([m4/libgcrypt.m4])
+
case "$with_crypto" in
ssl|openssl)
ssl="openssl"
@@ -598,7 +602,8 @@
;;
gnutls|gnu)
if test ! -z "$GNUTLS_LIBS" ; then
- SECURE_LIBS="$GNUTLS_LIBS"
+ AM_PATH_LIBGCRYPT
+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
SECURE="gnutls"
fi
;;
--- ucommon-6.3.1/utils/Makefile.am
+++ ucommon-6.3.1/utils/Makefile.am
@@ -10,9 +10,9 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
MAINTAINERCLEANFILES = Makefile.in Makefile
-AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/inc
-LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@
+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@
EXTRA_DIST = *.1 CMakeLists.txt
man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
@@ -21,7 +21,7 @@
noinst_PROGRAMS = demoSSL
demoSSL_SOURCES = ssl.cpp
-demoSSL_LDFLAGS = @SECURE_LOCAL@
+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
args_SOURCES = args.cpp
|
GitWeb
