Changeset 5656 for pjproject/trunk/aconfigure.ac

Timestamp:

Sep 22, 2017 2:42:22 AM (7 years ago)

Author:

ming

Message:

Re #1993: With the update of bundled libSRTP to 2.1, external SRTP needs to be of version 2.x as well. This changeset will allow external SRTP users the option to continue using their current version 1.x.

• Also add autodetection of external SRTP version via the configure script.

Thanks to Alexander Traud for the report.

File:

• pjproject/trunk/aconfigure.ac (modified) (3 diffs)

pjproject/trunk/aconfigure.ac

@@ -567 +567 @@
 dnl # Use external SRTP installation
 AC_SUBST(ac_external_srtp,0)
+AC_SUBST(ac_external_srtp_lib)
 AC_ARG_WITH(external-srtp,
     AS_HELP_STRING([--with-external-srtp],
@@ -574 +575 @@
                 # Test SRTP installation
                 AC_MSG_CHECKING([if external SRTP devkit is installed])
-                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <srtp/srtp.h>
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <srtp2/srtp.h>
                                                      ]],
                                                   [srtp_init();])],
-                                  [AC_MSG_RESULT(yes!!)
+                                  [AC_MSG_RESULT(yes: version 2.x)
+                                   ac_external_srtp="2"
+                                   ac_external_srtp_lib="srtp2"
+                                   ],
+                                  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <srtp/srtp.h>
+                                                     ]],
+                                                  [srtp_init();])],
+                                  [AC_MSG_RESULT(yes: version 1.x)
                                    ac_external_srtp="1"
+                                   ac_external_srtp_lib="srtp"
                                    ],
-                                  [AC_MSG_ERROR([Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])])
+                                  [AC_MSG_ERROR([Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])])])
         fi
     ]
@@ -586 +595 @@
 
 dnl # For external SRTP, check availability of srtp_deinit() or srtp_shutdown()
-if test "x$ac_external_srtp" = "x1"; then
+if test "x$ac_external_srtp" != "x0"; then
         AC_SUBST(ac_srtp_deinit_present,0)
         AC_SUBST(ac_srtp_shutdown_present,0)
-        AC_CHECK_LIB(srtp,srtp_deinit,[ac_srtp_deinit_present=1])
+        AC_CHECK_LIB($ac_external_srtp_lib,srtp_deinit,[ac_srtp_deinit_present=1])
         if test "x$ac_srtp_deinit_present" != "x1"; then
-                AC_CHECK_LIB(srtp,srtp_shutdown,[ac_srtp_shutdown_present=1])
+                AC_CHECK_LIB($ac_external_srtp_lib,srtp_shutdown,[ac_srtp_shutdown_present=1])
         fi
 fi