From 2a430ec434674ed8c1959698c061662bb7abc1a1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Nov 2014 17:23:18 +0100 Subject: [PATCH 1/3] configure: fix static link with openssl Use pkg-config to find openssl libraries, that will return all the dependent libraries of openssl as well (e.g. -lz) that can not be deduced in case of a static link. Signed-off-by: "Yann E. MORIN" --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 43a39d0d..ce8553e5 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,8 @@ with_os_type=`echo ${with_os_type} | tr '[[:upper:]]' '[[:lower:]]' ` AC_PROG_CC AC_PROG_INSTALL +PKG_PROG_PKG_CONFIG([0.9.0]) + # Checks for libraries. if test "x${with_os_type}" = xlinux; then AC_CHECK_LIB([rt],[clock_gettime], , AC_MSG_ERROR(librt needed)) @@ -52,8 +54,14 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl or --with-ssl=polarssl for encrypti AC_MSG_ERROR(choose either "openssl" or "polarssl" encryption) fi if test "x${with_ssl}" = xopenssl ; then - AC_CHECK_LIB([crypto], [MD5_Init], , AC_MSG_ERROR(libcrypto selected, but the library cannot be found!)) - AC_CHECK_LIB([ssl],[SSL_library_init], , AC_MSG_ERROR(openssl selected but the library cannot be found!)) + PKG_CHECK_MODULES( + [CRYPTO], [libcrypto], + [LIBS="${CRYPTO_LIBS} ${LIBS}" + AC_DEFINE([HAVE_LIBCRYPTO],[1],[Define to 1 if you have libcrypto])]) + PKG_CHECK_MODULES( + [SSL], [libssl], + [LIBS="${SSL_LIBS} ${LIBS}" + AC_DEFINE([HAVE_LIBSSL],[1],[Define to 1 if you have libssl])]) elif test "x${with_ssl}" = xpolarssl ; then AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL selected but the library cannot be found!)) else From e5a74a3ff08134a2b11f07bd850659d7816fb03d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Nov 2014 17:23:37 +0100 Subject: [PATCH 2/3] configure: fix static link with alsa Use pkg-config to find the alsa library, that will return all the dependent libraries of alsa (e.g. -ldl -lpthread -lrt) as well that can not be deduced in case of a static link. Signed-off-by: "Yann E. MORIN" --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ce8553e5..8a742887 100644 --- a/configure.ac +++ b/configure.ac @@ -99,7 +99,10 @@ AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (GNU/Linux onl HAS_ALSA=1 AM_CONDITIONAL([USE_ALSA], [test 0]) AC_DEFINE([CONFIG_ALSA], 1, [Needed by the compiler.]) - AC_CHECK_LIB([asound], [snd_pcm_open], , AC_MSG_ERROR(ALSA support requires the asound library!))], ) + PKG_CHECK_MODULES( + [ALSA], [alsa], + [LIBS="${ALSA_LIBS} ${LIBS}" + AC_DEFINE([HAVE_LIBASOUND],[1],[Define to 1 if you have ALSA])])]) AM_CONDITIONAL([USE_ALSA], [test "x$HAS_ALSA" = "x1"]) # Look for SNDIO flag From 1f759e57e8c0682613eaaf89a46fdf6db4c6b5cd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Nov 2014 17:24:02 +0100 Subject: [PATCH 3/3] configure: fix static link with popt Use pkg-config to find the popt library. Signed-off-by: "Yann E. MORIN" --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8a742887..2289efb5 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,10 @@ fi AC_CHECK_LIB([daemon],[daemon_log], , AC_MSG_ERROR(libdaemon needed)) AC_CHECK_LIB([pthread],[pthread_create], , AC_MSG_ERROR(pthread library needed)) AC_CHECK_LIB([m],[exp], , AC_MSG_ERROR(maths library needed)) -AC_CHECK_LIB([popt],[poptGetContext], , AC_MSG_ERROR(libpopt needed)) +PKG_CHECK_MODULES( + [POPT], [popt], + [LIBS="${POPT_LIBS} ${LIBS}" + AC_DEFINE([HAVE_LIBPOPT],[1],[Define to 1 if you have popt])]) # Look for piddir flag AC_ARG_WITH(piddir, [ --with-piddir= Specify a pathname to a directory in which to write the PID file.], [