X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=configure.in;h=81bda6c283b9319c9d3aa8cd9d10bb8747d42dc8;hb=0e3c217d90ea9af230a002e06104c147c54ab01a;hp=4e0149445830e37f6250621de248d2dddb8e1b5e;hpb=f9965ec69dcade8ba683a3989b93a1d118411b87;p=ircu2.10.12-pk.git

diff --git a/configure.in b/configure.in
index 4e01494..81bda6c 100644
--- a/configure.in
+++ b/configure.in
@@ -106,6 +106,11 @@ AC_SEARCH_LIBS(crypt, descrypt crypt, ,
 dnl Do all the checks necessary to figure out -lnsl / -lsocket stuff
 AC_LIBRARY_NET
 
+dnl Look for res_mkquery.  Done after AC_LIBRARY_NET in case res_mkquery
+dnl is in one of those libraries somewhere.
+AC_SEARCH_LIBS(res_mkquery, resolv, ,
+[AC_MSG_ERROR([Unable to find library containing res_mkquery()])])
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(poll.h sys/devpoll.h sys/event.h)
@@ -284,19 +289,6 @@ if test x"$unet_cv_enable_symbols" = xyes; then
     CFLAGS="-g $CFLAGS"
 fi
 
-dnl Check for --disable-headinsand
-AC_MSG_CHECKING([whether to enable head in sand 'features'])
-AC_ARG_ENABLE([headinsand],
-[  --disable-headinsand      Disable head in sand (-DNO_HEAD_IN_SAND)],
-[unet_cv_enable_headinsand=$enable_headinsand],
-[AC_CACHE_VAL(unet_cv_enable_headinsand,
-[unet_cv_enable_headinsand=yes])])
-AC_MSG_RESULT([$unet_cv_enable_headinsand])
-
-if test x"$unet_cv_enable_headinsand" = xno; then
-    CFLAGS="-DNO_HEAD_IN_SAND $CFLAGS"
-fi
-
 dnl Now check for --enable-profile
 AC_MSG_CHECKING([whether to enable profiling support (gprof)])
 AC_ARG_ENABLE([profile],
@@ -352,7 +344,7 @@ fi
 dnl --disable-devpoll check...
 AC_MSG_CHECKING([whether to enable the /dev/poll event engine])
 AC_ARG_ENABLE([devpoll],
-[  --disable-devpoll       Enable the /dev/poll-based engine],
+[  --disable-devpoll       Disable the /dev/poll-based engine],
 [unet_cv_enable_devpoll=$enable_devpoll],
 [AC_CACHE_VAL(unet_cv_enable_devpoll,
 [unet_cv_enable_devpoll=yes])])
@@ -371,7 +363,7 @@ fi
 dnl --disable-kqueue check...
 AC_MSG_CHECKING([whether to enable the kqueue event engine])
 AC_ARG_ENABLE([kqueue],
-[  --disable-kqueue        Enable the kqueue-based engine],
+[  --disable-kqueue        Disable the kqueue-based engine],
 [unet_cv_enable_kqueue=$enable_kqueue],
 [AC_CACHE_VAL(unet_cv_enable_kqueue,
 [unet_cv_enable_kqueue=yes])])