Remove libidn checks/support

diff --git a/configure.ac b/configure.ac
index 6924e01a1c496d25bc39bd2b9d98691e1ed38935..ac52595138aeef6a645a7e2b786ec81a655a6204 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -497,21 +497,6 @@ if test "x$enable_libcurl" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"])
 
 fi
 AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"])
 

-# ------------------------------------------------------------------------------
-have_libidn=no
-AC_ARG_ENABLE(libidn, AS_HELP_STRING([--disable-libidn], [Disable optional LIBIDN support]))
-if test "x$enable_libidn" != "xno"; then
-        PKG_CHECK_MODULES(LIBIDN, [libidn],
-               [AC_DEFINE(HAVE_LIBIDN, 1, [Define if libidn is available])
-                have_libidn=yes
-                M4_DEFINES="$M4_DEFINES -DHAVE_LIBIDN"],
-               [have_libidn=no])
-        if test "x$have_libidn" = "xno" -a "x$enable_libidn" = "xyes"; then
-                AC_MSG_ERROR([*** libidn support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"])
-

 # ------------------------------------------------------------------------------
 have_binfmt=no
 AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool]))
 # ------------------------------------------------------------------------------
 have_binfmt=no
 AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool]))


@@ -1056,7 +1041,6 @@ AC_MSG_RESULT([
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
         libcurl:                 ${have_libcurl}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
         libcurl:                 ${have_libcurl}

-        libidn:                  ${have_libidn}

         binfmt:                  ${have_binfmt}
         vconsole:                ${have_vconsole}
         bootchart:               ${have_bootchart}
         binfmt:                  ${have_binfmt}
         vconsole:                ${have_vconsole}
         bootchart:               ${have_bootchart}

diff --git a/src/shared/build.h b/src/shared/build.h
index 42b34933c60750c7dd51355d6f9abbd899e352d1..c276154de13140e71fc339939425707537e9bd74 100644 (file)
--- a/src/shared/build.h
+++ b/src/shared/build.h
@@ -63,12 +63,6 @@
 #define _BLKID_FEATURE_ "-BLKID"
 #endif
 
 #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_ " "                                           \
 #define SYSTEMD_FEATURES                                                \
         _PAM_FEATURE_ " "                                               \
         _SELINUX_FEATURE_ " "                                           \


@@ -76,5 +70,4 @@
         _SMACK_FEATURE_ " "                                             \
         _ACL_FEATURE_ " "                                               \
         _SECCOMP_FEATURE_ " "                                           \
         _SMACK_FEATURE_ " "                                             \
         _ACL_FEATURE_ " "                                               \
         _SECCOMP_FEATURE_ " "                                           \

-        _BLKID_FEATURE_ " "                                             \
-        _IDN_FEATURE_
+        _BLKID_FEATURE_