Include -lresolv only if we have it

diff --git a/citadel/GNUmakefile b/citadel/GNUmakefile
index de1c34b66e2ea2c0e3d81e052ca73ed1ab557424..5209a31cd6dce2a07abdbe6d182feb86db09089c 100644 (file)
--- 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 d53afb939e54a6c1d38ade36b520e44beeb4d402..8f6804489b693252160d027d33626ad794a9ab7f 100755 (executable)
--- 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