Revert "Remove ./configure --disable-runtime"

This reverts commit cd5a11b7a5.
This commit is contained in:
Tim Rühsen 2015-12-25 19:40:24 +01:00
parent cd5a11b7a5
commit 620e62348a
2 changed files with 4 additions and 0 deletions

View File

@ -10,6 +10,7 @@ env:
- RUNTIME=libicu - RUNTIME=libicu
- RUNTIME=libidn2 - RUNTIME=libidn2
- RUNTIME=libidn - RUNTIME=libidn
- RUNTIME=no
addons: addons:
apt: apt:

View File

@ -96,6 +96,7 @@ AC_ARG_ENABLE(runtime,
libicu [[default]]: IDNA2008 UTS#46 library libicu [[default]]: IDNA2008 UTS#46 library
libidn2: IDNA2008 library (also needs libunistring) libidn2: IDNA2008 library (also needs libunistring)
libidn: IDNA2003 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 if test "$enableval" = "libicu" -o "$enableval" = "yes"; then
enable_runtime=libicu enable_runtime=libicu
@ -106,6 +107,8 @@ AC_ARG_ENABLE(runtime,
elif test "$enableval" = "libidn"; then elif test "$enableval" = "libidn"; then
enable_runtime=libidn enable_runtime=libidn
AC_DEFINE([WITH_LIBIDN], [1], [generate PSL data using libidn]) AC_DEFINE([WITH_LIBIDN], [1], [generate PSL data using libidn])
elif test "$enableval" = "no"; then
enable_runtime=no
else else
AC_MSG_ERROR([Unknown value $enableval for --enable-runtime]) AC_MSG_ERROR([Unknown value $enableval for --enable-runtime])
fi fi