From 50096e39b03c34b1e5655a6f77a454eea4c85c4c Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Thu, 8 Oct 2009 15:58:17 +0200
Subject: [PATCH] Some small changes to configure.in, some reindents and some
 typos fixed.

---
 bacula/autoconf/configure.in | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 07a28949f5..66d4497e81 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2456,43 +2456,43 @@ if test x$support_xattr = xyes -o x$support_xattr = xauto; then
 	    ]
          )
       fi
+   fi
 
-      #
-      # Solaris specific
-      #
-      if test $have_xattr = no; then
-         AC_CHECK_HEADER(sys/attr.h, [ AC_DEFINE(HAVE_SYS_ATTR_H,1,[Defines if your system have the sys/attr.h header file])] , )
-         AC_CHECK_HEADER(sys/nvpair.h, [ AC_DEFINE(HAVE_SYS_NVPAIR_H,1,[Defines if your system have the sys/nvpair.h header file])] , )
-         AC_CHECK_HEADER(attr.h, [ AC_DEFINE(HAVE_ATTR_H,1,[Defines if your system have the attr.h header file])] , )
+   dnl
+   dnl If we failed to find *BSD support and the Linux or OSX implementation of xattr try the Solaris xattr implementation
+   dnl
+   if test $have_xattr = no; then
+      AC_CHECK_HEADER(sys/attr.h, [ AC_DEFINE(HAVE_SYS_ATTR_H,1,[Defines if your system have the sys/attr.h header file])] , )
+      AC_CHECK_HEADER(sys/nvpair.h, [ AC_DEFINE(HAVE_SYS_NVPAIR_H,1,[Defines if your system have the sys/nvpair.h header file])] , )
+      AC_CHECK_HEADER(attr.h, [ AC_DEFINE(HAVE_ATTR_H,1,[Defines if your system have the attr.h header file])] , )
 
-         AC_CHECK_FUNCS(openat fstatat unlinkat fchownat futimesat,
+      AC_CHECK_FUNCS(openat fstatat unlinkat fchownat futimesat,
+	 [
+	     have_xattr=yes
+             AC_DEFINE([HAVE_OPENAT],1,[Define to 1 if you have the `openat' function.])
+             AC_DEFINE([HAVE_FSTATAT],1,[Define to 1 if you have the `fstatat' function.])
+             AC_DEFINE([HAVE_UNLINKAT],1,[Define to 1 if you have the `unlinkat' function.])
+             AC_DEFINE([HAVE_FCHOWNAT],1,[Define to 1 if you have the `fchownat' function.])
+             AC_DEFINE([HAVE_FUTIMESAT],1,[Define to 1 if you have the `futimesat' function.])
+	 ]
+      )
+
+      if test $have_xattr = yes; then
+	 AC_CHECK_LIB(nvpair, nvlist_next_nvpair,
 	    [
-	        have_xattr=yes
-                AC_DEFINE([HAVE_OPENAT],1,[Define to 1 if you have the `openat' function.])
-                AC_DEFINE([HAVE_FSTATAT],1,[Define to 1 if you have the `fstatat' function.])
-                AC_DEFINE([HAVE_UNLINKAT],1,[Define to 1 if you have the `unlinkat' function.])
-                AC_DEFINE([HAVE_FCHOWNAT],1,[Define to 1 if you have the `fchownat' function.])
-                AC_DEFINE([HAVE_FUTIMESAT],1,[Define to 1 if you have the `futimesat' function.])
+                AC_DEFINE([HAVE_NVLIST_NEXT_NVPAIR],1,[Define to 1 if you have the `nvlist_next_nvpair' function.])
+		FDLIBS="-lnvpair $FDLIBS"
 	    ]
-         )
-
-         if test $have_xattr = yes; then
-	    AC_CHECK_LIB(nvpair, nvlist_next_nvpair,
-	       [
-                   AC_DEFINE([HAVE_NVLIST_NEXT_NVPAIR],1,[Define to 1 if you have the `nvlist_next_nvpair' function.])
-		   FDLIBS="-lnvpair $FDLIBS"
-	       ]
-	    )
-         fi
+	 )
       fi
    fi
 
    if test x$support_xattr = xyes -a $have_xattr != yes; then
       AC_MSG_ERROR([xattr support explicitly enabled but no supported xattr implementation found, 
-  please either load the xattr libraries or rerun configure without --enable-xatt])
+  please either load the xattr libraries or rerun configure without --enable-xattr])
    else
       if test $have_xattr = yes; then
-         AC_DEFINE([HAVE_XATTR],1,[Exteded Attributes support])
+         AC_DEFINE([HAVE_XATTR],1,[Extended Attributes support])
       fi
    fi
 fi
-- 
2.39.5