summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco d'Itri <md@linux.it>2017-12-27 03:39:19 +0100
committerMarco d'Itri <md@linux.it>2018-01-08 02:15:53 +0100
commit5d60bbe102b71c03b9a46eb0a7aada3532bd4481 (patch)
tree46ea01ee6de8d0999d141dc8f64ae275e5098e17
parent0af8984ad7f6c7b52a01618036852b27d0cab415 (diff)
downloadwhois-5d60bbe102b71c03b9a46eb0a7aada3532bd4481.tar.gz
Abort the build if the old HAVE_LIBIDN variable is defined
To encourage maintainers to automatically detect libidn2 and hopefully switch to it.
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c7b516a..ac49788 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,11 @@ ifdef LOCALEDIR
DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
endif
+# libidn support has been autodetected since 5.2.18
+ifdef HAVE_LIBIDN
+$(error Please fix your build system to stop defining HAVE_LIBIDN!)
+endif
+
ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
@@ -104,11 +109,11 @@ servers_charset.h: servers_charset_list make_servers_charset.pl
afl:
$(MAKE) whois \
CC=afl-gcc AFL_HARDEN=1 \
- HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
+ HAVE_ICONV=1 DEFS=-DAFL_MODE=1
afl2:
$(MAKE) whois \
- HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
+ HAVE_ICONV=1 DEFS=-DAFL_MODE=1
afl-run:
nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois