build: centrally control linker flags for pthread and STL, needed for…

… Android

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@10298 ddefafc4-47db-0310-ae44-fa13212b10f2

apps/basicB2BUA/Makefile.am

@@ -7,7 +7,7 @@ basicB2BUA_LDADD += ../../resip/dum/libdum.la
 basicB2BUA_LDADD += ../../resip/stack/libresip.la
 basicB2BUA_LDADD += ../../rutil/librutil.la
 basicB2BUA_LDADD += -lxerces-c -lpcrecpp
-basicB2BUA_LDADD += @LIBSSL_LIBADD@ -lpthread
+basicB2BUA_LDADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 basicB2BUA_SOURCES = \
 	Context.cxx \

apps/clicktocall/Makefile.am

@@ -13,7 +13,7 @@ SUBDIRS += test
 sbin_PROGRAMS = clicktocall
 clicktocall_LDADD = ../../resip/dum/libdum.la
 clicktocall_LDADD += ../../resip/stack/libresip.la ../../rutil/librutil.la
-clicktocall_LDADD += @LIBSSL_LIBADD@ -lpcre -lpthread
+clicktocall_LDADD += @LIBSSL_LIBADD@ -lpcre @LIBPTHREAD_LIBADD@
 
 clicktocall_SOURCES = \
         AddressTranslator.cxx \

apps/clicktocall/test/Makefile.am

@@ -10,5 +10,5 @@ check_PROGRAMS = clicktocallxml
 
 clicktocallxml_SOURCES = clicktocallxml.cxx
 clicktocallxml_LDADD = ../../../rutil/librutil.la
-clicktocallxml_LDADD += -lpthread
+clicktocallxml_LDADD += @LIBPTHREAD_LIBADD@
 

apps/ichat-gw/Makefile.am

@@ -16,7 +16,7 @@ SUBDIRS += jabberconnector
 sbin_PROGRAMS = ichat-gw
 ichat_gw_LDADD = ../../resip/dum/libdum.la
 ichat_gw_LDADD += ../../resip/stack/libresip.la ../../rutil/librutil.la
-ichat_gw_LDADD += @LIBSSL_LIBADD@ -lpcre -lpthread
+ichat_gw_LDADD += @LIBSSL_LIBADD@ -lpcre @LIBPTHREAD_LIBADD@
 
 ichat_gw_SOURCES = \
         AddressTranslator.cxx \

apps/ichat-gw/jabberconnector/Makefile.am

@@ -14,7 +14,7 @@ ichat_gw_jc_LDADD += -lgloox
 ichat_gw_jc_LDADD += -lgnutls
 ichat_gw_jc_LDADD += -lidn
 ichat_gw_jc_LDADD += -lresolv
-ichat_gw_jc_LDADD += -lpthread
+ichat_gw_jc_LDADD += @LIBPTHREAD_LIBADD@
 
 ichat_gw_jc_SOURCES = \
         ichat-gw-jc.cxx \

apps/sipdial/Makefile.am

@@ -16,7 +16,7 @@ SUBDIRS = .
 lib_LTLIBRARIES = libsipdial.la
 libsipdial_la_LIBADD = ../../resip/dum/libdum.la
 libsipdial_la_LIBADD += ../../resip/stack/libresip.la ../../rutil/librutil.la
-libsipdial_la_LIBADD += @LIBSSL_LIBADD@ -lpthread
+libsipdial_la_LIBADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 libsipdial_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@
 libsipdial_la_LDFLAGS += -export-dynamic
 

b2bua/Makefile.am

@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libb2bua.la
 libb2bua_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libb2bua_la_LIBADD = ../resip/dum/libdum.la
 libb2bua_la_LIBADD += ../resip/stack/libresip.la ../rutil/librutil.la
-libb2bua_la_LIBADD += @LIBSSL_LIBADD@ -lpthread
+libb2bua_la_LIBADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 libb2bua_la_SOURCES = \
         AuthenticationManager.cxx \

configure.ac

@@ -172,6 +172,13 @@ AC_ARG_WITH(sigcomp,
 [  --with-sigcomp          Link against Open SigComp libraries for SigComp],
  AC_DEFINE_UNQUOTED(USE_SIGCOMP, , USE_SIGCOMP), )
 
+AC_ARG_ENABLE(android,
+[  --enable-android        Enable Android build],
+   [AC_SUBST(LIBPTHREAD_LIBADD, ""),
+   AC_SUBST(LIBSTL_LIBADD, "-lgnustl_shared")],
+   [AC_SUBST(LIBPTHREAD_LIBADD, "-lpthread"),
+   AC_SUBST(LIBSTL_LIBADD, "")])
+
 AC_ARG_ENABLE(ipv6,
 [  --enable-ipv6           Enable IPv6 support],
  AC_DEFINE_UNQUOTED(USE_IPV6, , USE_IPV6), )

p2p/Makefile.am

@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libp2p.la
 
 libp2p_la_LIBADD = s2c/s2c/libs2c.la
 libp2p_la_LIBADD += ../rutil/librutil.la
-libp2p_la_LIBADD += @LIBSSL_LIBADD@ -lpthread
+libp2p_la_LIBADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 libp2p_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libp2p_la_SOURCES =   \

p2p/s2c/s2c/Makefile.am

@@ -7,7 +7,7 @@ SUBDIRS = .
 
 lib_LTLIBRARIES = libs2c.la
 
-libs2c_la_LIBADD = @LIBSSL_LIBADD@ -lpthread -lrt 
+libs2c_la_LIBADD = @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@ -lrt 
 libs2c_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libs2c_la_SOURCES = s2c_native.cxx

presSvr/Makefile.am

@@ -29,7 +29,7 @@ noinst_HEADERS = DialogSetMgr.h \
 presSvr_LDADD = ../resip/stack/libresip.la ../rutil/librutil.la
 #presSvr_LDADD += ../contrib/ares/libares.a
 #presSvr_LDADD += -L../contrib/ares -lares
-presSvr_LDADD += @LIBSSL_LIBADD@ -lpthread 
+presSvr_LDADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@ 
 
 
 ##############################################################################

reTurn/Makefile.am

@@ -82,7 +82,8 @@ reTurnServer_LDADD = ../resip/dum/libdum.la
 reTurnServer_LDADD += ../resip/stack/libresip.la ../rutil/librutil.la
 #reTurnServer_LDADD += ../contrib/ares/libares.a
 #reTurnServer_LDADD += -L../contrib/ares -lares
-reTurnServer_LDADD += @LIBSSL_LIBADD@ -lcrypto -lpthread
+reTurnServer_LDADD += @LIBSTL_LIBADD@
+reTurnServer_LDADD += @LIBSSL_LIBADD@ -lcrypto @LIBPTHREAD_LIBADD@
 
 #lib_LTLIBRARIES = librepro.la
 

reTurn/client/Makefile.am

@@ -10,7 +10,8 @@ SUBDIRS += test
 
 lib_LTLIBRARIES = libreTurnClient.la
 
-libreTurnClient_la_LIBADD = @LIBSSL_LIBADD@ -lrt
+libreTurnClient_la_LIBADD = @LIBSTL_LIBADD@
+libreTurnClient_la_LIBADD += @LIBSSL_LIBADD@ -lrt
 libreTurnClient_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libreTurnClient_la_SOURCES = \

reTurn/client/test/Makefile.am

@@ -5,7 +5,7 @@ EXTRA_DIST += *.vcproj
 
 LDADD = ../libreTurnClient.la
 LDADD += ../../../rutil/librutil.la
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
 
 # These tests all need to be run manually at the moment, so
 # they are commented out (they still get compiled by `make check'):

reTurn/test/Makefile.am

@@ -8,7 +8,7 @@ AM_CXXFLAGS = -I $(top_srcdir)
 
 LDADD = ../client/libreTurnClient.la
 LDADD += ../../rutil/librutil.la
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
 
 TESTS = \
 	stunTestVectors

reflow/Makefile.am

