Stop check_dns from compiling if nslookup does not exist (Sakari Lehtonen -

1412721)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1338 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/THANKS.in b/THANKS.in
index 1fd52c9012ff90fd88e75a2e4e089e64a56142df..3a1090ef995adebcb88255a28d5d5c43e1a5ad1f 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -177,3 +177,4 @@ Jon Vandegrift
 Jason Crawford
 Steven Kreuzer
 Johan Fischer
+Sakari Lehtonen

diff --git a/configure.in b/configure.in
index 6ce6b0b1f1e69e7612d4dd86aeb72fb5e51796f6..40a323c5345e71700813a418be99c7c1116b45dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1209,17 +1209,17 @@ fi
 fi
 
 
-AC_MSG_CHECKING(for nslookup syntax)
 AC_ARG_WITH(nslookup_command,
             ACX_HELP_STRING([--with-nslookup-command=PATH],
                             [sets path to nslookup executable]),
             ac_cv_nslookup_command=$withval)
 if test -n "$ac_cv_nslookup_command"; then
-       AC_MSG_RESULT([(command line) $ac_cv_nslookup_command])
+       AC_MSG_NOTICE([Using specific nslookup at $ac_cv_nslookup_command])
 else
        AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
        if test -n "$PATH_TO_NSLOOKUP"
        then
+               AC_MSG_CHECKING(for nslookup syntax)
                if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
                then
                        ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
@@ -1240,12 +1240,6 @@ if test -n "$ac_cv_nslookup_command"; then
        AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup])
 fi
 
-AC_PATH_PROG(PATH_TO_HOST,host)
-if test -n "$ac_cv_path_PATH_TO_HOST"
-then
-       EXTRAS="$EXTRAS check_dns"
-fi
-
 AC_PATH_PROG(PATH_TO_UPTIME,uptime)
 AC_ARG_WITH(uptime_command,
             ACX_HELP_STRING([--with-uptime-command=PATH],