nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abort the build if the old HAVE_LIBIDN variable is defined

Browse Source 
To encourage maintainers to automatically detect libidn2 and hopefully
switch to it.
This commit is contained in:
Marco d'Itri 2017-12-27 03:39:19 +01:00
parent 0af8984ad7
commit 5d60bbe102
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -33,6 +33,11 @@ ifdef LOCALEDIR
DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
endif 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),) ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2) whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2) DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
@ -104,11 +109,11 @@ servers_charset.h: servers_charset_list make_servers_charset.pl
afl: afl:
$(MAKE) whois \ $(MAKE) whois \
CC=afl-gcc AFL_HARDEN=1 \ CC=afl-gcc AFL_HARDEN=1 \
HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
afl2: afl2:
$(MAKE) whois \ $(MAKE) whois \
HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
afl-run: afl-run:
nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois