From 8a0efd04dc9583c96b4a0d3c311ff216e07dcdcd Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 4 Sep 2009 15:40:22 -0600 Subject: [PATCH] link-follow: fix logic bug in prior patch * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Fix bug that reversed sense of yes and no in prior patch. Avoid confusing compilation failure with desired semantics. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ m4/link-follow.m4 | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e63d09ea0..193ec7f19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-09-04 Eric Blake + link-follow: fix logic bug in prior patch + * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Fix bug that + reversed sense of yes and no in prior patch. Avoid confusing + compilation failure with desired semantics. + link-follow: accomodate mingw and cross-compilation * m4/link-follow.m4 (gl_AC_FUNC_LINK_FOLLOWS_SYMLINK): Rename... (gl_FUNC_LINK_FOLLOWS_SYMLINK): ...to this. Change diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index eb98c3b62..48885eae4 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -1,4 +1,4 @@ -# serial 13 +# serial 14 dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. @@ -60,17 +60,17 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], /* If the dev/inode of hard and file are the same, then the link call followed the symlink. */ - return SAME_INODE (sb_hard, sb_file) ? 0 : 1; + return SAME_INODE (sb_hard, sb_file) ? 1 : 0; } ]])], - [gl_cv_func_link_follows_symlink=yes], - [gl_cv_func_link_follows_symlink=no], + [gl_cv_func_link_follows_symlink=no], dnl GNU behavior + [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed [gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling. ) ]) case $gl_cv_func_link_follows_symlink in - yes) ;; - no) gl_link_follows_symlinks=1 ;; + yes) gl_link_follows_symlinks=1 ;; + no) ;; # already defaulted to 0 *) gl_link_follows_symlinks=-1 ;; esac fi -- 2.11.0