Regenerate.

2 files changed, 13 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index c2cf2d8ef13..0f7bc09095c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-20  Andreas Schwab  <schwab@suse.de>
+
+        * configure.in: Always include <resolv.h> when checking for
+        res_init.
+
 2007-11-17  Andreas Schwab  <schwab@suse.de>
 
         * update-subdirs: Atomically update subdirs.el.
diff --git a/configure b/configure
index 3f71a5b2e93..b2ea135388b 100755
--- a/configure
+++ b/configure
@@ -19538,52 +19538,19 @@ fi
 # Do we have res_init, for detecting changes in /etc/resolv.conf?
 
 resolv=no
-{ echo "$as_me:$LINENO: checking for res_init" >&5
-echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
-if test "${ac_cv_func_res_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define res_init to an innocuous variant, in case <limits.h> declares res_init.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_init innocuous_res_init
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_init (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef res_init
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_init ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_res_init || defined __stub___res_init
-choke me
-#endif
-
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 int
 main ()
 {
-return res_init ();
+return res_init();
   ;
   return 0;
 }
@@ -19606,25 +19573,16 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_res_init=yes
+  have_res_init=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-        ac_cv_func_res_init=no
+        have_res_init=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
-echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
-if test $ac_cv_func_res_init = yes; then
-  have_res_init=yes
-else
-  have_res_init=no
-fi
-
 if test "$have_res_init" = no; then
   OLIBS="$LIBS"
   LIBS="$LIBS -lresolv"
@@ -19642,7 +19600,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-res_init();
+return res_init();
   ;
   return 0;
 }