Skip to content

Commit c707c6b

Browse files
committed
uplink: Fix build on MacOS, res_init in -lresolv
1 parent c4e4c1e commit c707c6b

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/Makefile.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ INSTALL_PROGRAM=$(INSTALL) -m 755
6161
INSTALL_DATA= $(INSTALL) -m 644
6262
INSTALL_DIR=$(INSTALL) -m 755 -d
6363

64-
LIBS= @LIBEVENT@ @LIBM@ @LIBRT@ @LIBPTHREAD@ @LIBSOCKET@ @LIBGETNAMEINFO@ @LIBCAP@ @LIBZ@ @LIBCRYPTO@ @LIBSSL@
64+
LIBS= @LIBEVENT@ @LIBM@ @LIBRT@ @LIBPTHREAD@ \
65+
@LIBSOCKET@ @LIBGETNAMEINFO@ \
66+
@LIBCAP@ @LIBRESOLV@ @LIBZ@ @LIBCRYPTO@ @LIBSSL@
6567

6668
#LIBS += -L/data/www/mapt1/extsrc/libevent-2.0.14-stable/installed/usr/local/lib
6769
#CFLAGS += -I/data/www/mapt1/extsrc/libevent-2.0.14-stable/installed/usr/local/include

src/configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ AC_CHECK_HEADERS([sys/epoll.h], AC_DEFINE([HAVE_SYS_EPOLL_H]))
8181
dnl Check for MacOS struct stat
8282
AC_CHECK_MEMBER([struct stat.st_mtimespec], AC_DEFINE([HAVE_STAT_ST_MTIMESPEC], [], [MacOS struct stat.st_mtimespec]))
8383

84+
dnl Check for res_init in libresolv
85+
AC_SUBST(LIBRESOLV)
86+
AC_CHECK_LIB(resolv,res_init,[LIBRESOLV="-lresolv"])
87+
8488
dnl SCTP checks
8589
AC_CHECK_HEADERS([netinet/sctp.h], AC_DEFINE([HAVE_NETINET_SCTP_H]))
8690

0 commit comments

Comments
 (0)