Mercurial > vim

comparison src/configure.ac @ 13126:35e148715059 v8.0.1437

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1437: pkg-config doesn't work with cross compiling commit https://github.com/vim/vim/commit/d6d304298a6b9842164a53e7be386d55d18ce79f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 28 22:48:55 2018 +0100 patch 8.0.1437: pkg-config doesn't work with cross compiling Problem: Pkg-config doesn't work with cross compiling. Solution: Use AC_PATH_TOOL() instead of AC_PATH_PROG(). (James McCoy, closes #2513)
author Christian Brabandt <cb@256bit.org>
date Sun, 28 Jan 2018 23:00:08 +0100
parents 0a738ac6189b
children eb45750114ed
comparison
equal deleted inserted replaced
13125:371ceeebbdaa 13126:35e148715059
2632 else 2632 else
2633 AC_MSG_RESULT(gtk test disabled) 2633 AC_MSG_RESULT(gtk test disabled)
2634 fi 2634 fi
2635 2635
2636 if test "X$PKG_CONFIG" = "X"; then 2636 if test "X$PKG_CONFIG" = "X"; then
2637 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 2637 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
2638 fi 2638 fi
2639 2639
2640 if test "x$PKG_CONFIG" != "xno"; then 2640 if test "x$PKG_CONFIG" != "xno"; then
2641 dnl First try finding version 2.2.0 or later. The 2.0.x series has 2641 dnl First try finding version 2.2.0 or later. The 2.0.x series has
2642 dnl problems (bold fonts, --remote doesn't work). 2642 dnl problems (bold fonts, --remote doesn't work).
2684 else 2684 else
2685 AC_MSG_RESULT(gtk test disabled) 2685 AC_MSG_RESULT(gtk test disabled)
2686 fi 2686 fi
2687 2687
2688 if test "X$PKG_CONFIG" = "X"; then 2688 if test "X$PKG_CONFIG" = "X"; then
2689 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 2689 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
2690 fi 2690 fi
2691 2691
2692 if test "x$PKG_CONFIG" != "xno"; then 2692 if test "x$PKG_CONFIG" != "xno"; then
2693 AM_PATH_GTK(3.0.0, 2693 AM_PATH_GTK(3.0.0,
2694 [GUI_LIB_LOC="$GTK_LIBDIR" 2694 [GUI_LIB_LOC="$GTK_LIBDIR"
3795 dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI 3795 dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
3796 dnl when -lacl works, also try to use -lattr (required for Debian). 3796 dnl when -lacl works, also try to use -lattr (required for Debian).
3797 dnl On Solaris, use the acl_get/set functions in libsec, if present. 3797 dnl On Solaris, use the acl_get/set functions in libsec, if present.
3798 AC_MSG_CHECKING(--disable-acl argument) 3798 AC_MSG_CHECKING(--disable-acl argument)
3799 AC_ARG_ENABLE(acl, 3799 AC_ARG_ENABLE(acl,
3800 [ --disable-acl Don't check for ACL support.], 3800 [ --disable-acl No check for ACL support.],
3801 , [enable_acl="yes"]) 3801 , [enable_acl="yes"])
3802 if test "$enable_acl" = "yes"; then 3802 if test "$enable_acl" = "yes"; then
3803 AC_MSG_RESULT(no) 3803 AC_MSG_RESULT(no)
3804 AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], 3804 AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
3805 AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" 3805 AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
3806 AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) 3806 AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
3807 3807
3808 AC_MSG_CHECKING(for POSIX ACL support) 3808 AC_MSG_CHECKING(for POSIX ACL support)
3809 AC_TRY_LINK([ 3809 AC_TRY_LINK([
3810 #include <sys/types.h> 3810 #include <sys/types.h>
3811 #ifdef HAVE_SYS_ACL_H 3811 #ifdef HAVE_SYS_ACL_H
3812 # include <sys/acl.h> 3812 # include <sys/acl.h>
3813 #endif 3813 #endif
3814 acl_t acl;], [acl = acl_get_file("foo", ACL_TYPE_ACCESS); 3814 acl_t acl;], [acl = acl_get_file("foo", ACL_TYPE_ACCESS);
3815 acl_set_file("foo", ACL_TYPE_ACCESS, acl); 3815 acl_set_file("foo", ACL_TYPE_ACCESS, acl);
3816 acl_free(acl);], 3816 acl_free(acl);],
3817 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL), 3817 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL),
3818 AC_MSG_RESULT(no)) 3818 AC_MSG_RESULT(no))
3819 3819
3820 AC_CHECK_LIB(sec, acl_get, [LIBS="$LIBS -lsec"; AC_DEFINE(HAVE_SOLARIS_ZFS_ACL)], 3820 AC_CHECK_LIB(sec, acl_get, [LIBS="$LIBS -lsec"; AC_DEFINE(HAVE_SOLARIS_ZFS_ACL)],
3821 AC_MSG_CHECKING(for Solaris ACL support) 3821 AC_MSG_CHECKING(for Solaris ACL support)
3822 AC_TRY_LINK([ 3822 AC_TRY_LINK([
3823 #ifdef HAVE_SYS_ACL_H 3823 #ifdef HAVE_SYS_ACL_H
3824 # include <sys/acl.h> 3824 # include <sys/acl.h>
3825 #endif], [acl("foo", GETACLCNT, 0, NULL); 3825 #endif], [acl("foo", GETACLCNT, 0, NULL);
3826 ], 3826 ],
3827 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL), 3827 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL),
3828 AC_MSG_RESULT(no))) 3828 AC_MSG_RESULT(no)))
3829 3829
3830 AC_MSG_CHECKING(for AIX ACL support) 3830 AC_MSG_CHECKING(for AIX ACL support)
3831 AC_TRY_LINK([ 3831 AC_TRY_LINK([
3832 #if STDC_HEADERS 3832 #if STDC_HEADERS
3833 # include <stdlib.h> 3833 # include <stdlib.h>
3834 # include <stddef.h> 3834 # include <stddef.h>
3835 #endif 3835 #endif
3836 #ifdef HAVE_SYS_ACL_H 3836 #ifdef HAVE_SYS_ACL_H