From: Sven Eden Date: Mon, 16 Jan 2017 07:42:48 +0000 (+0100) Subject: Remove libidn feature X-Git-Tag: v226.4~1^2~53 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2ce8152bd305e6cb29732222649db8b662e10113 Remove libidn feature --- diff --git a/Makefile.am b/Makefile.am index 988173d8c..8205994ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -409,14 +409,12 @@ endif libshared_la_CFLAGS = \ $(AM_CFLAGS) \ $(ACL_CFLAGS) \ - $(LIBIDN_CFLAGS) \ $(SECCOMP_CFLAGS) libshared_la_LIBADD = \ libelogind-internal.la \ $(UDEV_LIBS) \ $(ACL_LIBS) \ - $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) gperf_txt_sources = \ diff --git a/src/basic/build.h b/src/basic/build.h index 42b34933c..566bb74d8 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -63,12 +63,6 @@ #define _BLKID_FEATURE_ "-BLKID" #endif -#ifdef HAVE_LIBIDN -#define _IDN_FEATURE_ "+IDN" -#else -#define _IDN_FEATURE_ "-IDN" -#endif - #define SYSTEMD_FEATURES \ _PAM_FEATURE_ " " \ _SELINUX_FEATURE_ " " \ @@ -76,5 +70,4 @@ _SMACK_FEATURE_ " " \ _ACL_FEATURE_ " " \ _SECCOMP_FEATURE_ " " \ - _BLKID_FEATURE_ " " \ - _IDN_FEATURE_ + _BLKID_FEATURE_ " "