--- tack/Makefile.in
+++ tack/Makefile.in	2012-03-05 11:30:45.000000000 +0000
@@ -93,7 +93,7 @@ ABI_VERSION	= @cf_cv_abi_version@
 LOCAL_LIBDIR	= @top_builddir@/lib
 
 LD		= @LD@
-LINK		= @LINK_PROGS@ $(LIBTOOL_LINK)
+LINK		= @LINK_PROGS@ $(CC)
 LDFLAGS		= @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \
 		  @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@
 
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c	2017-04-24 07:47:15.533617238 +0000
@@ -752,7 +752,7 @@ _nc_read_entry2(const char *const name,
     return code;
 }
 
-#if NCURSES_EXT_NUMBERS
+#if !NCURSES_EXT_NUMBERS
 /*
  * This entrypoint is used by tack.
  */