diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:48:58 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:48:58 +0200 |
| commit | d8d5781c1eb031477670facc132e198f8fddd56c (patch) | |
| tree | 83321f8585606cf74e85a1b3d1ce6aed1481e1a1 | |
| parent | c1bf4024a16291b4371333db2b86bd1e1d227e13 (diff) | |
Remove libidn checks/support
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/shared/build.h | 9 |
2 files changed, 1 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 6924e01a1c..ac52595138 100644 --- a/configure.ac +++ b/configure.ac @@ -498,21 +498,6 @@ 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])) if test "x$enable_binfmt" != "xno"; then @@ -1056,7 +1041,6 @@ AC_MSG_RESULT([ SMACK: ${have_smack} ACL: ${have_acl} libcurl: ${have_libcurl} - libidn: ${have_libidn} binfmt: ${have_binfmt} vconsole: ${have_vconsole} bootchart: ${have_bootchart} diff --git a/src/shared/build.h b/src/shared/build.h index 42b34933c6..c276154de1 100644 --- a/src/shared/build.h +++ b/src/shared/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_ |