Changeset 4892 for pjproject

Timestamp:

Aug 19, 2014 2:18:07 AM (10 years ago)

Author:

ming

Message:

Re #1751 (misc): Fixed compilation error due to the lack of the SSLv2 methods.
The fix will autodetect this and define OPENSSL_NO_SSL2 if necessary. Related to #1321.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -7718 +7718 @@
                         $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
 
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSLv2_method in -lssl" >&5
+$as_echo_n "checking for SSLv2_method in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSLv2_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SSLv2_method ();
+int
+main ()
+{
+return SSLv2_method ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ssl_SSLv2_method=yes
+else
+  ac_cv_lib_ssl_SSLv2_method=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSLv2_method" >&5
+$as_echo "$ac_cv_lib_ssl_SSLv2_method" >&6; }
+if test "x$ac_cv_lib_ssl_SSLv2_method" = xyes; then :
+  libssl_no_ssl2=1
+fi
+
+                        if test "x$libssl_no_ssl2" != "x1"; then
+                                CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1"
+                        fi
                 else
                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5

pjproject/trunk/aconfigure.ac

@@ -1522 +1522 @@
                         #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
                         AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
+                        AC_CHECK_LIB(ssl,SSLv2_method,[libssl_no_ssl2=1])
+                        if test "x$libssl_no_ssl2" != "x1"; then
+                                CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1"
+                        fi
                 else
                         AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **])