From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 18 Jan 2009 20:44:50 +0000 (+0000)
Subject: Remove configure check for resolv.h -- it is apparently not needed
X-Git-Tag: Release-7.0.0~3454
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f03f7e253a641f005330b4ddac680e3077f05304;p=bacula%2Fbacula

Remove configure check for resolv.h -- it is apparently not needed
     and causes build warnings on FreeBSD.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8375 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 76a910d1bd..a78a5e39d3 100644
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -566,9 +566,6 @@
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
 
-/* Define to 1 if you have the <resolv.h> header file. */
-#undef HAVE_RESOLV_H
-
 /* Define if sa_len field exists in struct sockaddr */
 #undef HAVE_SA_LEN
 
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 4bb7e07335..071ea4fb7e 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1695,7 +1695,6 @@ AC_CHECK_HEADERS( \
    sys/time.h \
    sys/types.h \
    arpa/nameser.h \
-   resolv.h \
    mtio.h \
    sys/mtio.h \
    sys/tape.h \
diff --git a/bacula/configure b/bacula/configure
index 6ed1ee9080..10a1a32c69 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -30554,7 +30554,6 @@ fi
 
 
 
-
 
 
 for ac_header in \
@@ -30583,7 +30582,6 @@ for ac_header in \
    sys/time.h \
    sys/types.h \
    arpa/nameser.h \
-   resolv.h \
    mtio.h \
    sys/mtio.h \
    sys/tape.h \
diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index 5932e89bd3..ac0df0bbb3 100644
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -39,7 +39,7 @@
 #include <arpa/nameser.h>
 #endif
 #ifdef HAVE_RESOLV_H
-#include <resolv.h>
+//#include <resolv.h>
 #endif
 
 static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultport, int family,
diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index eb3969d199..ef153327b4 100644
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -42,7 +42,7 @@
 #include <arpa/nameser.h>
 #endif
 #ifdef HAVE_RESOLV_H
-#include <resolv.h>
+//#include <resolv.h>
 #endif
 
 
@@ -238,4 +238,3 @@ bnet_thread_server(dlist *addrs, int max_clients, workq_t *client_wq,
             be.bstrerror());
    }
 }
-
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 64a7258e58..a9d02eb46f 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -11,6 +11,8 @@ mixed priorities
 
 General:
 18Jan09
+kes  Remove configure check for resolv.h -- it is apparently not needed
+     and causes build warnings on FreeBSD.
 kes  Ensure that the installer and newinstaller Makefiles are called
      during a make clean.
 12Jan09