To: vim-dev@vim.org
Subject: Patch 6.1.077
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.077
Problem:    On a Debian system wht ACL linking fails. (Lubomir Host)
Solution:   When the "acl" library is used, check if the "attr" library is
	    present and use it.
Files:	    src/auto/configure, src/configure.in, src/link.sh


*** ../vim61.076/src/auto/configure	Sat Mar  9 19:14:07 2002
--- src/auto/configure	Sat May 18 21:41:11 2002
***************
*** 6066,6071 ****
--- 6066,6111 ----
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    LIBS="$LIBS -lacl"
+ 		  echo $ac_n "checking for fgetxattr in -lattr""... $ac_c" 1>&6
+ echo "configure:6071: checking for fgetxattr in -lattr" >&5
+ ac_lib_var=`echo attr'_'fgetxattr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lattr  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 6079 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char fgetxattr();
+ 
+ int main() {
+ fgetxattr()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:6090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -lattr"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
  else
    echo "$ac_t""no" 1>&6
  fi
*** ../vim61.076/src/configure.in	Sat Mar  9 18:29:18 2002
--- src/configure.in	Sat May 18 21:41:06 2002
***************
*** 1765,1772 ****
  	AC_MSG_RESULT(no))
  
  dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
  AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
! 	AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"],,),)
  
  AC_MSG_CHECKING(for POSIX ACL support)
  AC_TRY_LINK([
--- 1765,1774 ----
  	AC_MSG_RESULT(no))
  
  dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
+ dnl when -lacl works, also try to use -lattr (required for Debian).
  AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
! 	AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
! 		  AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
  
  AC_MSG_CHECKING(for POSIX ACL support)
  AC_TRY_LINK([
*** ../vim61.076/src/link.sh	Thu Feb 21 19:37:52 2002
--- src/link.sh	Sun May 19 11:51:43 2002
***************
*** 40,46 ****
    if sh link.cmd; then
      touch auto/link.sed
      cp link.cmd linkit.sh
!     for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x pthread thread readline m perl crypt; do
        cont=yes
        while test -n "$cont"; do
          if grep "l$libname " linkit.sh >/dev/null; then
--- 40,46 ----
    if sh link.cmd; then
      touch auto/link.sed
      cp link.cmd linkit.sh
!     for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x pthread thread readline m perl crypt attr; do
        cont=yes
        while test -n "$cont"; do
          if grep "l$libname " linkit.sh >/dev/null; then
*** ../vim61.076/src/version.c	Fri May 17 19:29:08 2002
--- src/version.c	Sun May 19 11:54:01 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     77,
  /**/

-- 
Time is an illusion.  Lunchtime doubly so.
		-- Ford Prefect, in Douglas Adams'
		   "The Hitchhiker's Guide to the Galaxy"

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///