configure: Use pkg-config to find OpenSSL

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index b045e49e3d83aaaffed9695bb3d8229b04ee7672..10cf0333ddbf61e22fb23b3ace61f3aeb4a01b48 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,11 +135,13 @@ EXTRA_DIST += src/libloc.sym
 src_libloc_la_CFLAGS = \
        $(AM_CFLAGS) \
        -DLIBLOC_PRIVATE \
-       -fvisibility=hidden
+       -fvisibility=hidden \
+       $(OPENSSL_CFLAGS)
 
 src_libloc_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBLOC_CURRENT):$(LIBLOC_REVISION):$(LIBLOC_AGE)
+       -version-info $(LIBLOC_CURRENT):$(LIBLOC_REVISION):$(LIBLOC_AGE) \
+       $(OPENSSL_LDFLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
 src_libloc_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/libloc.sym

diff --git a/configure.ac b/configure.ac
index f84cc9228f7f2cfd0edb21aaa0e549b6a22ae2cc..bd4d3d0230ba97f385693248b2c11d961d7e6af1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -257,10 +257,7 @@ RESOLV_LIBS="${LIBS}"
 AC_SUBST(RESOLV_LIBS)
 
 dnl Checking for OpenSSL
-LIBS=
-AC_CHECK_LIB(crypto, EVP_EncryptInit,, AC_MSG_ERROR([libcrypto has not been found]))
-OPENSSL_LIBS="${LIBS}"
-AC_SUBST(OPENSSL_LIBS)
+PKG_CHECK_MODULES([OPENSSL], [openssl])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([