From f1514e591d047866c1a8c25c27d8ab5614a681c5 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Wed, 11 Feb 2015 15:22:55 -0800 Subject: [PATCH] linkat_nofollow: Add fallback case for cross compiling * m4/linkat.m4: Guess no for Darwin, yes otherwise. --- ChangeLog | 3 +++ m4/linkat.m4 | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fea5f0ff37..9fc1f5621b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,9 @@ * modules/euidaccess (Depends-on): Add fcntl-h to ensure that AT_EACCESS gets declared. + linkat_nofollow: Add fallback case for cross compiling + * m4/linkat.m4: Guess no for Darwin, yes otherwise. + 2015-02-08 Daiki Ueno uniname/unimame-tests: don't link with -lunistring diff --git a/m4/linkat.m4 b/m4/linkat.m4 index 83429c534d..567cb5dcaa 100644 --- a/m4/linkat.m4 +++ b/m4/linkat.m4 @@ -38,7 +38,16 @@ AC_DEFUN([gl_FUNC_LINKAT], [gl_cv_func_linkat_nofollow=yes LINKAT_SYMLINK_NOTSUP=0], [gl_cv_func_linkat_nofollow=no - LINKAT_SYMLINK_NOTSUP=1]) + LINKAT_SYMLINK_NOTSUP=1], + [case "$host_os" in + darwin*) + gl_cv_func_linkat_nofollow="guessing no" + LINKAT_SYMLINK_NOTSUP=1 ;; + *) + gl_cv_func_linkat_nofollow="guessing yes" + LINKAT_SYMLINK_NOTSUP=0 ;; + esac]) + rm -rf conftest.l1 conftest.l2]) AC_CACHE_CHECK([whether linkat handles trailing slash correctly], @@ -90,7 +99,12 @@ AC_DEFUN([gl_FUNC_LINKAT], *) gl_linkat_slash_bug=1 ;; esac - if test "$gl_cv_func_linkat_nofollow" != yes \ + case "$gl_cv_func_linkat_nofollow" in + *yes) linkat_nofollow=yes ;; + *) linkat_nofollow=no ;; + esac + + if test "$linkat_nofollow" != yes \ || test $gl_linkat_slash_bug = 1; then REPLACE_LINKAT=1 AC_DEFINE_UNQUOTED([LINKAT_TRAILING_SLASH_BUG], [$gl_linkat_slash_bug], -- 2.39.5