From 943a09508352718751ae80804d0519d3da5f07bd Mon Sep 17 00:00:00 2001
From: sgunderson <sgunderson>
Date: Wed, 16 Aug 2000 22:22:58 +0000
Subject: [PATCH] The check for sys/sendfile.h is no longer done twice.

---
 configure    | 62 ++++++++++++----------------------------------------
 configure.in |  7 +-----
 2 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/configure b/configure
index c5fcf7c..aa0a2ac 100755
--- a/configure
+++ b/configure
@@ -2422,56 +2422,21 @@ EOF
 
 fi
 
-ac_safe=`echo "sys/sendfile.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/sendfile.h""... $ac_c" 1>&6
-echo "configure:2428: checking for sys/sendfile.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2433 "configure"
-#include "confdefs.h"
-#include <sys/sendfile.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  result=yes
-else
-  echo "$ac_t""no" 1>&6
-result=no
-fi
-
-
 for ac_hdr in sys/sendfile.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2465: checking for $ac_hdr" >&5
+echo "configure:2430: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2470 "configure"
+#line 2435 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2491,18 +2456,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+ result=yes
 else
   echo "$ac_t""no" 1>&6
+result=no
 fi
 done
 
 
 if test "$result" = "yes"; then
 	echo $ac_n "checking for Linux sendfile()""... $ac_c" 1>&6
-echo "configure:2504: checking for Linux sendfile()" >&5
+echo "configure:2470: checking for Linux sendfile()" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2506 "configure"
+#line 2472 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_SOCKET_H
@@ -2538,7 +2504,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   enableval=yes
 else
@@ -2560,17 +2526,17 @@ fi
 
 ac_safe=`echo "sys/uio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/uio.h""... $ac_c" 1>&6
-echo "configure:2564: checking for sys/uio.h" >&5
+echo "configure:2530: checking for sys/uio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2535 "configure"
 #include "confdefs.h"
 #include <sys/uio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2594,9 +2560,9 @@ fi
 
 if test "$result" = "yes"; then
 	echo $ac_n "checking for BSD sendfile()""... $ac_c" 1>&6
-echo "configure:2598: checking for BSD sendfile()" >&5
+echo "configure:2564: checking for BSD sendfile()" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2566 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_LIMITS_H
@@ -2637,7 +2603,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   enableval=yes
 else
diff --git a/configure.in b/configure.in
index b280bc1..763e05d 100644
--- a/configure.in
+++ b/configure.in
@@ -194,12 +194,7 @@ dnl
 dnl sendfile() is not standard -- we'll have to check the different
 dnl versions one by one :-)
 dnl
-AC_CHECK_HEADER(sys/sendfile.h,result=yes,result=no)
-
-dnl
-dnl For some reason, we have to check it AGAIN... Otherwise it's never defined!
-dnl
-AC_CHECK_HEADERS(sys/sendfile.h)
+AC_CHECK_HEADERS(sys/sendfile.h,result=yes,result=no)
 
 if test "$result" = "yes"; then
 	AC_MSG_CHECKING([for Linux sendfile()])
-- 
2.39.2