Skip to content

Commit 97072aa

Browse files
committed
Re-gen.
1 parent d3663c5 commit 97072aa

File tree

20 files changed

+109
-15
lines changed

20 files changed

+109
-15
lines changed

Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
300300
LIBS_SRTP = @LIBS_SRTP@
301301
LIBS_UNWIND = @LIBS_UNWIND@
302302
LIBTOOL = @LIBTOOL@
303+
LIB_CRYPTO = @LIB_CRYPTO@
304+
LIB_SRTP2 = @LIB_SRTP2@
305+
LIB_SSL = @LIB_SSL@
303306
LIPO = @LIPO@
304307
LN_S = @LN_S@
305308
LTLIBOBJS = @LTLIBOBJS@

configure

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,9 @@ enable_option_checking=no
656656
ac_subst_vars='am__EXEEXT_FALSE
657657
am__EXEEXT_TRUE
658658
LTLIBOBJS
659+
LIB_SRTP2
660+
LIB_SSL
661+
LIB_CRYPTO
659662
OPT_CFLAGS
660663
SIZEOF_TIME_T
661664
LIBS_UNWIND
@@ -855,6 +858,7 @@ enable_lto
855858
enable_librtpproxy
856859
enable_noinst
857860
enable_silent
861+
enable_static_crypto
858862
enable_docs
859863
with_xsltproc
860864
with_xsltproc_flags
@@ -1518,6 +1522,7 @@ Optional Features:
15181522
--enable-librtpproxy Build librtpproxy for instrumentation
15191523
--enable-noinst Enable building noinst binaries (default is yes)
15201524
--enable-silent Less verbose build
1525+
--enable-static-crypto Link statically against libssl, libcrypto, libsrtp2
15211526
--enable-docs enable generation of documentation
15221527

15231528
Optional Packages:
@@ -13648,6 +13653,16 @@ esac
1364813653
fi
1364913654

1365013655

13656+
# Check whether --enable-static-crypto was given.
13657+
if test ${enable_static_crypto+y}
13658+
then :
13659+
enableval=$enable_static_crypto; ENABLE_STATIC_CRYPTO=$enableval
13660+
else case e in #(
13661+
e) ENABLE_STATIC_CRYPTO=no ;;
13662+
esac
13663+
fi
13664+
13665+
1365113666
# Checks for libraries.
1365213667

1365313668
if test "$enable_systemd" = 'yes'
@@ -15854,6 +15869,17 @@ then
1585415869
AM_DEFAULT_VERBOSITY=0
1585515870
fi
1585615871

15872+
if test "$ENABLE_STATIC_CRYPTO" = yes; then
15873+
LIB_CRYPTO='-l:libcrypto.a'
15874+
LIB_SSL='-l:libssl.a'
15875+
LIB_SRTP2='-l:libsrtp2.a'
15876+
else
15877+
LIB_CRYPTO='-lcrypto'
15878+
LIB_SSL='-lssl'
15879+
LIB_SRTP2='-lsrtp2'
15880+
fi
15881+
15882+
1585715883
ac_config_files="$ac_config_files Makefile src/Makefile makeann/Makefile extractaudio/Makefile libexecinfo/Makefile modules/Makefile modules/acct_csv/Makefile modules/acct_rtcp_hep/Makefile modules/catch_dtmf/Makefile modules/badmod/Makefile libxxHash/Makefile libre/Makefile modules/dtls_gw/Makefile modules/ice_lite/Makefile pertools/Makefile pertools/udp_contention/Makefile libucl/Makefile python/sippy_lite/sippy/Time/clock_dtime.py doc/Makefile"
1585815884

1585915885

@@ -15887,6 +15913,9 @@ fi
1588715913

1588815914

1588915915

15916+
15917+
15918+
1589015919
cat >confcache <<\_ACEOF
1589115920
# This file is a shell script that caches the results of configure
1589215921
# tests run on this system so they can be shared between configure

doc/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
180180
LIBS_SRTP = @LIBS_SRTP@
181181
LIBS_UNWIND = @LIBS_UNWIND@
182182
LIBTOOL = @LIBTOOL@
183+
LIB_CRYPTO = @LIB_CRYPTO@
184+
LIB_SRTP2 = @LIB_SRTP2@
185+
LIB_SSL = @LIB_SSL@
183186
LIPO = @LIPO@
184187
LN_S = @LN_S@
185188
LTLIBOBJS = @LTLIBOBJS@

extractaudio/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
394394
LIBS_SRTP = @LIBS_SRTP@
395395
LIBS_UNWIND = @LIBS_UNWIND@
396396
LIBTOOL = @LIBTOOL@
397+
LIB_CRYPTO = @LIB_CRYPTO@
398+
LIB_SRTP2 = @LIB_SRTP2@
399+
LIB_SSL = @LIB_SSL@
397400
LIPO = @LIPO@
398401
LN_S = @LN_S@
399402
LTLIBOBJS = @LTLIBOBJS@

libexecinfo/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
277277
LIBS_SRTP = @LIBS_SRTP@
278278
LIBS_UNWIND = @LIBS_UNWIND@
279279
LIBTOOL = @LIBTOOL@
280+
LIB_CRYPTO = @LIB_CRYPTO@
281+
LIB_SRTP2 = @LIB_SRTP2@
282+
LIB_SSL = @LIB_SSL@
280283
LIPO = @LIPO@
281284
LN_S = @LN_S@
282285
LTLIBOBJS = @LTLIBOBJS@

libre/Makefile.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,9 @@ am_libre_test_OBJECTS = libre_test-libre_test.$(OBJEXT) \
203203
$(am__objects_2) $(am__objects_3)
204204
libre_test_OBJECTS = $(am_libre_test_OBJECTS)
205205
am__DEPENDENCIES_1 = $(top_srcdir)/libexecinfo/libexecinfo.la
206-
libre_test_DEPENDENCIES = libre_debug.la $(am__DEPENDENCIES_1)
206+
am__DEPENDENCIES_2 =
207+
libre_test_DEPENDENCIES = libre_debug.la $(am__DEPENDENCIES_1) \
208+
$(am__DEPENDENCIES_2)
207209
libre_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
208210
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libre_test_CFLAGS) \
209211
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -402,6 +404,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
402404
LIBS_SRTP = @LIBS_SRTP@
403405
LIBS_UNWIND = @LIBS_UNWIND@
404406
LIBTOOL = @LIBTOOL@
407+
LIB_CRYPTO = @LIB_CRYPTO@
408+
LIB_SRTP2 = @LIB_SRTP2@
409+
LIB_SSL = @LIB_SSL@
405410
LIPO = @LIPO@
406411
LN_S = @LN_S@
407412
LTLIBOBJS = @LTLIBOBJS@
@@ -599,7 +604,7 @@ libre_test_CFLAGS = $(NOPT_CFLAGS) $(RTPP_MEMDEB_CFLAGS) $(LTO_FLAG)
599604
libre_test_SOURCES = libre_test.c \
600605
$(RTPP_MEMDEB_CORESRCS) $(rtpp_refcnt_AUTOSRCS)
601606

602-
libre_test_LDADD = libre_debug.la $(RTPP_MEMDEB_LDADD) -lcrypto
607+
libre_test_LDADD = libre_debug.la $(RTPP_MEMDEB_LDADD) $(LIB_CRYPTO)
603608
libre_test_LDLAGS = $(LTO_FLAG)
604609
all: all-am
605610

libucl/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
313313
LIBS_SRTP = @LIBS_SRTP@
314314
LIBS_UNWIND = @LIBS_UNWIND@
315315
LIBTOOL = @LIBTOOL@
316+
LIB_CRYPTO = @LIB_CRYPTO@
317+
LIB_SRTP2 = @LIB_SRTP2@
318+
LIB_SSL = @LIB_SSL@
316319
LIPO = @LIPO@
317320
LN_S = @LN_S@
318321
LTLIBOBJS = @LTLIBOBJS@

libxxHash/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
244244
LIBS_SRTP = @LIBS_SRTP@
245245
LIBS_UNWIND = @LIBS_UNWIND@
246246
LIBTOOL = @LIBTOOL@
247+
LIB_CRYPTO = @LIB_CRYPTO@
248+
LIB_SRTP2 = @LIB_SRTP2@
249+
LIB_SSL = @LIB_SSL@
247250
LIPO = @LIPO@
248251
LN_S = @LN_S@
249252
LTLIBOBJS = @LTLIBOBJS@

makeann/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
272272
LIBS_SRTP = @LIBS_SRTP@
273273
LIBS_UNWIND = @LIBS_UNWIND@
274274
LIBTOOL = @LIBTOOL@
275+
LIB_CRYPTO = @LIB_CRYPTO@
276+
LIB_SRTP2 = @LIB_SRTP2@
277+
LIB_SSL = @LIB_SSL@
275278
LIPO = @LIPO@
276279
LN_S = @LN_S@
277280
LTLIBOBJS = @LTLIBOBJS@

modules/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ LIBS_SNDFILE = @LIBS_SNDFILE@
240240
LIBS_SRTP = @LIBS_SRTP@
241241
LIBS_UNWIND = @LIBS_UNWIND@
242242
LIBTOOL = @LIBTOOL@
243+
LIB_CRYPTO = @LIB_CRYPTO@
244+
LIB_SRTP2 = @LIB_SRTP2@
245+
LIB_SSL = @LIB_SSL@
243246
LIPO = @LIPO@
244247
LN_S = @LN_S@
245248
LTLIBOBJS = @LTLIBOBJS@

0 commit comments

Comments
 (0)