$NetBSD: patch-aa,v 1.20 2006/09/26 16:17:04 drochner Exp $

--- configure.orig	2006-09-04 23:27:10.000000000 +0200
+++ configure
@@ -28633,7 +28633,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/statvfs.h>
+#ifndef __NetBSD__
 #include <sys/fstyp.h>
+#endif
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -33911,6 +33913,7 @@ else
    GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
    X_CONFIG_OPTIONS="-audit 0"
 fi
+X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS"
 
 # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
 # If it is /bin or /usr/bin, for example.