fixed building from source tith openssl

diff --git a/configure.ac b/configure.ac
index 6cf2bfc3475c8a893ccb8f5de9ca35a1f4045c97..eb2c00a181af61ff8d3bc0abaaa09dbaf25a4dfb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -605,8 +605,11 @@ AC_ARG_WITH([gtest],
                             [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
         [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
 
-AC_ARG_WITH(lcov,
-[  --with-lcov[=PROGRAM]         enable gtest and coverage target using the specified lcov], lcov="$withval", lcov="no")
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov=PROGRAM],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
 
 USE_LCOV="no"
 if test "$lcov" != "no"; then

diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index fe91b1f93913742dfce08d1a0ad246952e82c486..686fea094ede89af45757d180ad089f936fcc3a0 100644 (file)
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -408,7 +408,7 @@ else
    if test "${use_openssl}" = "/usr" ; then
       CRYPTO_CFLAGS=""
       CRYPTO_INCLUDES=""
-      CRYPTO_LIBS="-lcrypto"
+      CRYPTO_LIBS="-lcrypto -lssl"
       DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl"
    else
       CRYPTO_CFLAGS=""
@@ -416,20 +416,20 @@ else
       DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}"
       case $host in
           *-solaris*)
-              CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto"
+              CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto -lssl"
               ;;
           *-hp-hpux*)
-              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto"
+              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto -lssl"
               ;;
           *-apple-darwin*)
               if test -f "${use_openssl}/lib/libcrypto.dylib" ; then
-                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
+                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
               else
                  CRYPTO_LIBS="${use_openssl}/lib/libcrypto.a"
               fi
               ;;
           *)
-              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
+              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
               ;;
       esac
     fi