[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. upstream/1.8.0_pre1-26-g1fae126

Daniel Pocock daniel at pocock.com.au
Mon May 21 13:01:38 UTC 2012 

The following commit has been merged in the master branch:
commit 5dde94f37e78ea53dec13cba405681850a9943b4
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Mon May 21 14:32:12 2012 +0200

    Imported Upstream version 1.8.0~pre3

diff --git a/Makefile.in b/Makefile.in
index dc64afa..3a40fd1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,7 +116,6 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.Z
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -162,6 +161,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -186,6 +186,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 5ee80bf..b8d78c9 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -91,7 +91,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -137,6 +136,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -161,6 +161,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/apps/clicktocall/Makefile.in b/apps/clicktocall/Makefile.in
index 6c988ad..05903a3 100644
--- a/apps/clicktocall/Makefile.in
+++ b/apps/clicktocall/Makefile.in
@@ -144,7 +144,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -190,6 +189,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -214,6 +214,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/apps/ichat-gw/Makefile.in b/apps/ichat-gw/Makefile.in
index 5dfc818..0901e8c 100644
--- a/apps/ichat-gw/Makefile.in
+++ b/apps/ichat-gw/Makefile.in
@@ -143,7 +143,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -189,6 +188,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -213,6 +213,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/apps/sipdial/Makefile.am b/apps/sipdial/Makefile.am
index 6f9066e..6695dee 100644
--- a/apps/sipdial/Makefile.am
+++ b/apps/sipdial/Makefile.am
@@ -17,7 +17,7 @@ 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_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@
+libsipdial_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@
 libsipdial_la_LDFLAGS += -export-dynamic
 
 bin_PROGRAMS = sipdialer
diff --git a/apps/sipdial/Makefile.in b/apps/sipdial/Makefile.in
index 95cfe7e..f651f1c 100644
--- a/apps/sipdial/Makefile.in
+++ b/apps/sipdial/Makefile.in
@@ -151,7 +151,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -197,6 +196,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -221,6 +221,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -286,8 +287,7 @@ lib_LTLIBRARIES = libsipdial.la
 libsipdial_la_LIBADD = ../../resip/dum/libdum.la \
 	../../resip/stack/libresip.la ../../rutil/librutil.la \
 	@LIBSSL_LIBADD@ -lpthread
-libsipdial_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ \
-	-export-dynamic
+libsipdial_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 sipdialer_LDADD = libsipdial.la ../../resip/dum/libdum.la \
 	../../resip/stack/libresip.la ../../rutil/librutil.la
 libsipdial_la_SOURCES = \
diff --git a/configure b/configure
index 6778b9e..7539376 100755
--- a/configure
+++ b/configure
@@ -744,7 +744,6 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-ABIVERSION
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -853,6 +852,8 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+LIBTOOL_VERSION_RELEASE
+SO_RELEASE
 target_alias
 host_alias
 build_alias
@@ -2553,7 +2554,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ABIVERSION=1.8
+SO_RELEASE=`echo $PACKAGE_VERSION | cut -f1,2 -d.`
+
+
+#LIBTOOL_VERSION_RELEASE="-version-info 0:0:0 -release @SO_RELEASE@"
+LIBTOOL_VERSION_RELEASE="-release $SO_RELEASE"
+
+
+
+########## End of release/version data ######################
 
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
@@ -5113,13 +5122,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5116: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5125: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5119: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5128: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5122: output\"" >&5)
+  (eval echo "\"\$as_me:5131: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6325,7 +6334,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6328 "configure"' > conftest.$ac_ext
+  echo '#line 6337 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8381,11 +8390,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8393: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8388: \$? = $ac_status" >&5
+   echo "$as_me:8397: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8720,11 +8729,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8732: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8727: \$? = $ac_status" >&5
+   echo "$as_me:8736: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8825,11 +8834,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8837: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8832: \$? = $ac_status" >&5
+   echo "$as_me:8841: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8880,11 +8889,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8883: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8892: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8887: \$? = $ac_status" >&5
+   echo "$as_me:8896: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11264,7 +11273,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11267 "configure"
+#line 11276 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11360,7 +11369,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11363 "configure"
+#line 11372 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13316,11 +13325,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13319: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13328: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13323: \$? = $ac_status" >&5
+   echo "$as_me:13332: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13415,11 +13424,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13418: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13427: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13422: \$? = $ac_status" >&5
+   echo "$as_me:13431: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13467,11 +13476,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13479: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13474: \$? = $ac_status" >&5
+   echo "$as_me:13483: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15662,8 +15671,6 @@ fi
 
 
 
-
-
 # this is temporarily removed:
 #  apps/ichat-gw/jabberconnector/Makefile
 # until it is tested with autotools
diff --git a/configure.ac b/configure.ac
index 93aac92..f262d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,15 @@
 AC_INIT(resiprocate,1.8.0)
 AC_CONFIG_SRCDIR(repro/repro.cxx)
 
-ABIVERSION=1.8
+SO_RELEASE=`echo $PACKAGE_VERSION | cut -f1,2 -d.`
+AC_SUBST(SO_RELEASE)
+
+#LIBTOOL_VERSION_RELEASE="-version-info 0:0:0 -release @SO_RELEASE@"
+LIBTOOL_VERSION_RELEASE="-release $SO_RELEASE"
+AC_SUBST(LIBTOOL_VERSION_RELEASE)
+
+
+########## End of release/version data ######################
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -233,8 +241,6 @@ AX_HAVE_EPOLL(
 
 AM_MAINTAINER_MODE
 
-AC_SUBST(ABIVERSION)
-
 # this is temporarily removed:
 #  apps/ichat-gw/jabberconnector/Makefile
 # until it is tested with autotools
diff --git a/p2p/Makefile.am b/p2p/Makefile.am
index 7f0ac82..7e1d238 100644
--- a/p2p/Makefile.am
+++ b/p2p/Makefile.am
@@ -8,7 +8,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_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libp2p_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libp2p_la_SOURCES =   \
         ChordTopology.cxx \
diff --git a/p2p/Makefile.in b/p2p/Makefile.in
index 980a7ca..a9ff924 100644
--- a/p2p/Makefile.in
+++ b/p2p/Makefile.in
@@ -106,7 +106,6 @@ HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -152,6 +151,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -176,6 +176,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -237,7 +238,7 @@ AM_CXXFLAGS = -I./s2c
 lib_LTLIBRARIES = libp2p.la
 libp2p_la_LIBADD = s2c/s2c/libs2c.la ../rutil/librutil.la \
 	@LIBSSL_LIBADD@ -lpthread
-libp2p_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libp2p_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libp2p_la_SOURCES = \
         ChordTopology.cxx \
         ChordUpdate.cxx \
diff --git a/p2p/s2c/s2c/Makefile.am b/p2p/s2c/s2c/Makefile.am
index 352c807..0152e03 100644
--- a/p2p/s2c/s2c/Makefile.am
+++ b/p2p/s2c/s2c/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = .
 lib_LTLIBRARIES = libs2c.la
 
 libs2c_la_LIBADD = @LIBSSL_LIBADD@ -lpthread -lrt 
-libs2c_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libs2c_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libs2c_la_SOURCES = s2c_native.cxx
 
diff --git a/p2p/s2c/s2c/Makefile.in b/p2p/s2c/s2c/Makefile.in
index f12a4dd..8a944e7 100644
--- a/p2p/s2c/s2c/Makefile.in
+++ b/p2p/s2c/s2c/Makefile.in
@@ -138,7 +138,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -184,6 +183,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -208,6 +208,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -269,7 +270,7 @@ SUBDIRS = .
 #AM_CXXFLAGS = 
 lib_LTLIBRARIES = libs2c.la
 libs2c_la_LIBADD = @LIBSSL_LIBADD@ -lpthread -lrt 
-libs2c_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libs2c_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libs2c_la_SOURCES = s2c_native.cxx
 noinst_HEADERS = s2c_native.hxx
 all: all-recursive
diff --git a/presSvr/Makefile.in b/presSvr/Makefile.in
index bd0bb4e..4a5a52c 100644
--- a/presSvr/Makefile.in
+++ b/presSvr/Makefile.in
@@ -82,7 +82,6 @@ HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -128,6 +127,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -152,6 +152,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/reTurn/Makefile.in b/reTurn/Makefile.in
index d4e377b..f7ef3f9 100644
--- a/reTurn/Makefile.in
+++ b/reTurn/Makefile.in
@@ -153,7 +153,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -199,6 +198,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -223,6 +223,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/reTurn/client/Makefile.am b/reTurn/client/Makefile.am
index fb92835..987295c 100644
--- a/reTurn/client/Makefile.am
+++ b/reTurn/client/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = .
 lib_LTLIBRARIES = libreTurnClient.la
 
 libreTurnClient_la_LIBADD = @LIBSSL_LIBADD@ -lrt
-libreTurnClient_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libreTurnClient_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libreTurnClient_la_SOURCES = \
         ../AsyncSocketBase.cxx \
diff --git a/reTurn/client/Makefile.in b/reTurn/client/Makefile.in
index 74e0a42..2b8c5e5 100644
--- a/reTurn/client/Makefile.in
+++ b/reTurn/client/Makefile.in
@@ -146,7 +146,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -192,6 +191,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -216,6 +216,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -276,7 +277,7 @@ SUBDIRS = .
 #AM_CXXFLAGS = -I../../contrib/ares -DUSE_ARES
 lib_LTLIBRARIES = libreTurnClient.la
 libreTurnClient_la_LIBADD = @LIBSSL_LIBADD@ -lrt
-libreTurnClient_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libreTurnClient_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libreTurnClient_la_SOURCES = \
         ../AsyncSocketBase.cxx \
         ../AsyncTcpSocketBase.cxx \
diff --git a/reTurn/test/Makefile.in b/reTurn/test/Makefile.in
index 5916d17..84be34f 100644
--- a/reTurn/test/Makefile.in
+++ b/reTurn/test/Makefile.in
@@ -52,7 +52,6 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -98,6 +97,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -122,6 +122,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/reflow/Makefile.am b/reflow/Makefile.am
index 735f244..4e49c75 100644
--- a/reflow/Makefile.am
+++ b/reflow/Makefile.am
@@ -13,7 +13,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_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libreflow_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libreflow_la_SOURCES = FakeSelectSocketDescriptor.cxx \
         Flow.cxx \
diff --git a/reflow/Makefile.in b/reflow/Makefile.in
index 1508df8..31a711d 100644
--- a/reflow/Makefile.in
+++ b/reflow/Makefile.in
@@ -152,7 +152,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -198,6 +197,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -286,7 +287,7 @@ SUBDIRS = .
 lib_LTLIBRARIES = libreflow.la
 libreflow_la_LIBADD = ../reTurn/client/libreTurnClient.la \
 	../rutil/librutil.la @LIBSSL_LIBADD@ -lsrtp
-libreflow_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+libreflow_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libreflow_la_SOURCES = FakeSelectSocketDescriptor.cxx \
         Flow.cxx \
         FlowDtlsSocketContext.cxx \
diff --git a/repro/Makefile.am b/repro/Makefile.am
index 8435b41..4c999eb 100644
--- a/repro/Makefile.am
+++ b/repro/Makefile.am
@@ -32,7 +32,7 @@ repro_LDADD += @LIBSSL_LIBADD@ -lpthread
 
 lib_LTLIBRARIES = librepro.la
 
-librepro_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+librepro_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 librepro_la_LIBADD = -ldb_cxx
 
 librepro_la_SOURCES = \
diff --git a/repro/Makefile.in b/repro/Makefile.in
index b17e03d..10e3229 100644
--- a/repro/Makefile.in
+++ b/repro/Makefile.in
@@ -213,7 +213,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -259,6 +258,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -283,6 +283,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -352,7 +353,7 @@ repro_LDADD = librepro.la ../resip/dum/libdum.la \
 	../resip/stack/libresip.la ../rutil/librutil.la \
 	@LIBSSL_LIBADD@ -lpthread
 lib_LTLIBRARIES = librepro.la
-librepro_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+librepro_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 librepro_la_LIBADD = -ldb_cxx $(am__append_3) $(am__append_4)
 librepro_la_SOURCES = RouteStore.cxx UserStore.cxx ConfigStore.cxx \
 	AclStore.cxx StaticRegStore.cxx FilterStore.cxx SiloStore.cxx \
diff --git a/repro/reprocmd/Makefile.in b/repro/reprocmd/Makefile.in
index ff8f409..fed1a7f 100644
--- a/repro/reprocmd/Makefile.in
+++ b/repro/reprocmd/Makefile.in
@@ -75,7 +75,6 @@ DIST_SOURCES = $(reprocmd_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -121,6 +120,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -145,6 +145,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/repro/test/Makefile.in b/repro/test/Makefile.in
index 97098de..622a55c 100644
--- a/repro/test/Makefile.in
+++ b/repro/test/Makefile.in
@@ -52,7 +52,6 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -98,6 +97,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -122,6 +122,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/resip/Makefile.in b/resip/Makefile.in
index 979d1ee..fc1740c 100644
--- a/resip/Makefile.in
+++ b/resip/Makefile.in
@@ -90,7 +90,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -136,6 +135,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -160,6 +160,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/resip/certs/Makefile.in b/resip/certs/Makefile.in
index 0d8b15d..47ce0a5 100644
--- a/resip/certs/Makefile.in
+++ b/resip/certs/Makefile.in
@@ -50,7 +50,6 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -96,6 +95,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -120,6 +120,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/resip/dum/Makefile.am b/resip/dum/Makefile.am
index 9fdf461..a9043c4 100644
--- a/resip/dum/Makefile.am
+++ b/resip/dum/Makefile.am
@@ -12,7 +12,7 @@ SUBDIRS = . test
 lib_LTLIBRARIES = libdum.la
 
 libdum_la_LIBADD = @LIBSSL_LIBADD@ @LIBRADIUS_LIBADD@
-libdum_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libdum_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libdum_la_SOURCES =   \
 	AppDialog.cxx \
diff --git a/resip/dum/Makefile.in b/resip/dum/Makefile.in
index 8f2f93d..bbcc257 100644
--- a/resip/dum/Makefile.in
+++ b/resip/dum/Makefile.in
@@ -205,7 +205,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -251,6 +250,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -275,6 +275,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -337,7 +338,7 @@ SUBDIRS = . test
 #AM_CXXFLAGS = -DUSE_ARES
 lib_LTLIBRARIES = libdum.la
 libdum_la_LIBADD = @LIBSSL_LIBADD@ @LIBRADIUS_LIBADD@
-libdum_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libdum_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libdum_la_SOURCES = AppDialog.cxx AppDialogSet.cxx \
 	AppDialogSetFactory.cxx BaseCreator.cxx BaseUsage.cxx \
 	UserAuthInfo.cxx BaseSubscription.cxx ChallengeInfo.cxx \
diff --git a/resip/dum/test/Makefile.in b/resip/dum/test/Makefile.in
index 247469d..d6fb44f 100644
--- a/resip/dum/test/Makefile.in
+++ b/resip/dum/test/Makefile.in
@@ -119,7 +119,6 @@ CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -165,6 +164,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -189,6 +189,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/resip/recon/Makefile.am b/resip/recon/Makefile.am
index ae43f0b..bde209f 100644
--- a/resip/recon/Makefile.am
+++ b/resip/recon/Makefile.am
@@ -15,7 +15,7 @@ librecon_la_LIBADD = ../../reflow/libreflow.la
 librecon_la_LIBADD += ../../reTurn/client/libreTurnClient.la
 librecon_la_LIBADD += ../../rutil/librutil.la
 librecon_la_LIBADD += @LIBSSL_LIBADD@ -lsrtp
-librecon_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+librecon_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 librecon_la_SOURCES = BridgeMixer.cxx \
         Conversation.cxx \
diff --git a/resip/recon/Makefile.in b/resip/recon/Makefile.in
index 0525216..d90a6b5 100644
--- a/resip/recon/Makefile.in
+++ b/resip/recon/Makefile.in
@@ -151,7 +151,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -197,6 +196,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -221,6 +221,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -286,7 +287,7 @@ lib_LTLIBRARIES = librecon.la
 librecon_la_LIBADD = ../../reflow/libreflow.la \
 	../../reTurn/client/libreTurnClient.la ../../rutil/librutil.la \
 	@LIBSSL_LIBADD@ -lsrtp
-librecon_la_LDFLAGS = -version-info 0:0:0 -release 1 -export-dynamic
+librecon_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 librecon_la_SOURCES = BridgeMixer.cxx \
         Conversation.cxx \
         ConversationManager.cxx \
diff --git a/resip/stack/Makefile.am b/resip/stack/Makefile.am
index 64be7fb..45717d3 100644
--- a/resip/stack/Makefile.am
+++ b/resip/stack/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS = . test
 lib_LTLIBRARIES = libresip.la
 
 libresip_la_LIBADD = @LIBSSL_LIBADD@
-libresip_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libresip_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 libresip_la_SOURCES = \
 	Auth.cxx \
diff --git a/resip/stack/Makefile.in b/resip/stack/Makefile.in
index 0c87dfa..bf022a8 100644
--- a/resip/stack/Makefile.in
+++ b/resip/stack/Makefile.in
@@ -225,7 +225,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -271,6 +270,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -295,6 +295,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -367,7 +368,7 @@ SUBDIRS = . test
 #AM_CXXFLAGS = -I../../contrib/ares -DUSE_ARES
 lib_LTLIBRARIES = libresip.la
 libresip_la_LIBADD = @LIBSSL_LIBADD@
-libresip_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libresip_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libresip_la_SOURCES = Auth.cxx CSeqCategory.cxx CallId.cxx \
 	DateCategory.cxx ExpiresCategory.cxx GenericUri.cxx \
 	IntegerCategory.cxx InteropHelper.cxx UInt32Category.cxx \
diff --git a/resip/stack/test/Makefile.in b/resip/stack/test/Makefile.in
index 9a0da05..56c122d 100644
--- a/resip/stack/test/Makefile.in
+++ b/resip/stack/test/Makefile.in
@@ -409,7 +409,6 @@ CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -455,6 +454,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -479,6 +479,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/rutil/Makefile.am b/rutil/Makefile.am
index 38771fb..6251b5e 100644
--- a/rutil/Makefile.am
+++ b/rutil/Makefile.am
@@ -23,7 +23,7 @@ librutil_la_LIBADD = $(LIBSSL_LIBADD)
 librutil_la_LIBADD += $(LIBRADIUS_LIBADD)
 librutil_la_LIBADD += $(LIBARES_LIBADD)
 #librutil_la_LIBADD += -lrt
-librutil_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+librutil_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 
 librutil_la_SOURCES = \
 	AbstractFifo.cxx \
diff --git a/rutil/Makefile.in b/rutil/Makefile.in
index 832c0a4..4e5d858 100644
--- a/rutil/Makefile.in
+++ b/rutil/Makefile.in
@@ -187,7 +187,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -233,6 +232,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -257,6 +257,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -323,7 +324,7 @@ lib_LTLIBRARIES = librutil.la
 librutil_la_LIBADD = $(LIBSSL_LIBADD) $(LIBRADIUS_LIBADD) \
 	$(LIBARES_LIBADD)
 #librutil_la_LIBADD += -lrt
-librutil_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+librutil_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 librutil_la_SOURCES = AbstractFifo.cxx BaseException.cxx Coders.cxx \
 	Condition.cxx ConfigParse.cxx CountStream.cxx \
 	ServerProcess.cxx Data.cxx DataStream.cxx DnsUtil.cxx \
diff --git a/rutil/dns/ares/Makefile.am b/rutil/dns/ares/Makefile.am
index 84f3ec0..e788077 100644
--- a/rutil/dns/ares/Makefile.am
+++ b/rutil/dns/ares/Makefile.am
@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign
 #INCLUDES = -I$(top_srcdir)
 
 lib_LTLIBRARIES = libresipares.la
-libresipares_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libresipares_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libresipares_la_SOURCES = \
 	ares__close_sockets.c ares__get_hostent.c ares__read_line.c \
 	ares_destroy.c ares_expand_name.c ares_fds.c ares_free_errmem.c \
diff --git a/rutil/dns/ares/Makefile.in b/rutil/dns/ares/Makefile.in
index b3726c8..f1b67f4 100644
--- a/rutil/dns/ares/Makefile.in
+++ b/rutil/dns/ares/Makefile.in
@@ -109,7 +109,6 @@ HEADERS = $(libresipares_la_HEADERS) $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -155,6 +154,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -179,6 +179,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -244,7 +245,7 @@ AUTOMAKE_OPTIONS = foreign
 
 #INCLUDES = -I$(top_srcdir)
 lib_LTLIBRARIES = libresipares.la
-libresipares_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libresipares_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libresipares_la_SOURCES = \
 	ares__close_sockets.c ares__get_hostent.c ares__read_line.c \
 	ares_destroy.c ares_expand_name.c ares_fds.c ares_free_errmem.c \
diff --git a/rutil/test/Makefile.in b/rutil/test/Makefile.in
index 30057a4..c990154 100644
--- a/rutil/test/Makefile.in
+++ b/rutil/test/Makefile.in
@@ -175,7 +175,6 @@ CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -221,6 +220,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -245,6 +245,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/tfm/Makefile.am b/tfm/Makefile.am
index 71e2e75..b05eb6b 100644
--- a/tfm/Makefile.am
+++ b/tfm/Makefile.am
@@ -17,7 +17,7 @@ SUBDIRS += tfdum
 
 lib_LTLIBRARIES = libtfm.la
 
-libtfm_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libtfm_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libtfm_la_LIBADD = ../repro/librepro.la
 libtfm_la_LIBADD += ../resip/dum/libdum.la
 libtfm_la_LIBADD += ../resip/stack/libresip.la
diff --git a/tfm/Makefile.in b/tfm/Makefile.in
index ce05ae1..4a3b90a 100644
--- a/tfm/Makefile.in
+++ b/tfm/Makefile.in
@@ -148,7 +148,6 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -194,6 +193,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -218,6 +218,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -281,7 +282,7 @@ EXTRA_DIST = LICENSE README tfm.sln tfcommon *.vcproj
 #EXTRA_DIST += contrib
 SUBDIRS = . repro tfdum
 lib_LTLIBRARIES = libtfm.la
-libtfm_la_LDFLAGS = -version-info 0:0:0 -release @ABIVERSION@ -export-dynamic
+libtfm_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
 libtfm_la_LIBADD = ../repro/librepro.la ../resip/dum/libdum.la \
 	../resip/stack/libresip.la ../rutil/librutil.la \
 	@LIBSSL_LIBADD@ -lpthread -ldb_cxx -lcppunit -lNetxx
diff --git a/tfm/repro/Makefile.in b/tfm/repro/Makefile.in
index 4577907..74424ef 100644
--- a/tfm/repro/Makefile.in
+++ b/tfm/repro/Makefile.in
@@ -79,7 +79,6 @@ CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -125,6 +124,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -149,6 +149,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff --git a/tfm/tfdum/Makefile.in b/tfm/tfdum/Makefile.in
index 061775f..0317562 100644
--- a/tfm/tfdum/Makefile.in
+++ b/tfm/tfdum/Makefile.in
@@ -91,7 +91,6 @@ CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIVERSION = @ABIVERSION@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -137,6 +136,7 @@ LIBRADIUS_LIBADD = @LIBRADIUS_LIBADD@
 LIBS = @LIBS@
 LIBSSL_LIBADD = @LIBSSL_LIBADD@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_VERSION_RELEASE = @LIBTOOL_VERSION_RELEASE@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -161,6 +161,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SO_RELEASE = @SO_RELEASE@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@

-- 
reSIProcate

More information about the Pkg-voip-commits mailing list