From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 9 Mar 2009 15:34:05 +0000 (+0000)
Subject: Tweak configure
X-Git-Tag: Release-3.0.0~179
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d59232473648d5d40f6b39f5b139960d95a884b4;p=bacula%2Fbacula

Tweak configure

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8513 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 71617e4dd9..632f9c04f3 100644
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -355,6 +355,9 @@
 /* Define to 1 if you have the `fchdir' function. */
 #undef HAVE_FCHDIR
 
+/* FCHOWNAT support */
+#undef HAVE_FCHOWNAT
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -367,6 +370,12 @@
 /* Define to 1 if you have the `fseeko' function. */
 #undef HAVE_FSEEKO
 
+/* FSTATAT support */
+#undef HAVE_FSTATAT
+
+/* FUTIMESAT support */
+#undef HAVE_FUTIMESAT
+
 /* Define to 1 if you have the `fwprintf' function. */
 #undef HAVE_FWPRINTF
 
@@ -784,6 +793,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* UNLINKAT support */
+#undef HAVE_UNLINKAT
+
 /* Define if you have the 'unsigned long long' type. */
 #undef HAVE_UNSIGNED_LONG_LONG
 
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index ca80170ed6..519ae7346e 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -469,7 +469,7 @@ if test x$support_wx_console = xyes; then
 
       AC_SUBST(WXCONS_CPPFLAGS)
       AC_SUBST(WXCONS_LDFLAGS)
-      WX_DIR=src/wx-console
+      WX_DIR="src/wx-console"
    else
       echo " "
       echo "wx-config program not found. bwx-console disabled."
@@ -2320,11 +2320,11 @@ if test x$support_xattr = xyes; then
    if test $have_xattr = no; then
       AC_CHECK_FUNCS(listxattr getxattr setxattr,
 	 [
-             have_xattr=yes
-             AC_DEFINE([HAVE_LLISTXATTR], [], [LLISTXATTR support])
-             AC_DEFINE([HAVE_LGETXATTR], [], [LGETXATTR support])
-             AC_DEFINE([HAVE_LSETXATTR], [], [LSETXATTR support])
-         ]
+	     have_xattr=yes
+	     AC_DEFINE([HAVE_LLISTXATTR], [], [LLISTXATTR support])
+	     AC_DEFINE([HAVE_LGETXATTR], [], [LGETXATTR support])
+	     AC_DEFINE([HAVE_LSETXATTR], [], [LSETXATTR support])
+	 ]
       )
    fi
 
@@ -2337,22 +2337,22 @@ if test x$support_xattr = xyes; then
       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,
-         [
-             have_xattr=yes
-             AC_DEFINE([HAVE_OPENAT], [], [OPENAT support])
-             AC_DEFINE([HAVE_FSTATAT], [], [FSTATAT support])
-             AC_DEFINE([HAVE_UNLINKAT], [], [UNLINKAT support])
-             AC_DEFINE([HAVE_FCHOWNAT], [], [FCHOWNAT support])
-             AC_DEFINE([HAVE_FUTIMESAT], [], [FUTIMESAT support])
-         ]
+	 [
+	     have_xattr=yes
+	     AC_DEFINE([HAVE_OPENAT], [], [OPENAT support])
+	     AC_DEFINE([HAVE_FSTATAT], [], [FSTATAT support])
+	     AC_DEFINE([HAVE_UNLINKAT], [], [UNLINKAT support])
+	     AC_DEFINE([HAVE_FCHOWNAT], [], [FCHOWNAT support])
+	     AC_DEFINE([HAVE_FUTIMESAT], [], [FUTIMESAT support])
+	 ]
       )
 
       if test $have_xattr = yes; then
-         AC_CHECK_LIB(nvpair, nvlist_next_nvpair,
-            [
-                FDLIBS="-lnvpair $FDLIBS"
-            ]
-         )
+	 AC_CHECK_LIB(nvpair, nvlist_next_nvpair,
+	    [
+		FDLIBS="-lnvpair $FDLIBS"
+	    ]
+	 )
       fi
    fi
 
diff --git a/bacula/configure b/bacula/configure
index 843ca9f6d0..2a3332813d 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -24171,7 +24171,7 @@ if test x$support_wx_console = xyes; then
 
 
 
-      WX_DIR=src/wx-console
+      WX_DIR="src/wx-console"
    else
       echo " "
       echo "wx-config program not found. bwx-console disabled."
@@ -40019,7 +40019,7 @@ if test "$ac_res" != no; then
   ac_cv_func_getmntent=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETMNTENT
+#define HAVE_GETMNTENT 1
 _ACEOF
 
 else
@@ -41423,7 +41423,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-             have_xattr=yes
+	     have_xattr=yes
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LLISTXATTR
@@ -41948,7 +41948,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-             have_xattr=yes
+	     have_xattr=yes
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_OPENAT
@@ -41981,7 +41981,7 @@ done
 
 
       if test $have_xattr = yes; then
-         { echo "$as_me:$LINENO: checking for nvlist_next_nvpair in -lnvpair" >&5
+	 { echo "$as_me:$LINENO: checking for nvlist_next_nvpair in -lnvpair" >&5
 echo $ECHO_N "checking for nvlist_next_nvpair in -lnvpair... $ECHO_C" >&6; }
 if test "${ac_cv_lib_nvpair_nvlist_next_nvpair+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42044,7 +42044,7 @@ fi
 echo "${ECHO_T}$ac_cv_lib_nvpair_nvlist_next_nvpair" >&6; }
 if test $ac_cv_lib_nvpair_nvlist_next_nvpair = yes; then
 
-                FDLIBS="-lnvpair $FDLIBS"
+		FDLIBS="-lnvpair $FDLIBS"
 
 
 fi
diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index 7f832b9eb2..8102d02dfe 100644
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -107,7 +107,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 install: all
 	@if test -f ${DESTDIR}${sbindir}/wx-console; then \
 	   echo " "; \
-	   echo "Warning!!!  ${DESTDIR}${sbindir}wx-console found."; \
+	   echo "Warning!!!  ${DESTDIR}${sbindir}/wx-console found."; \
 	   echo " wx-console has been renamed bwx-console, so wx-console"; \
 	   echo " is no longer used, and you might want to delete it."; \
 	   echo " "; \