Imported Upstream version 0.1.17

[platform/upstream/libnice.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2a11c5c..04c1614 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Always compile with -Wall; if --enable-compile-warnings=error is passed,
 dnl also use -Werror. git and pre-releases default to -Werror
 
 dnl use a three digit version number for releases, and four for cvs/prerelease
-AC_INIT([libnice],[0.1.16])
+AC_INIT([libnice],[0.1.17])
 LIBNICE_RELEASE="yes"
 
 AC_CANONICAL_TARGET
@@ -39,9 +39,9 @@ AC_CONFIG_FILES([
 #      Increment CURRENT and AGE. Set REVISION to 0
 #    If there was an incompatible interface change:
 #      Increment CURRENT. Set AGE and REVISION to 0
-LIBNICE_CURRENT=19
+LIBNICE_CURRENT=20
 LIBNICE_REVISION=0
-LIBNICE_AGE=9
+LIBNICE_AGE=10
 LIBNICE_LIBVERSION=${LIBNICE_CURRENT}:${LIBNICE_REVISION}:${LIBNICE_AGE}
 LIBNICE_LT_LDFLAGS="-version-info ${LIBNICE_LIBVERSION} -no-undefined"
 AC_SUBST(LIBNICE_LT_LDFLAGS)
@@ -95,9 +95,9 @@ AC_CHECK_HEADERS([ifaddrs.h],
 AC_CHECK_TYPES([size_t, ssize_t])
 
 # Also put matching version in LIBNICE_CFLAGS
-GLIB_REQ=2.48
+GLIB_REQ=2.54
 
-LIBNICE_CFLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_44"
+LIBNICE_CFLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_54 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_54"
 
 dnl Support different levels of compiler error reporting.
 dnl This configure flag is designed to mimic one from gnome-common,
@@ -395,16 +395,18 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 # GObject introspection
 GOBJECT_INTROSPECTION_CHECK([1.30.0])
 
-dnl Ignore a specific network interface name prefix from the connection check
-AC_MSG_CHECKING([whether to ignore a specific network interface name prefix])
+dnl Ignore specific network interface name prefixes from the connection check
+AC_MSG_CHECKING([whether to ignore specific network interface name prefixes])
 AC_ARG_WITH([ignored-network-interface-prefix],
-  [AS_HELP_STRING([--with-ignored-network-interface-prefix=string],
-    [Ignore network interfaces whose name starts with "string" from the ICE connection
+  [AS_HELP_STRING([--with-ignored-network-interface-prefix=string@<:@,string...@:>@],
+    [Ignore network interfaces whose name starts with a string from this list in the ICE connection
      check algorithm. For example, interfaces "virbr" in the case of the virtual bridge
      handled by libvirtd, do not help in finding connectivity.])],
-    [interface_prefix="$withval"])
-AS_IF([test -n "$interface_prefix"],
-  [AC_DEFINE_UNQUOTED([IGNORED_IFACE_PREFIX],["$interface_prefix"],
+    [interface_prefix="$withval"],
+    [interface_prefix="docker,veth,virbr,vnet"])
+AS_IF([test -n "$interface_prefix" && test "x$interface_prefix" != "xno"],
+  [[interface_prefix_list=`echo $interface_prefix | sed 's/,/","/g'`]
+   AC_DEFINE_UNQUOTED([IGNORED_IFACE_PREFIX],["$interface_prefix_list"],
     [Ignore this network interface prefix from the connection check])
    AC_MSG_RESULT([yes, $interface_prefix])],
   [AC_MSG_RESULT([no])])