Browse Source

Merge pull request #4194 from MikePetullo/loudmouth

loudmouth: patch to avoid libidn
lilik-openwrt-22.03
Hannu Nyman 8 years ago
committed by GitHub
parent
commit
9baf420ff9
2 changed files with 41 additions and 1 deletions
  1. +2
    -1
      libs/loudmouth/Makefile
  2. +39
    -0
      libs/loudmouth/patches/001-allow-disable-libidn.patch

+ 2
- 1
libs/loudmouth/Makefile View File

@ -41,7 +41,8 @@ define Package/loudmouth/description
endef
CONFIGURE_ARGS += \
--with-ssl=openssl
--with-ssl=openssl \
--with-idn=no
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/


+ 39
- 0
libs/loudmouth/patches/001-allow-disable-libidn.patch View File

@ -0,0 +1,39 @@
diff --git a/configure.ac b/configure.ac
index 8435d9a..148453c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,9 +109,22 @@ else
fi
AC_SUBST([TEST_DIRS])
-PKG_CHECK_MODULES(LIBIDN, libidn, have_idn=yes, have_idn=no)
-if test "x$have_idn" = "xyes"; then
- AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
+dnl +--------------------------------------------------------+
+dnl | Checking for libidn support |-
+dnl +--------------------------------------------------------+
+AC_ARG_WITH(idn,
+ AS_HELP_STRING([--with-idn=@<:@auto|no@:>@],
+ [Whether to use libidn [[default=auto]]]),
+ ac_idn=$withval,
+ ac_idn=auto)
+
+if test "x$ac_idn" = "xauto"; then
+ PKG_CHECK_MODULES(LIBIDN, libidn, enable_idn=yes, enable_idn=no)
+ if test "x$enable_idn" = "xyes"; then
+ AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
+ fi
+else
+ enable_idn=no
fi
dnl Gtk doc
@@ -323,7 +336,7 @@ echo "
prefix: ${prefix}
compiler: ${CC}
- Have IDN support: ${have_idn}
+ Enable IDN support: ${enable_idn}
Enable SSL: ${enable_ssl}
Asynchronous DNS: ${enable_asyncns}
Linux TCP keepalives: ${use_keepalives}

Loading…
Cancel
Save