Merge branch 'sb/fetch' into jc/refs-and-fetch

diff --git a/Makefile b/Makefile
index 65fb8284f3c9ef210c08711b5ce4796593e72e75..efcf3fb293f1effb9184ffc50d78767a89f20e96 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -525,6 +525,9 @@ endif
 ifdef NO_INET_NTOP
        LIB_OBJS += compat/inet_ntop.o
 endif
+ifdef NO_INET_PTON
+       LIB_OBJS += compat/inet_pton.o
+endif
 
 ifdef NO_ICONV
        ALL_CFLAGS += -DNO_ICONV