@@ -14,6 +14,7 @@ lib_LTLIBRARIES = libreflow.la
 libreflow_la_LIBADD = ../reTurn/client/libreTurnClient.la
 libreflow_la_LIBADD += ../rutil/librutil.la
 libreflow_la_LIBADD += @LIBSSL_LIBADD@ -lsrtp
+libreflow_la_LIBADD += @LIBSTL_LIBADD@
 libreflow_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libreflow_la_SOURCES = FakeSelectSocketDescriptor.cxx \

repro/Makefile.am

@@ -29,7 +29,7 @@ repro_LDADD += ../resip/dum/libdum.la
 repro_LDADD += ../resip/stack/libresip.la ../rutil/librutil.la
 #repro_LDADD += ../contrib/ares/libares.a
 #repro_LDADD += -L../contrib/ares -lares
-repro_LDADD += @LIBSSL_LIBADD@ -lpthread
+repro_LDADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 lib_LTLIBRARIES = librepro.la
 

repro/accountingconsumers/Makefile.am

@@ -11,7 +11,7 @@ queuetostream_SOURCES = queuetostream.cpp
 queuetostream_LDADD = ../librepro.la
 queuetostream_LDADD += ../../resip/dum/libdum.la
 queuetostream_LDADD += ../../resip/stack/libresip.la ../../rutil/librutil.la
-queuetostream_LDADD += @LIBSSL_LIBADD@ -lpthread -ldb_cxx
+queuetostream_LDADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@ -ldb_cxx
 
 ##############################################################################
 # 

repro/reprocmd/Makefile.am

@@ -13,7 +13,7 @@ reprocmd_LDADD += ../../resip/dum/libdum.la
 reprocmd_LDADD += ../../resip/stack/libresip.la ../../rutil/librutil.la
 #reprocmd_LDADD += ../contrib/ares/libares.a
 #reprocmd_LDADD += -L../contrib/ares -lares
-reprocmd_LDADD += @LIBSSL_LIBADD@ -lpthread
+reprocmd_LDADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 ##############################################################################
 # 

repro/test/Makefile.am

@@ -10,7 +10,7 @@ LDADD += ../../resip/dum/libdum.la
 LDADD += ../../resip/stack/libresip.la
 LDADD += ../../rutil/librutil.la
 #LDADD += ../../contrib/ares/libares.a
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
 
 #
 # this test case doesn't appear to be up to date so it has been commented

resip/dum/Makefile.am

@@ -13,6 +13,7 @@ AM_CXXFLAGS = -I $(top_srcdir)
 lib_LTLIBRARIES = libdum.la
 
 libdum_la_LIBADD = @LIBSSL_LIBADD@ @LIBRADIUS_LIBADD@
+libdum_la_LIBADD += @LIBSTL_LIBADD@
 libdum_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libdum_la_SOURCES =   \

resip/dum/test/Makefile.am

@@ -11,7 +11,7 @@ LDADD = ../libdum.la
 LDADD += ../../stack/libresip.la
 LDADD += ../../../rutil/librutil.la
 #LDADD += ../../../contrib/ares/libares.a
-LDADD += $(LIBSSL_LIBADD) $(LIBPOPT_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) $(LIBPOPT_LIBADD) @LIBSTL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 TESTS = basicRegister
 TESTS += BasicCall

resip/recon/MOHParkServer/Makefile.am

@@ -25,7 +25,7 @@ LDADD += ../../../reTurn/client/libreTurnClient.la
 LDADD += ../../../resip/dum/libdum.la
 LDADD += ../../../resip/stack/libresip.la
 LDADD += ../../../rutil/librutil.la
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
 
 sbin_PROGRAMS = MOHParkServer
 

resip/recon/test/Makefile.am

@@ -21,7 +21,7 @@ LDADD += -lsipXtack
 LDADD += ../../dum/libdum.la
 LDADD += ../../stack/libresip.la
 LDADD += ../../../rutil/librutil.la
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
 
 AM_CPPFLAGS = -I$(top_srcdir)/resip/recon
 

resip/stack/Makefile.am

