From 91dc8145d6bb46926bcff16983e870554416d232 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 9 Nov 2011 02:42:45 +0100 Subject: [PATCH] More conditional dependencies. * modules/faccessat (Depends-on): Add conditions. * modules/fchmodat (Depends-on): Likewise. * modules/fchownat (Depends-on): Likewise. * modules/fstatat (Depends-on): Likewise. * modules/mkfifoat (Depends-on): Likewise. * modules/readlinkat (Depends-on): Likewise. * modules/symlinkat (Depends-on): Likewise. * modules/unlinkat (Depends-on): Likewise. * modules/utimensat (Depends-on): Likewise. * modules/mkdirat (Depends-on): Add sys_stat. Add conditions. * modules/linkat (Depends-on): Refine the conditions. * modules/renameat (Depends-on): Likewise. --- ChangeLog | 16 ++++++++++++++++ modules/faccessat | 16 ++++++++-------- modules/fchmodat | 16 ++++++++-------- modules/fchownat | 18 +++++++++--------- modules/fstatat | 20 ++++++++++---------- modules/linkat | 28 ++++++++++++++-------------- modules/mkdirat | 17 +++++++++-------- modules/mkfifoat | 16 ++++++++-------- modules/readlinkat | 16 ++++++++-------- modules/renameat | 20 ++++++++++---------- modules/symlinkat | 16 ++++++++-------- modules/unlinkat | 22 +++++++++++----------- modules/utimensat | 20 ++++++++++---------- 13 files changed, 129 insertions(+), 112 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48b51c703..2e1f6bef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2011-11-08 Bruno Haible + More conditional dependencies. + * modules/faccessat (Depends-on): Add conditions. + * modules/fchmodat (Depends-on): Likewise. + * modules/fchownat (Depends-on): Likewise. + * modules/fstatat (Depends-on): Likewise. + * modules/mkfifoat (Depends-on): Likewise. + * modules/readlinkat (Depends-on): Likewise. + * modules/symlinkat (Depends-on): Likewise. + * modules/unlinkat (Depends-on): Likewise. + * modules/utimensat (Depends-on): Likewise. + * modules/mkdirat (Depends-on): Add sys_stat. Add conditions. + * modules/linkat (Depends-on): Refine the conditions. + * modules/renameat (Depends-on): Likewise. + +2011-11-08 Bruno Haible + faccessat: Move AC_LIBOBJ invocation to module description. * m4/faccessat.m4 (gl_PREREQ_FACCESSAT): New macro. (gl_FUNC_FACESSAT): Don't test for access() here. Move AC_LIBOBJ diff --git a/modules/faccessat b/modules/faccessat index e73f5caa3..afdf080ab 100644 --- a/modules/faccessat +++ b/modules/faccessat @@ -8,15 +8,15 @@ lib/openat-priv.h m4/faccessat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -openat-die -openat-h -save-cwd unistd +extensions +at-internal [test $HAVE_FACCESSAT = 0] +dosname [test $HAVE_FACCESSAT = 0] +errno [test $HAVE_FACCESSAT = 0] +fchdir [test $HAVE_FACCESSAT = 0] +openat-die [test $HAVE_FACCESSAT = 0] +openat-h [test $HAVE_FACCESSAT = 0] +save-cwd [test $HAVE_FACCESSAT = 0] euidaccess [test $HAVE_FACCESSAT = 0] configure.ac: diff --git a/modules/fchmodat b/modules/fchmodat index 67881c631..6f5472d98 100644 --- a/modules/fchmodat +++ b/modules/fchmodat @@ -8,15 +8,15 @@ lib/openat-priv.h m4/fchmodat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -openat-die -openat-h -save-cwd sys_stat +extensions +at-internal [test $HAVE_FCHMODAT = 0] +dosname [test $HAVE_FCHMODAT = 0] +errno [test $HAVE_FCHMODAT = 0] +fchdir [test $HAVE_FCHMODAT = 0] +openat-die [test $HAVE_FCHMODAT = 0] +openat-h [test $HAVE_FCHMODAT = 0] +save-cwd [test $HAVE_FCHMODAT = 0] configure.ac: gl_FUNC_FCHMODAT diff --git a/modules/fchownat b/modules/fchownat index 97a84e48c..b7ec6a60a 100644 --- a/modules/fchownat +++ b/modules/fchownat @@ -8,17 +8,17 @@ lib/openat-priv.h m4/fchownat.m4 Depends-on: -at-internal -dosname -errno +unistd extensions -fchdir -fstatat +at-internal [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +dosname [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +errno [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +fchdir [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] lchown [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] -openat-die -openat-h -save-cwd -unistd +openat-die [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +openat-h [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +save-cwd [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +fstatat [test $REPLACE_FCHOWNAT = 1] configure.ac: gl_FUNC_FCHOWNAT diff --git a/modules/fstatat b/modules/fstatat index 56ad8a59c..7a6123aff 100644 --- a/modules/fstatat +++ b/modules/fstatat @@ -8,17 +8,17 @@ lib/openat-priv.h m4/fstatat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -fcntl-h -lstat -openat-die -openat-h -save-cwd sys_stat +extensions +at-internal [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +dosname [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +errno [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +fchdir [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +fcntl-h [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +lstat [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +openat-die [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +openat-h [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +save-cwd [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] configure.ac: gl_FUNC_FSTATAT diff --git a/modules/linkat b/modules/linkat index 3b6559d6b..f31dcf70c 100644 --- a/modules/linkat +++ b/modules/linkat @@ -9,25 +9,25 @@ m4/linkat.m4 Depends-on: unistd extensions -areadlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -areadlinkat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -at-internal [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] dirname-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -dosname [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] errno [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] fcntl-h [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] filenamecat-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -fstat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -fstatat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -getcwd-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -openat-h [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -openat-die [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -link [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] link-follow [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -lstat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -same-inode [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -save-cwd [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -symlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] +areadlink [test $HAVE_LINKAT = 0] +at-internal [test $HAVE_LINKAT = 0] +dosname [test $HAVE_LINKAT = 0] +fstat [test $HAVE_LINKAT = 0] +getcwd-lgpl [test $HAVE_LINKAT = 0] +openat-h [test $HAVE_LINKAT = 0] +openat-die [test $HAVE_LINKAT = 0] +link [test $HAVE_LINKAT = 0] +lstat [test $HAVE_LINKAT = 0] +same-inode [test $HAVE_LINKAT = 0] +save-cwd [test $HAVE_LINKAT = 0] +symlink [test $HAVE_LINKAT = 0] +areadlinkat [test $REPLACE_LINKAT = 1] +fstatat [test $REPLACE_LINKAT = 1] configure.ac: gl_FUNC_LINKAT diff --git a/modules/mkdirat b/modules/mkdirat index f3b851133..f6c7411eb 100644 --- a/modules/mkdirat +++ b/modules/mkdirat @@ -8,16 +8,17 @@ lib/openat-priv.h m4/mkdirat.m4 Depends-on: -at-internal -dosname -errno +sys_stat extensions -fchdir +at-internal [test $HAVE_MKDIRAT = 0] +dosname [test $HAVE_MKDIRAT = 0] +errno [test $HAVE_MKDIRAT = 0] +fchdir [test $HAVE_MKDIRAT = 0] mkdir [test $HAVE_MKDIRAT = 0] -openat-die -openat-h -save-cwd -unistd +openat-die [test $HAVE_MKDIRAT = 0] +openat-h [test $HAVE_MKDIRAT = 0] +save-cwd [test $HAVE_MKDIRAT = 0] +unistd [test $HAVE_MKDIRAT = 0] configure.ac: gl_FUNC_MKDIRAT diff --git a/modules/mkfifoat b/modules/mkfifoat index e4ba51463..c41f436c7 100644 --- a/modules/mkfifoat +++ b/modules/mkfifoat @@ -8,15 +8,15 @@ lib/at-func.c m4/mkfifoat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -openat-die -openat-h -save-cwd sys_stat +extensions +at-internal [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +dosname [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +errno [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +fchdir [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +openat-die [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +openat-h [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +save-cwd [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] mkfifo [test $HAVE_MKFIFOAT = 0] mknod [test $HAVE_MKNODAT = 0] diff --git a/modules/readlinkat b/modules/readlinkat index 3bf67110b..17a171b8f 100644 --- a/modules/readlinkat +++ b/modules/readlinkat @@ -7,15 +7,15 @@ lib/at-func.c m4/readlinkat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -openat-die -openat-h -save-cwd unistd +extensions +at-internal [test $HAVE_READLINKAT = 0] +dosname [test $HAVE_READLINKAT = 0] +errno [test $HAVE_READLINKAT = 0] +fchdir [test $HAVE_READLINKAT = 0] +openat-die [test $HAVE_READLINKAT = 0] +openat-h [test $HAVE_READLINKAT = 0] +save-cwd [test $HAVE_READLINKAT = 0] readlink [test $HAVE_READLINKAT = 0] configure.ac: diff --git a/modules/renameat b/modules/renameat index d7a30dc2c..ca03f9aa1 100644 --- a/modules/renameat +++ b/modules/renameat @@ -10,18 +10,18 @@ Depends-on: stdio extensions fcntl-h -at-internal [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -dosname [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -fstat [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -fstatat [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -getcwd-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -openat-die [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] openat-h [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -rename [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -same-inode [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -save-cwd [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] -stdbool [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] +fstatat [test $REPLACE_RENAMEAT = 1] +stdbool [test $REPLACE_RENAMEAT = 1] +at-internal [test $HAVE_RENAMEAT = 0] +dosname [test $HAVE_RENAMEAT = 0] +fstat [test $HAVE_RENAMEAT = 0] +getcwd-lgpl [test $HAVE_RENAMEAT = 0] +openat-die [test $HAVE_RENAMEAT = 0] +rename [test $HAVE_RENAMEAT = 0] +same-inode [test $HAVE_RENAMEAT = 0] +save-cwd [test $HAVE_RENAMEAT = 0] configure.ac: gl_FUNC_RENAMEAT diff --git a/modules/symlinkat b/modules/symlinkat index 93bded1d8..0fdf41c55 100644 --- a/modules/symlinkat +++ b/modules/symlinkat @@ -7,15 +7,15 @@ lib/at-func.c m4/symlinkat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -openat-die -openat-h -save-cwd unistd +extensions +at-internal [test $HAVE_SYMLINKAT = 0] +dosname [test $HAVE_SYMLINKAT = 0] +errno [test $HAVE_SYMLINKAT = 0] +fchdir [test $HAVE_SYMLINKAT = 0] +openat-die [test $HAVE_SYMLINKAT = 0] +openat-h [test $HAVE_SYMLINKAT = 0] +save-cwd [test $HAVE_SYMLINKAT = 0] symlink [test $HAVE_SYMLINKAT = 0] configure.ac: diff --git a/modules/unlinkat b/modules/unlinkat index 7ab422ec8..9a6075770 100644 --- a/modules/unlinkat +++ b/modules/unlinkat @@ -8,19 +8,19 @@ lib/openat-priv.h m4/unlinkat.m4 Depends-on: -at-internal -dosname -errno +unistd extensions -fchdir -fcntl-h -fstatat -openat-die -openat-h +fcntl-h [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] +openat-h [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] +sys_stat [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] +fstatat [test $REPLACE_UNLINKAT = 1] +at-internal [test $HAVE_UNLINKAT = 0] +dosname [test $HAVE_UNLINKAT = 0] +errno [test $HAVE_UNLINKAT = 0] +fchdir [test $HAVE_UNLINKAT = 0] +openat-die [test $HAVE_UNLINKAT = 0] rmdir [test $HAVE_UNLINKAT = 0] -save-cwd -sys_stat -unistd +save-cwd [test $HAVE_UNLINKAT = 0] unlink [test $HAVE_UNLINKAT = 0] configure.ac: diff --git a/modules/utimensat b/modules/utimensat index 1839d435e..a90590960 100644 --- a/modules/utimensat +++ b/modules/utimensat @@ -7,18 +7,18 @@ lib/at-func.c m4/utimensat.m4 Depends-on: -at-internal -dosname -errno -extensions -fchdir -fcntl-h -openat-die -openat-h -save-cwd sys_stat -fstatat [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +extensions +at-internal [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +dosname [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +errno [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +fchdir [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +fcntl-h [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +openat-die [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +openat-h [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +save-cwd [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] utimens [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +fstatat [test $REPLACE_UTIMENSAT = 1] configure.ac: gl_FUNC_UTIMENSAT -- 2.11.0