Browse code

Save and restore the LIBS variable since autotools overwrites it

Shawn Webb authored on 2014/05/22 07:00:15
Showing 2 changed files
... ...
@@ -16701,6 +16701,9 @@ fi
16701 16701
 
16702 16702
 save_LDFLAGS="$LDFLAGS"
16703 16703
 save_CFLAGS="$CFLAGS"
16704
+save_LIBS="$LIBS"
16705
+
16706
+SSL_LIBS="-lssl -lcrypto"
16704 16707
 
16705 16708
 if test "$LIBSSL_HOME" != "/usr"; then
16706 16709
     SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
... ...
@@ -16712,8 +16715,6 @@ else
16712 16712
     SSL_CPPFLAGS=""
16713 16713
 fi
16714 16714
 
16715
-SSL_LIBS="-lssl -lcrypto"
16716
-
16717 16715
 have_ssl="no"
16718 16716
 have_crypto="no"
16719 16717
 
... ...
@@ -16853,6 +16854,7 @@ fi
16853 16853
 
16854 16854
 LDFLAGS="$save_LDFLAGS"
16855 16855
 CFLAGS="$save_CFLAGS"
16856
+LIBS="$save_LIBS"
16856 16857
 
16857 16858
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjson installation" >&5
16858 16859
 $as_echo_n "checking for libjson installation... " >&6; }
... ...
@@ -24,6 +24,9 @@ fi
24 24
 
25 25
 save_LDFLAGS="$LDFLAGS"
26 26
 save_CFLAGS="$CFLAGS"
27
+save_LIBS="$LIBS"
28
+
29
+SSL_LIBS="-lssl -lcrypto"
27 30
 
28 31
 if test "$LIBSSL_HOME" != "/usr"; then
29 32
     SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
... ...
@@ -35,8 +38,6 @@ else
35 35
     SSL_CPPFLAGS=""
36 36
 fi
37 37
 
38
-SSL_LIBS="-lssl -lcrypto"
39
-
40 38
 have_ssl="no"
41 39
 have_crypto="no"
42 40
 
... ...
@@ -49,3 +50,4 @@ AC_CHECK_LIB([ssl], [X509_VERIFY_PARAM_new], [], [AC_MSG_ERROR([Your OpenSSL ins
49 49
 
50 50
 LDFLAGS="$save_LDFLAGS"
51 51
 CFLAGS="$save_CFLAGS"
52
+LIBS="$save_LIBS"