From 620e62348a9bcbddb7e8d282a22f06edb5923db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Fri, 25 Dec 2015 19:40:24 +0100 Subject: [PATCH] Revert "Remove ./configure --disable-runtime" This reverts commit cd5a11b7a57e11cca0f3dbe6113d6159b7617087. --- .travis.yml | 1 + configure.ac | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4290894..3a0823c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - RUNTIME=libicu - RUNTIME=libidn2 - RUNTIME=libidn + - RUNTIME=no addons: apt: diff --git a/configure.ac b/configure.ac index 44e70a8..1a8698b 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,7 @@ AC_ARG_ENABLE(runtime, libicu [[default]]: IDNA2008 UTS#46 library libidn2: IDNA2008 library (also needs libunistring) libidn: IDNA2003 library (also needs libunistring) + --disable-runtime Do not link runtime IDNA functionality ], [ if test "$enableval" = "libicu" -o "$enableval" = "yes"; then enable_runtime=libicu @@ -106,6 +107,8 @@ AC_ARG_ENABLE(runtime, elif test "$enableval" = "libidn"; then enable_runtime=libidn AC_DEFINE([WITH_LIBIDN], [1], [generate PSL data using libidn]) + elif test "$enableval" = "no"; then + enable_runtime=no else AC_MSG_ERROR([Unknown value $enableval for --enable-runtime]) fi