Skip to content

Commit 9468ff7

Browse files
crienzoandywolk
crienzo
authored and
andywolk
committed
[core] remove apr-util from tree
1 parent c1a9e98 commit 9468ff7

File tree

196 files changed

+60
-49552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+60
-49552
lines changed

‎Makefile.am

+1-18
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@ AM_LIBAPR_CPPFLAGS := $(shell ./libs/apr/apr-1-config --cppflags --includes)
1515
AM_LIBAPR_LDFLAGS := $(shell ./libs/apr/apr-1-config --ldflags)
1616
AM_LIBAPR_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr/apr-1-config \--libs))
1717
endif
18-
if SYSTEM_APRUTIL
19-
AM_LIBAPU_CPPFLAGS := $(shell apu-1-config --includes)
20-
AM_LIBAPU_LDFLAGS := $(shell apu-1-config --ldflags)
21-
AM_LIBAPU_LIBS := $(shell apu-1-config \--libs)
22-
AM_LIBAPU_LINKLIBTOOL := $(shell apu-1-config \--link-libtool)
23-
else
24-
AM_LIBAPU_CPPFLAGS := $(shell ./libs/apr-util/apu-1-config --includes)
25-
AM_LIBAPU_LDFLAGS := $(shell ./libs/apr-util/apu-1-config --ldflags)
26-
AM_LIBAPU_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr-util/apu-1-config \--libs))
27-
endif
2818

2919

3020
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
@@ -141,11 +131,6 @@ CORE_LIBS=
141131
if ENABLE_LIBVPX
142132
CORE_LIBS += libs/libvpx/libvpx.a
143133
endif
144-
if SYSTEM_APRUTIL
145-
CORE_LIBS += $(AM_LIBAPU_LINKLIBTOOL)
146-
else
147-
CORE_LIBS += libs/apr-util/libaprutil-1.la
148-
endif
149134
if SYSTEM_APR
150135
CORE_LIBS += $(AM_LIBAPR_LINKLIBTOOL)
151136
else
@@ -340,6 +325,7 @@ nodist_libfreeswitch_la_SOURCES = \
340325

341326
libfreeswitch_la_SOURCES = \
342327
src/switch_apr.c \
328+
src/switch_apr_queue.c \
343329
src/switch_buffer.c \
344330
src/switch_caller.c \
345331
src/switch_channel.c \
@@ -600,9 +586,6 @@ libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr
600586
libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
601587
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi
602588

603-
libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
604-
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi
605-
606589
SRTP_SRC = libs/srtp/srtp/srtp.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
607590
libs/srtp/crypto/cipher/aes.c libs/srtp/crypto/cipher/aes_icm.c \
608591
libs/srtp/crypto/hash/null_auth.c libs/srtp/crypto/hash/sha1.c \

‎bootstrap.sh

-3
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,6 @@ bootstrap_apr() {
170170
# Remove autoconf 2.5x's cache directory
171171
rm -rf autom4te*.cache
172172

173-
echo "Entering directory ${LIBDIR}/apr-util"
174-
cd ${LIBDIR}/apr-util
175-
./buildconf
176173
}
177174

178175
bootstrap_libzrtp() {

‎cmake_modules/FindAPRUtil.cmake

-49
This file was deleted.

‎configure.ac

+2-7
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,6 @@ PKG_CHECK_MODULES([STIRSHAKEN], [stirshaken],[
844844

845845
AC_CHECK_LIB(apr-1, apr_pool_mutex_set, use_system_apr=yes, use_system_apr=no)
846846
AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
847-
AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
848-
AM_CONDITIONAL([SYSTEM_APRUTIL],[test "${use_system_aprutil}" = "yes"])
849847

850848
save_LIBS="$LIBS"
851849
LIBS=
@@ -2333,12 +2331,9 @@ AC_CONFIG_SUBDIRS([libs/srtp])
23332331
if test "$use_system_apr" != "yes"; then
23342332
AC_CONFIG_SUBDIRS([libs/apr])
23352333
fi
2336-
if test "$use_system_aprutil" != "yes"; then
2337-
AC_CONFIG_SUBDIRS([libs/apr-util])
2338-
fi
23392334
AC_CONFIG_SUBDIRS([libs/iksemel])
2340-
AC_CONFIG_SUBDIRS([libs/libdingaling])
2341-
AC_CONFIG_SUBDIRS([libs/unimrcp])
2335+
#AC_CONFIG_SUBDIRS([libs/libdingaling])
2336+
#AC_CONFIG_SUBDIRS([libs/unimrcp])
23422337
if test "x${enable_zrtp}" = "xyes"; then
23432338
AC_CONFIG_SUBDIRS([libs/libzrtp])
23442339
fi

‎libs/.gitignore

+1-34
Original file line numberDiff line numberDiff line change
@@ -41,33 +41,6 @@ opal
4141
/apr/Makefile
4242
/apr/test/internal/Makefile
4343
/apr/test/Makefile
44-
/apr-util/aprutil.exp
45-
/apr-util/apu-1-config
46-
/apr-util/build/apr_common.m4
47-
/apr-util/build/find_apr.m4
48-
/apr-util/build/get-version.sh
49-
/apr-util/build/install.sh
50-
/apr-util/build/pkg/pkginfo
51-
/apr-util/build/rules.mk
52-
/apr-util/exports.c
53-
/apr-util/export_vars.c
54-
/apr-util/export_vars.sh
55-
/apr-util/include/apr_ldap.h
56-
/apr-util/include/apu_config.h
57-
/apr-util/include/apu.h
58-
/apr-util/include/apu_select_dbm.h
59-
/apr-util/include/apu_want.h
60-
/apr-util/include/private/apu_config.h
61-
/apr-util/include/private/apu_config.h.in
62-
/apr-util/include/private/apu_select_dbm.h
63-
/apr-util/.make.dirs
64-
/apr-util/Makefile
65-
/apr-util/test/Makefile
66-
/apr-util/xml/expat/config.h
67-
/apr-util/xml/expat/lib/config.h
68-
/apr-util/xml/expat/lib/expat.h
69-
/apr-util/xml/expat/lib/Makefile
70-
/apr-util/xml/expat/Makefile
7144
/broadvoice/config-h.in
7245
/broadvoice/doc/Makefile
7346
/broadvoice/doc/Makefile.in
@@ -728,10 +701,6 @@ opal
728701
/v8-*.zip
729702

730703
# build products we should remove
731-
!/apr-util/xml/expat/conftools/config.guess
732-
!/apr-util/xml/expat/conftools/config.sub
733-
!/apr-util/xml/expat/conftools/install-sh
734-
!/apr-util/xml/expat/conftools/missing
735704
!/iksemel/ltmain.sh
736705
!/libdingaling/config.guess
737706
!/libdingaling/config.sub
@@ -759,8 +728,6 @@ unimrcp/build/compile
759728
/ldns/
760729
/portaudio/
761730
portaudio.*.log
762-
apr-util/configure
763-
apr-util/xml/expat/configure
764731
apr/configure
765732
iksemel/configure
766733
libdingaling/configure
@@ -794,4 +761,4 @@ mariadb-connector-c-*
794761
/spandsp*/
795762
/spandsp*
796763
win32/spandsp/spandsp.h
797-
win32/spandsp/win32
764+
win32/spandsp/win32

‎libs/apr-util/.update

-1
This file was deleted.

0 commit comments

Comments
 (0)