To: vim_dev@googlegroups.com
Subject: Patch 8.0.1437
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.0.1437
Problem:    Pkg-config doesn't work with cross compiling.
Solution:   Use AC_PATH_TOOL() instead of AC_PATH_PROG(). (James McCoy,
            closes #2513)
Files:      src/configure.ac, src/auto/configure


*** ../vim-8.0.1436/src/configure.ac	2017-12-16 14:37:02.449279382 +0100
--- src/configure.ac	2018-01-28 21:40:53.351975002 +0100
***************
*** 2634,2640 ****
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
--- 2634,2640 ----
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
***************
*** 2686,2692 ****
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
--- 2686,2692 ----
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
***************
*** 3797,3812 ****
  dnl On Solaris, use the acl_get/set functions in libsec, if present.
  AC_MSG_CHECKING(--disable-acl argument)
  AC_ARG_ENABLE(acl,
! 	[  --disable-acl           Don't check for ACL support.],
  	, [enable_acl="yes"])
  if test "$enable_acl" = "yes"; then
! AC_MSG_RESULT(no)
! 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([
  #include <sys/types.h>
  #ifdef HAVE_SYS_ACL_H
  # include <sys/acl.h>
--- 3797,3812 ----
  dnl On Solaris, use the acl_get/set functions in libsec, if present.
  AC_MSG_CHECKING(--disable-acl argument)
  AC_ARG_ENABLE(acl,
! 	[  --disable-acl           No check for ACL support.],
  	, [enable_acl="yes"])
  if test "$enable_acl" = "yes"; then
!   AC_MSG_RESULT(no)
!   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([
  #include <sys/types.h>
  #ifdef HAVE_SYS_ACL_H
  # include <sys/acl.h>
***************
*** 3817,3825 ****
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL),
  	AC_MSG_RESULT(no))
  
! AC_CHECK_LIB(sec, acl_get, [LIBS="$LIBS -lsec"; AC_DEFINE(HAVE_SOLARIS_ZFS_ACL)],
! AC_MSG_CHECKING(for Solaris ACL support)
! AC_TRY_LINK([
  #ifdef HAVE_SYS_ACL_H
  # include <sys/acl.h>
  #endif], [acl("foo", GETACLCNT, 0, NULL);
--- 3817,3825 ----
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL),
  	AC_MSG_RESULT(no))
  
!   AC_CHECK_LIB(sec, acl_get, [LIBS="$LIBS -lsec"; AC_DEFINE(HAVE_SOLARIS_ZFS_ACL)],
!   AC_MSG_CHECKING(for Solaris ACL support)
!   AC_TRY_LINK([
  #ifdef HAVE_SYS_ACL_H
  # include <sys/acl.h>
  #endif], [acl("foo", GETACLCNT, 0, NULL);
***************
*** 3827,3834 ****
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL),
  	AC_MSG_RESULT(no)))
  
! AC_MSG_CHECKING(for AIX ACL support)
! AC_TRY_LINK([
  #if STDC_HEADERS
  # include <stdlib.h>
  # include <stddef.h>
--- 3827,3834 ----
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL),
  	AC_MSG_RESULT(no)))
  
!   AC_MSG_CHECKING(for AIX ACL support)
!   AC_TRY_LINK([
  #if STDC_HEADERS
  # include <stdlib.h>
  # include <stddef.h>
*** ../vim-8.0.1436/src/auto/configure	2017-12-16 14:37:02.453279355 +0100
--- src/auto/configure	2018-01-28 21:40:57.959950481 +0100
***************
*** 1513,1519 ****
    --disable-icon-cache-update        update disabled
    --disable-desktop-database-update  update disabled
    --disable-largefile     omit support for large files
!   --disable-acl           Don't check for ACL support.
    --disable-gpm           Don't use gpm (Linux mouse daemon).
    --disable-sysmouse      Don't use sysmouse (mouse in *BSD console).
    --disable-nls           Don't support NLS (gettext()).
--- 1513,1519 ----
    --disable-icon-cache-update        update disabled
    --disable-desktop-database-update  update disabled
    --disable-largefile     omit support for large files
!   --disable-acl           No check for ACL support.
    --disable-gpm           Don't use gpm (Linux mouse daemon).
    --disable-sysmouse      Don't use sysmouse (mouse in *BSD console).
    --disable-nls           Don't support NLS (gettext()).
***************
*** 8887,8894 ****
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     # Extract the first word of "pkg-config", so it can be a program name with args.
! set dummy pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_PKG_CONFIG+:} false; then :
--- 8887,8895 ----
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     if test -n "$ac_tool_prefix"; then
!   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_PKG_CONFIG+:} false; then :
***************
*** 8914,8920 ****
    done
  IFS=$as_save_IFS
  
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
    ;;
  esac
  fi
--- 8915,8920 ----
***************
*** 8928,8933 ****
--- 8928,8990 ----
  fi
  
  
+ fi
+ if test -z "$ac_cv_path_PKG_CONFIG"; then
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+   [\\/]* | ?:[\\/]*)
+   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_pt_PKG_CONFIG" = x; then
+     PKG_CONFIG="no"
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     PKG_CONFIG=$ac_pt_PKG_CONFIG
+   fi
+ else
+   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ fi
+ 
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
***************
*** 9181,9188 ****
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     # Extract the first word of "pkg-config", so it can be a program name with args.
! set dummy pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_PKG_CONFIG+:} false; then :
--- 9238,9246 ----
    fi
  
    if test "X$PKG_CONFIG" = "X"; then
!     if test -n "$ac_tool_prefix"; then
!   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_PKG_CONFIG+:} false; then :
***************
*** 9208,9214 ****
    done
  IFS=$as_save_IFS
  
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
    ;;
  esac
  fi
--- 9266,9271 ----
***************
*** 9222,9227 ****
--- 9279,9341 ----
  fi
  
  
+ fi
+ if test -z "$ac_cv_path_PKG_CONFIG"; then
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+   [\\/]* | ?:[\\/]*)
+   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_pt_PKG_CONFIG" = x; then
+     PKG_CONFIG="no"
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     PKG_CONFIG=$ac_pt_PKG_CONFIG
+   fi
+ else
+   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ fi
+ 
    fi
  
    if test "x$PKG_CONFIG" != "xno"; then
***************
*** 12703,12711 ****
  fi
  
  if test "$enable_acl" = "yes"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5
  $as_echo_n "checking for acl_get_file in -lposix1e... " >&6; }
  if ${ac_cv_lib_posix1e_acl_get_file+:} false; then :
    $as_echo_n "(cached) " >&6
--- 12817,12825 ----
  fi
  
  if test "$enable_acl" = "yes"; then
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5
  $as_echo_n "checking for acl_get_file in -lposix1e... " >&6; }
  if ${ac_cv_lib_posix1e_acl_get_file+:} false; then :
    $as_echo_n "(cached) " >&6
***************
*** 12827,12835 ****
  fi
  
  
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5
  $as_echo_n "checking for POSIX ACL support... " >&6; }
! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #include <sys/types.h>
--- 12941,12949 ----
  fi
  
  
!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5
  $as_echo_n "checking for POSIX ACL support... " >&6; }
!   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #include <sys/types.h>
***************
*** 12858,12864 ****
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
  
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5
  $as_echo_n "checking for acl_get in -lsec... " >&6; }
  if ${ac_cv_lib_sec_acl_get+:} false; then :
    $as_echo_n "(cached) " >&6
--- 12972,12978 ----
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
  
!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5
  $as_echo_n "checking for acl_get in -lsec... " >&6; }
  if ${ac_cv_lib_sec_acl_get+:} false; then :
    $as_echo_n "(cached) " >&6
***************
*** 12900,12906 ****
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5
  $as_echo_n "checking for Solaris ACL support... " >&6; }
! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_ACL_H
--- 13014,13020 ----
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5
  $as_echo_n "checking for Solaris ACL support... " >&6; }
!   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_ACL_H
***************
*** 12928,12936 ****
  fi
  
  
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5
  $as_echo_n "checking for AIX ACL support... " >&6; }
! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #if STDC_HEADERS
--- 13042,13050 ----
  fi
  
  
!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5
  $as_echo_n "checking for AIX ACL support... " >&6; }
!   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  #if STDC_HEADERS
*** ../vim-8.0.1436/src/version.c	2018-01-28 17:45:41.509504168 +0100
--- src/version.c	2018-01-28 22:47:53.635193471 +0100
***************
*** 773,774 ****
--- 773,776 ----
  {   /* Add new patch number below this line */
+ /**/
+     1437,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
269. You wonder how you can make your dustbin produce Sesame Street's
     Oscar's the Garbage Monster song when you empty it.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///