diff options
-rw-r--r-- | THANKS.in | 1 | ||||
-rw-r--r-- | configure.in | 10 |
2 files changed, 3 insertions, 8 deletions
@@ -177,3 +177,4 @@ Jon Vandegrift | |||
177 | Jason Crawford | 177 | Jason Crawford |
178 | Steven Kreuzer | 178 | Steven Kreuzer |
179 | Johan Fischer | 179 | Johan Fischer |
180 | Sakari Lehtonen | ||
diff --git a/configure.in b/configure.in index 6ce6b0b1..40a323c5 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1209,17 +1209,17 @@ fi | |||
1209 | fi | 1209 | fi |
1210 | 1210 | ||
1211 | 1211 | ||
1212 | AC_MSG_CHECKING(for nslookup syntax) | ||
1213 | AC_ARG_WITH(nslookup_command, | 1212 | AC_ARG_WITH(nslookup_command, |
1214 | ACX_HELP_STRING([--with-nslookup-command=PATH], | 1213 | ACX_HELP_STRING([--with-nslookup-command=PATH], |
1215 | [sets path to nslookup executable]), | 1214 | [sets path to nslookup executable]), |
1216 | ac_cv_nslookup_command=$withval) | 1215 | ac_cv_nslookup_command=$withval) |
1217 | if test -n "$ac_cv_nslookup_command"; then | 1216 | if test -n "$ac_cv_nslookup_command"; then |
1218 | AC_MSG_RESULT([(command line) $ac_cv_nslookup_command]) | 1217 | AC_MSG_NOTICE([Using specific nslookup at $ac_cv_nslookup_command]) |
1219 | else | 1218 | else |
1220 | AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup) | 1219 | AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup) |
1221 | if test -n "$PATH_TO_NSLOOKUP" | 1220 | if test -n "$PATH_TO_NSLOOKUP" |
1222 | then | 1221 | then |
1222 | AC_MSG_CHECKING(for nslookup syntax) | ||
1223 | if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null | 1223 | if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null |
1224 | then | 1224 | then |
1225 | ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" | 1225 | ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" |
@@ -1240,12 +1240,6 @@ if test -n "$ac_cv_nslookup_command"; then | |||
1240 | AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) | 1240 | AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) |
1241 | fi | 1241 | fi |
1242 | 1242 | ||
1243 | AC_PATH_PROG(PATH_TO_HOST,host) | ||
1244 | if test -n "$ac_cv_path_PATH_TO_HOST" | ||
1245 | then | ||
1246 | EXTRAS="$EXTRAS check_dns" | ||
1247 | fi | ||
1248 | |||
1249 | AC_PATH_PROG(PATH_TO_UPTIME,uptime) | 1243 | AC_PATH_PROG(PATH_TO_UPTIME,uptime) |
1250 | AC_ARG_WITH(uptime_command, | 1244 | AC_ARG_WITH(uptime_command, |
1251 | ACX_HELP_STRING([--with-uptime-command=PATH], | 1245 | ACX_HELP_STRING([--with-uptime-command=PATH], |