$NetBSD: patch-ax,v 1.3 2004/02/09 18:14:45 jmmv Exp $

--- configure.orig	2003-04-15 08:17:16.000000000 +0200
+++ configure
@@ -9670,6 +9670,41 @@ _ACEOF
 fi
 
 
+ac_safe=`echo "mntent.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for mntent.h""... $ac_c" 1>&6
+echo "configure:5516: checking for mntent.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 5521 "configure"
+#include "confdefs.h"
+#include <mntent.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5526: \"$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
+  cat >> confdefs.h <<\EOF
+#define HAVE_MNTENT_H 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
 echo "$as_me:$LINENO: checking for mountlist struct" >&5
 echo $ECHO_N "checking for mountlist struct... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
@@ -9791,203 +9826,6 @@ fi
 
 
 
-    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS" >&5
-echo $ECHO_N "checking mntent.h for MNTTYPE_NFS... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mntent.h>
-int
-main ()
-{
-const char *foo = MNTTYPE_NFS;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fam_have_decl_in_mntent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fam_have_decl_in_mntent=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
-echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
-    if test "$fam_have_decl_in_mntent" = "yes"; then
-	:
-    else
-	{ { echo "$as_me:$LINENO: error: Didn't find MNTTYPE_NFS in mntent.h" >&5
-echo "$as_me: error: Didn't find MNTTYPE_NFS in mntent.h" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-
-    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS2" >&5
-echo $ECHO_N "checking mntent.h for MNTTYPE_NFS2... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mntent.h>
-int
-main ()
-{
-const char *foo = MNTTYPE_NFS2;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fam_have_decl_in_mntent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fam_have_decl_in_mntent=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
-echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
-    if test "$fam_have_decl_in_mntent" = "yes"; then
-	cat >>confdefs.h <<\_ACEOF
-#define HAVE_MNTTYPE_NFS2 1
-_ACEOF
-
-    else
-	:
-    fi
-
-
-    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS3" >&5
-echo $ECHO_N "checking mntent.h for MNTTYPE_NFS3... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mntent.h>
-int
-main ()
-{
-const char *foo = MNTTYPE_NFS3;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fam_have_decl_in_mntent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fam_have_decl_in_mntent=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
-echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
-    if test "$fam_have_decl_in_mntent" = "yes"; then
-	cat >>confdefs.h <<\_ACEOF
-#define HAVE_MNTTYPE_NFS3 1
-_ACEOF
-
-    else
-	:
-    fi
-
-
-    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_CACHEFS" >&5
-echo $ECHO_N "checking mntent.h for MNTTYPE_CACHEFS... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mntent.h>
-int
-main ()
-{
-const char *foo = MNTTYPE_CACHEFS;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fam_have_decl_in_mntent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fam_have_decl_in_mntent=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
-echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
-    if test "$fam_have_decl_in_mntent" = "yes"; then
-	cat >>confdefs.h <<\_ACEOF
-#define HAVE_MNTTYPE_CACHEFS 1
-_ACEOF
-
-    else
-	:
-    fi
 
 
 echo "$as_me:$LINENO: checking netinet/in.h for bindresvport()" >&5