mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 06:48:33 +00:00
Use the system version of APR / APR-util if possible
Autodetect whether the system libapr / libaprutil has our necessary modifications and use it if it does.
This commit is contained in:
1 parent
cde20f6fe6
commit
487128950d
2 files changed
+37
-3
No files matched your search
+11
-2
@@ -656,6 +656,11 @@ if test "x$have_libz" = "xyes" ; then
|
||||
APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(apr-1, apr_pool_mutex_set, use_system_apr=yes, use_system_apr=no)
|
||||
AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
|
||||
AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
|
||||
AM_CONDITIONAL([SYSTEM_APRUTIL],[test "${use_system_aprutil}" = "yes"])
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
|
||||
|
||||
AC_CHECK_LIB(jbig, jbg_enc_out, have_libjbig=yes, have_libjbig=no)
|
||||
@@ -1525,8 +1530,12 @@ ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS' CONFIGURE_CXXFL
|
||||
|
||||
# Run configure in all the subdirs
|
||||
AC_CONFIG_SUBDIRS([libs/srtp])
|
||||
AC_CONFIG_SUBDIRS([libs/apr])
|
||||
AC_CONFIG_SUBDIRS([libs/apr-util])
|
||||
if test "$use_system_apr" != "yes"; then
|
||||
AC_CONFIG_SUBDIRS([libs/apr])
|
||||
fi
|
||||
if test "$use_system_aprutil" != "yes"; then
|
||||
AC_CONFIG_SUBDIRS([libs/apr-util])
|
||||
fi
|
||||
AC_CONFIG_SUBDIRS([libs/ilbc])
|
||||
AC_CONFIG_SUBDIRS([libs/iksemel])
|
||||
AC_CONFIG_SUBDIRS([libs/js/nsprpub])
|
||||
|
||||
Reference in new issue
Block a user