@@ -33,6 +33,7 @@ AM_CXXFLAGS = -I $(top_srcdir)
 lib_LTLIBRARIES = libresip.la
 
 libresip_la_LIBADD = @LIBSSL_LIBADD@
+libresip_la_LIBADD += @LIBSTL_LIBADD@
 libresip_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libresip_la_SOURCES = \

resip/stack/test/Makefile.am

@@ -31,7 +31,7 @@ AM_CXXFLAGS = -I $(top_srcdir)
 LDADD = ../libresip.la
 LDADD += ../../../rutil/librutil.la
 #LDADD += ../../../contrib/ares/libares.a
-LDADD += $(LIBSSL_LIBADD) $(LIBPOPT_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) $(LIBPOPT_LIBADD) @LIBSTL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 TESTS = \
 	testAppTimer \

rutil/Makefile.am

@@ -26,6 +26,7 @@ lib_LTLIBRARIES = librutil.la
 librutil_la_LIBADD = $(LIBSSL_LIBADD)
 librutil_la_LIBADD += $(LIBRADIUS_LIBADD)
 librutil_la_LIBADD += $(LIBARES_LIBADD)
+librutil_la_LIBADD += @LIBSTL_LIBADD@
 #librutil_la_LIBADD += -lrt
 librutil_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 

rutil/test/Makefile.am

@@ -9,7 +9,7 @@ AM_CXXFLAGS = -I $(top_srcdir)
 
 LDADD = ../librutil.la
 #LDADD += ../../contrib/ares/libares.a
-LDADD += $(LIBSSL_LIBADD) -lpthread
+LDADD += $(LIBSSL_LIBADD) @LIBSTL_LIBADD@ @LIBPTHREAD_LIBADD@
 
 TESTS = \
 	testCoders \

tfm/Makefile.am

@@ -24,7 +24,7 @@ libtfm_la_LIBADD = ../repro/librepro.la
 libtfm_la_LIBADD += ../resip/dum/libdum.la
 libtfm_la_LIBADD += ../resip/stack/libresip.la
 libtfm_la_LIBADD += ../rutil/librutil.la
-libtfm_la_LIBADD += @LIBSSL_LIBADD@ -lpthread -ldb_cxx -lcppunit -lNetxx
+libtfm_la_LIBADD += @LIBSSL_LIBADD@ @LIBPTHREAD_LIBADD@ -ldb_cxx -lcppunit -lNetxx
 
 libtfm_la_SOURCES = ActionBase.cxx \
         CppTestSelector.cxx \

tfm/repro/Makefile.am

@@ -14,7 +14,7 @@ sanityTests_LDADD += ../../resip/stack/libresip.la
 sanityTests_LDADD += ../../rutil/librutil.la
 sanityTests_LDADD += @LIBSSL_LIBADD@
 sanityTests_LDADD += -lpopt
-sanityTests_LDADD += -lpthread
+sanityTests_LDADD += @LIBPTHREAD_LIBADD@
 sanityTests_LDADD += -lcppunit
 sanityTests_LDADD += -lNetxx
 

tfm/tfdum/Makefile.am

@@ -10,7 +10,7 @@ TestLamba_LDADD += ../../resip/dum/libdum.la
 TestLamba_LDADD += ../../resip/stack/libresip.la
 TestLamba_LDADD += ../../rutil/librutil.la
 TestLamba_LDADD += @LIBSSL_LIBADD@
-TestLamba_LDADD += -lpthread
+TestLamba_LDADD += @LIBPTHREAD_LIBADD@
 
 TestLamba_SOURCES = TestLamba.cxx $(SHARED_SRC)
 
@@ -19,7 +19,7 @@ dumTests_LDADD += ../../resip/dum/libdum.la
 dumTests_LDADD += ../../resip/stack/libresip.la
 dumTests_LDADD += ../../rutil/librutil.la
 dumTests_LDADD += @LIBSSL_LIBADD@
-dumTests_LDADD += -lpthread
+dumTests_LDADD += @LIBPTHREAD_LIBADD@
 
 dumTests_SOURCES = dumTests.cxx $(SHARED_SRC)