This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / autoconf / configure.in

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 6413c03c8140616e6d922fee2343c013c6c984dd..1844cb79fe6254857e236b14a9fa98d0d94ceab8 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -604,7 +604,7 @@ AC_ARG_WITH(python,
   PYTHON_LIBS=
   if test "$withval" != "no"; then
      if test "$withval" = "yes"; then
-       for python_root in /usr /usr/local; do
+       for python_root in /usr /usr/local /usr/sfw; do
          if test -f $python_root/include/python2.2/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.2
             PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
@@ -1572,10 +1572,15 @@ if test x$FDLIBS = x-lz; then
   have_zlib=yes
 fi
 
+#
+# Check for ACL libraries
+#
 have_acl=no
 AC_CHECK_HEADER(sys/acl.h)
 AC_CHECK_FUNC(acl_get_file, [have_acl=yes],
-       [AC_CHECK_LIB(acl, acl_get_file, [have_acl=yes; FDLIBS="-lacl $FDLIBS"])]
+   [AC_CHECK_LIB(acl, acl_get_file, [have_acl=yes; FDLIBS="-lacl $FDLIBS"], 
+      [AC_CHECK_LIB(sec, acltotext, [have_acl=yes; FDLIBS="-lsec $FDLIBS"])]
+    )]
 )
 if test $have_acl = yes; then
    AC_DEFINE(HAVE_ACL)
@@ -1584,11 +1589,11 @@ fi
 dnl Check for pthread libraries
 PTHREAD_LIB=""
 AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-       [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
-           [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-               [AC_CHECK_FUNC(pthread_create)]
-           )]
-       )]
+   [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
+      [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
+           [AC_CHECK_FUNC(pthread_create)]
+       )]
+    )]
 )
 
 AC_SUBST(FDLIBS)