To: vim-dev@vim.org
Subject: Patch 6.1.247
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.247
Problem:    ACL support doesn't always work properly.
Solution:   Add a configure argument to disable ACL "--disable-acl". (Thierry
	    Vignaud)
Files:	    src/auto/configure, src/configure.in


*** ../vim61.246/src/auto/configure	Sun Oct 13 20:08:13 2002
--- src/auto/configure	Tue Oct 29 21:23:04 2002
***************
*** 80,85 ****
--- 80,87 ----
  ac_help="$ac_help
    --with-tlib=library     terminal library to be used "
  ac_help="$ac_help
+   --disable-acl           Don't check for ACL support."
+ ac_help="$ac_help
    --disable-gpm           Don't use gpm (Linux mouse daemon)."
  ac_help="$ac_help
    --disable-nls           Don't support NLS (gettext())."
***************
*** 6065,6072 ****
  fi
  rm -f conftest*
  
  echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6
! echo "configure:5997: checking for acl_get_file in -lposix1e" >&5
  ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6067,6086 ----
  fi
  rm -f conftest*
  
+ echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6
+ echo "configure:6072: checking --disable-acl argument" >&5
+ # Check whether --enable-acl or --disable-acl was given.
+ if test "${enable_acl+set}" = set; then
+   enableval="$enable_acl"
+   echo "$ac_t""yes" 1>&6
+ else
+   enable_acl="yes"; echo "$ac_t""no" 1>&6
+ fi
+ 
+ if test "$enable_acl" = "yes"; then
+ 
  echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6
! echo "configure:6084: checking for acl_get_file in -lposix1e" >&5
  ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6283,6291 ****
    echo "$ac_t""no" 1>&6
  fi
  rm -f conftest*
  
  echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6
! echo "configure:6176: checking --disable-gpm argument" >&5
  # Check whether --enable-gpm or --disable-gpm was given.
  if test "${enable_gpm+set}" = set; then
    enableval="$enable_gpm"
--- 6297,6306 ----
    echo "$ac_t""no" 1>&6
  fi
  rm -f conftest*
+ fi
  
  echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6
! echo "configure:6304: checking --disable-gpm argument" >&5
  # Check whether --enable-gpm or --disable-gpm was given.
  if test "${enable_gpm+set}" = set; then
    enableval="$enable_gpm"
*** ../vim61.246/src/configure.in	Sun Oct 13 20:08:13 2002
--- src/configure.in	Tue Oct 29 21:22:54 2002
***************
*** 1804,1809 ****
--- 1804,1816 ----
  
  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_MSG_CHECKING(--disable-acl argument)
+ AC_ARG_ENABLE(acl,
+ 	[  --disable-acl           Don't check for ACL support.],
+ 	AC_MSG_RESULT(yes),
+ 	[enable_acl="yes"; AC_MSG_RESULT(no)])
+ if test "$enable_acl" = "yes"; then
+ 
  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",,)],,),)
***************
*** 1848,1853 ****
--- 1855,1861 ----
  	],
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_AIX_ACL),
  	AC_MSG_RESULT(no))
+ fi
  
  AC_MSG_CHECKING(--disable-gpm argument)
  AC_ARG_ENABLE(gpm,
*** ../vim61.246/src/version.c	Tue Oct 29 19:53:25 2002
--- src/version.c	Tue Oct 29 21:23:54 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     247,
  /**/

-- 
BLACK KNIGHT:  Come on you pansy!
    [hah] [parry thrust]
    [ARTHUR chops the BLACK KNIGHT's right arm off]
ARTHUR:        Victory is mine!  [kneeling]
               We thank thee Lord, that in thy merc-
    [Black Knight kicks Arthur in the head while he is praying]
                                  The Quest for the Holy Grail (Monty Python)

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///