Issues with building gnome-vfs-2.15.2

[Stef van der Made <svdmade planet nl>]

Hi,

On building the latest snapshots of garnome I needed to apply the patch 
as found in this bug http://bugzilla.gnome.org/show_bug.cgi?id=344491
. I've attached the patch for your convenience. After applying the patch 
gnome-vfs once more compiles to completion.

Kindest regards,

Stef

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-vfs/configure.in,v
retrieving revision 1.428
diff -u -r1.428 configure.in
--- configure.in	8 Jun 2006 14:02:39 -0000	1.428
+++ configure.in	11 Jun 2006 13:09:05 -0000
@@ -1089,12 +1089,54 @@
 gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
 		LIBS=$acl_LIBS])
 
+AC_CHECK_HEADERS([pwd.h grp.h])
+
+if test "$ac_cv_header_pwd_h" = "yes"; then
+	AC_CACHE_CHECK([for posix getpwuid_r],
+		ac_cv_func_posix_getpwuid_r,
+		[AC_TRY_RUN([
+#include <errno.h>
+#include <pwd.h>
+int main () { 
+char buffer[10000];
+struct passwd pwd, *pwptr = &pwd;
+int error;
+errno = 0;
+error = getpwuid_r (0, &pwd, buffer, 
+		sizeof (buffer), &pwptr);
+return (error < 0 && errno == ENOSYS) 
+   || error == ENOSYS; 
+}                               ],
+			[ac_cv_func_posix_getpwuid_r=yes],
+			[ac_cv_func_posix_getpwuid_r=no])])
+	dnl GLIB_ASSERT_SET(ac_cv_func_posix_getpwuid_r)
+	if test "$ac_cv_func_posix_getpwuid_r" = yes; then
+		AC_DEFINE(HAVE_POSIX_GETPWUID_R,1,
+			[Have POSIX function getpwuid_r])
+	else
+		AC_CACHE_CHECK([for nonposix getpwuid_r],
+			ac_cv_func_nonposix_getpwuid_r,
+			[AC_TRY_LINK([#include <pwd.h>],
+				[char buffer[10000];
+				struct passwd pwd;
+				getpwuid_r (0, &pwd, buffer, 
+						sizeof (buffer));],
+				[ac_cv_func_nonposix_getpwuid_r=yes],
+				[ac_cv_func_nonposix_getpwuid_r=no])])
+		dnl GLIB_ASSERT_SET(ac_cv_func_nonposix_getpwuid_r)
+		if test "$ac_cv_func_nonposix_getpwuid_r" = yes; then
+			AC_DEFINE(HAVE_NONPOSIX_GETPWUID_R,1,
+				[Have non-POSIX function getpwuid_r])
+		fi
+	fi
+fi 
+
+
 if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
     have_solaris_acl_support=yes
     acl_backends="solaris"
 
     AC_DEFINE(HAVE_SOLARIS_ACL,1,[Have Solaris ACLs])
-    AC_CHECK_HEADERS([pwd.h grp.h])
 fi
 
 if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
@@ -1104,48 +1146,6 @@
     AC_DEFINE(HAVE_POSIX_ACL,1,[Have POSIX ACLs])
     AC_CHECK_FUNCS(acl_extended_file)
     
-    AC_CHECK_HEADERS([pwd.h])
-    if test "$ac_cv_header_pwd_h" = "yes"; then
-	 	AC_CACHE_CHECK([for posix getpwuid_r],
-			ac_cv_func_posix_getpwuid_r,
-			[AC_TRY_RUN([
-#include <errno.h>
-#include <pwd.h>
-int main () { 
-    char buffer[10000];
-    struct passwd pwd, *pwptr = &pwd;
-    int error;
-    errno = 0;
-    error = getpwuid_r (0, &pwd, buffer, 
-                        sizeof (buffer), &pwptr);
-   return (error < 0 && errno == ENOSYS) 
-	   || error == ENOSYS; 
-}                               ],
-				[ac_cv_func_posix_getpwuid_r=yes],
-				[ac_cv_func_posix_getpwuid_r=no])])
-		dnl GLIB_ASSERT_SET(ac_cv_func_posix_getpwuid_r)
-		if test "$ac_cv_func_posix_getpwuid_r" = yes; then
-			AC_DEFINE(HAVE_POSIX_GETPWUID_R,1,
-				[Have POSIX function getpwuid_r])
-		else
-	 		AC_CACHE_CHECK([for nonposix getpwuid_r],
-				ac_cv_func_nonposix_getpwuid_r,
-				[AC_TRY_LINK([#include <pwd.h>],
-                                	[char buffer[10000];
-                                	struct passwd pwd;
-                                	getpwuid_r (0, &pwd, buffer, 
-                                        		sizeof (buffer));],
-					[ac_cv_func_nonposix_getpwuid_r=yes],
-					[ac_cv_func_nonposix_getpwuid_r=no])])
-			dnl GLIB_ASSERT_SET(ac_cv_func_nonposix_getpwuid_r)
-			if test "$ac_cv_func_nonposix_getpwuid_r" = yes; then
-				AC_DEFINE(HAVE_NONPOSIX_GETPWUID_R,1,
-					[Have non-POSIX function getpwuid_r])
-			fi
-		fi
-	fi 
-
-	AC_CHECK_HEADERS([grp.h])
 
 	AC_CHECK_FUNCS(getgrgid_r)
 	AC_CHECK_FUNCS(getgrnam_r)
@@ -1154,8 +1154,8 @@
 fi
 
 AC_SUBST(ACL_LIBS)
-AM_CONDITIONAL(HAVE_POSIX_ACL, test $have_posix_acl_support = yes)
-AM_CONDITIONAL(HAVE_SOLARIS_ACL, test $have_solaris_acl_support = yes)
+AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = "xyes")
+AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = "xyes")
 
 dnl =====================
 dnl File system monitors
Index: modules/file-method-acl.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/file-method-acl.c,v
retrieving revision 1.2
diff -u -r1.2 file-method-acl.c
--- modules/file-method-acl.c	8 Jun 2006 13:30:56 -0000	1.2
+++ modules/file-method-acl.c	11 Jun 2006 13:09:06 -0000
@@ -60,6 +60,7 @@
 #define CMD_PERM_COND_EXECUTE   8
 
 
+#if defined (HAVE_POSIX_ACL) || defined (HAVE_SOLARIS_ACL)
 static char *
 uid_to_string (uid_t uid) 
 {
@@ -209,6 +210,7 @@
         
 	return group->gr_gid;
 }
+#endif /* defined (HAVE_POSIX_ACL) || defined (HAVE_SOLARIS_ACL) */
 
 
 /* ************************************************************************** */
@@ -691,6 +693,7 @@
 /* ************************************************************************** */
 /* Common */
 
+#if defined (HAVE_POSIX_ACL) || defined (HAVE_SOLARIS_ACL)
 static GnomeVFSResult
 aclerrno_to_vfserror (int acl_errno)
 {
@@ -716,6 +719,7 @@
 	
 	return GNOME_VFS_ERROR_GENERIC;
 }
+#endif /* defined (HAVE_POSIX_ACL) || defined (HAVE_SOLARIS_ACL) */
 
 
 GnomeVFSResult file_get_acl (const char       *path,