oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Actually capture libcrypto autoconf results

Browse Source 
Also infer lib path not just include path, and set rpath if not from /usr.
Also need libcrypto for test_rand.
This commit is contained in:
Viktor Dukhovni
2016-05-07 02:36:34 -04:00
parent 131c8dd30e
commit 9393d53538
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cf/Makefile.am.common
View File

@@ -45,6 +45,9 @@ LIB_tgetent = @LIB_tgetent@
LIB_com_err = @LIB_com_err@ LIB_com_err = @LIB_com_err@
LIB_door_create = @LIB_door_create@ LIB_door_create = @LIB_door_create@
LIB_openssl_crypto = @LIB_openssl_crypto@
INCLUDE_openssl_crypto = @INCLUDE_openssl_crypto@
HESIODLIB = @HESIODLIB@ HESIODLIB = @HESIODLIB@
HESIODINCLUDE = @HESIODINCLUDE@ HESIODINCLUDE = @HESIODINCLUDE@
INCLUDE_hesiod = @INCLUDE_hesiod@ INCLUDE_hesiod = @INCLUDE_hesiod@

7
cf/crypto.m4
View File

@@ -94,6 +94,8 @@ if test "$with_openssl" = "yes"; then
with_openssl=/usr with_openssl=/usr
fi fi
if test "$with_openssl" != "no"; then if test "$with_openssl" != "no"; then
saved_CFLAGS="${CFLAGS}"
saved_LDFLAGS="${LDFLAGS}"
INCLUDE_openssl_crypto= INCLUDE_openssl_crypto=
LIB_openssl_crypto= LIB_openssl_crypto=
if test "$with_openssl_include" != ""; then if test "$with_openssl_include" != ""; then
@@ -103,8 +105,11 @@ if test "$with_openssl" != "no"; then
fi fi
if test "$with_openssl_lib" != ""; then if test "$with_openssl_lib" != ""; then
LIB_openssl_crypto="-L${with_openssl_lib}" LIB_openssl_crypto="-L${with_openssl_lib}"
elif test "${with_openssl}" != "/usr" -a -d "${with_openssl}/lib"; then
LIB_openssl_crypto="-L${with_openssl}/lib -Wl,-R,${with_openssl}/lib"
fi fi
CFLAGS="-DHAVE_HCRYPTO_W_OPENSSL -I${INCLUDE_openssl_crypto} ${CFLAGS}" CFLAGS="-DHAVE_HCRYPTO_W_OPENSSL -I${INCLUDE_openssl_crypto} ${CFLAGS}"
LDFLAGS="${LIB_openssl_crypto} ${LDFLAGS}"
# XXX What about rpath? Yeah... # XXX What about rpath? Yeah...
AC_CHECK_LIB([crypto], [OPENSSL_init], AC_CHECK_LIB([crypto], [OPENSSL_init],
[LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto"; openssl=yes], [openssl=no], []) [LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto"; openssl=yes], [openssl=no], [])
@@ -122,6 +127,8 @@ if test "$with_openssl" != "no"; then
AC_CHECK_LIB([crypto], [OPENSSL_init], AC_CHECK_LIB([crypto], [OPENSSL_init],
[LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto -ldl -lnsl -lsocket"; openssl=yes], [openssl=no], [-ldl -lnsl -lsocket]) [LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto -ldl -lnsl -lsocket"; openssl=yes], [openssl=no], [-ldl -lnsl -lsocket])
fi fi
CFLAGS="${saved_CFLAGS}"
LDFLAGS="${saved_LDFLAGS}"
fi fi
LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la' LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la'

2
lib/hcrypto/Makefile.am
View File

@@ -99,7 +99,7 @@ check_SCRIPTS = $(SCRIPT_TESTS)
TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS) TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS)
LDADD = $(lib_LTLIBRARIES) $(LIB_roken) LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto)
test_rand_LDADD = $(LDADD) -lm test_rand_LDADD = $(LDADD) -lm
libhcrypto_la_SOURCES = \ libhcrypto_la_SOURCES = \