diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-01-28 22:48:55 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-01-28 22:48:55 +0100 |
commit | d6d304298a6b9842164a53e7be386d55d18ce79f (patch) | |
tree | 28237b0a500980bf36429bd4a7e701cb29c0d169 /src | |
parent | 40962ec9c0e7b8699e101182b06ddd39dc0e1212 (diff) |
patch 8.0.1437: pkg-config doesn't work with cross compilingv8.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)
Diffstat (limited to 'src')
-rwxr-xr-x | src/auto/configure | 144 | ||||
-rw-r--r-- | src/configure.ac | 24 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 143 insertions, 27 deletions
diff --git a/src/auto/configure b/src/auto/configure index fd73e92d05..6a16779408 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -1513,7 +1513,7 @@ Optional Features: --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-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,8 +8887,9 @@ $as_echo "gtk test disabled" >&6; } 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 + 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,7 +8915,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -8928,6 +8928,63 @@ $as_echo "no" >&6; } 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,8 +9238,9 @@ $as_echo "gtk test disabled" >&6; } 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 + 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,7 +9266,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -9222,6 +9279,63 @@ $as_echo "no" >&6; } 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,9 +12817,9 @@ else fi if test "$enable_acl" = "yes"; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $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 "$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,9 +12941,9 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5 + { $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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -12858,7 +12972,7 @@ fi 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 "$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,7 +13014,7 @@ if test "x$ac_cv_lib_sec_acl_get" = xyes; then : 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_SYS_ACL_H @@ -12928,9 +13042,9 @@ rm -f core conftest.err conftest.$ac_objext \ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5 + { $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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if STDC_HEADERS diff --git a/src/configure.ac b/src/configure.ac index 0883cb7d87..d78ec7a2b1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2634,7 +2634,7 @@ if test -z "$SKIP_GTK2"; then fi if test "X$PKG_CONFIG" = "X"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + AC_PATH_TOOL(PKG_CONFIG, pkg-config, no) fi if test "x$PKG_CONFIG" != "xno"; then @@ -2686,7 +2686,7 @@ if test -z "$SKIP_GTK3"; then fi if test "X$PKG_CONFIG" = "X"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + AC_PATH_TOOL(PKG_CONFIG, pkg-config, no) fi if test "x$PKG_CONFIG" != "xno"; then @@ -3797,16 +3797,16 @@ dnl when -lacl works, also try to use -lattr (required for Debian). 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.], + [ --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_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([ + AC_MSG_CHECKING(for POSIX ACL support) + AC_TRY_LINK([ #include <sys/types.h> #ifdef HAVE_SYS_ACL_H # include <sys/acl.h> @@ -3817,9 +3817,9 @@ acl_t acl;], [acl = acl_get_file("foo", ACL_TYPE_ACCESS); 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([ + 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,8 +3827,8 @@ AC_TRY_LINK([ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL), AC_MSG_RESULT(no))) -AC_MSG_CHECKING(for AIX ACL support) -AC_TRY_LINK([ + AC_MSG_CHECKING(for AIX ACL support) + AC_TRY_LINK([ #if STDC_HEADERS # include <stdlib.h> # include <stddef.h> diff --git a/src/version.c b/src/version.c index 72fb66667d..39abe1fb33 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1437, +/**/ 1436, /**/ 1435, |