From 6bf7bb2410e05b042dcaa7aa71354960056158d2 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 1 Sep 2023 22:37:20 -0400
Subject: [PATCH] Include -lresolv only if we have it

---
 citadel/GNUmakefile |  2 +-
 citadel/configure   | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/citadel/GNUmakefile b/citadel/GNUmakefile
index de1c34b66..5209a31cd 100644
--- a/citadel/GNUmakefile
+++ b/citadel/GNUmakefile
@@ -32,7 +32,7 @@ citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
 	${CC} ${CFLAGS} \
 		$(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
 		${LDFLAGS} \
-		-lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \
+		-lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${LRESOLV} ${BACKEND_LDFLAGS} \
 		-o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
diff --git a/citadel/configure b/citadel/configure
index d53afb939..8f6804489 100755
--- a/citadel/configure
+++ b/citadel/configure
@@ -113,7 +113,33 @@ $CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile && {
 	}
 }
 
+
+########################################################################
+# Test for -lresolv
+########################################################################
+echo Testing for lresolv...
+tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/configure.$$
+tempcc=${tempfile}.c
+cat >$tempcc <<!
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <iconv.h>
+int main(int argc, char **argv) {
+	return(0);
+}
+!
+
+$CC $CFLAGS $CPPFLAGS $tempcc -lresolv -o $tempfile && {
+	LRESOLV='-lresolv'
+} || {
+	LRESOLV=''
+}
+
+
+########################################################################
 # This is needed to link Berkeley DB.  We will add more here later.
+########################################################################
 BACKEND_LDFLAGS=-ldb
 
 
@@ -133,6 +159,7 @@ CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"'
 	echo "CC := ${CC}"
 	echo "CFLAGS := ${CFLAGS} ${CPPFLAGS}"
 	echo "LDFLAGS := ${LDFLAGS}"
+	echo "LRESOLV := ${LRESOLV}"
 	echo "BACKEND_LDFLAGS := ${BACKEND_LDFLAGS}"
 ) >config.mk
 
-- 
2.39.2