Re: openat: conditional dependencies

[Bruno Haible]

Jim Meyering wrote:
> >> 2011-11-05  Bruno Haible  <address@hidden>
> >>
> >>    openat: Conditionalize dependencies.
> ...
> This change looks fine.

OK, I've applied it. Now, as the last patch of the series, I'm adding
conditional dependencies for all *at modules. No changes of the lib/*
source code are needed for these.


2011-11-08  Bruno Haible  <address@hidden>

        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.

*** modules/faccessat.orig      Wed Nov  9 02:27:03 2011
--- modules/faccessat   Wed Nov  9 02:26:46 2011
***************
*** 8,22 ****
  m4/faccessat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- openat-die
- openat-h
- save-cwd
  unistd
  euidaccess      [test $HAVE_FACCESSAT = 0]
  
  configure.ac:
--- 8,22 ----
  m4/faccessat.m4
  
  Depends-on:
  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:
*** modules/fchmodat.orig       Wed Nov  9 02:27:03 2011
--- modules/fchmodat    Wed Nov  9 02:20:05 2011
***************
*** 8,22 ****
  m4/fchmodat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- openat-die
- openat-h
- save-cwd
  sys_stat
  
  configure.ac:
  gl_FUNC_FCHMODAT
--- 8,22 ----
  m4/fchmodat.m4
  
  Depends-on:
  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
*** modules/fchownat.orig       Wed Nov  9 02:27:03 2011
--- modules/fchownat    Wed Nov  9 02:20:05 2011
***************
*** 8,24 ****
  m4/fchownat.m4
  
  Depends-on:
! at-internal
! dosname
! errno
  extensions
! fchdir
! fstatat
  lchown          [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1]
! openat-die
! openat-h
! save-cwd
! unistd
  
  configure.ac:
  gl_FUNC_FCHOWNAT
--- 8,24 ----
  m4/fchownat.m4
  
  Depends-on:
! unistd
  extensions
! 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      [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
*** modules/fstatat.orig        Wed Nov  9 02:27:03 2011
--- modules/fstatat     Wed Nov  9 02:20:55 2011
***************
*** 8,24 ****
  m4/fstatat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- fcntl-h
- lstat
- openat-die
- openat-h
- save-cwd
  sys_stat
  
  configure.ac:
  gl_FUNC_FSTATAT
--- 8,24 ----
  m4/fstatat.m4
  
  Depends-on:
  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
*** modules/linkat.orig Wed Nov  9 02:27:03 2011
--- modules/linkat      Wed Nov  9 02:20:05 2011
***************
*** 9,33 ****
  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]
  
  configure.ac:
  gl_FUNC_LINKAT
--- 9,33 ----
  Depends-on:
  unistd
  extensions
  dirname-lgpl     [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]
  link-follow      [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
*** modules/mkdirat.orig        Wed Nov  9 02:27:03 2011
--- modules/mkdirat     Wed Nov  9 02:20:05 2011
***************
*** 8,23 ****
  m4/mkdirat.m4
  
  Depends-on:
! at-internal
! dosname
! errno
  extensions
! fchdir
  mkdir           [test $HAVE_MKDIRAT = 0]
! openat-die
! openat-h
! save-cwd
! unistd
  
  configure.ac:
  gl_FUNC_MKDIRAT
--- 8,24 ----
  m4/mkdirat.m4
  
  Depends-on:
! sys_stat
  extensions
! 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      [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
*** modules/mkfifoat.orig       Wed Nov  9 02:27:03 2011
--- modules/mkfifoat    Wed Nov  9 02:20:05 2011
***************
*** 8,22 ****
  m4/mkfifoat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- openat-die
- openat-h
- save-cwd
  sys_stat
  mkfifo          [test $HAVE_MKFIFOAT = 0]
  mknod           [test $HAVE_MKNODAT = 0]
  
--- 8,22 ----
  m4/mkfifoat.m4
  
  Depends-on:
  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]
  
*** modules/readlinkat.orig     Wed Nov  9 02:27:03 2011
--- modules/readlinkat  Wed Nov  9 02:20:05 2011
***************
*** 7,21 ****
  m4/readlinkat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- openat-die
- openat-h
- save-cwd
  unistd
  readlink        [test $HAVE_READLINKAT = 0]
  
  configure.ac:
--- 7,21 ----
  m4/readlinkat.m4
  
  Depends-on:
  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:
*** modules/renameat.orig       Wed Nov  9 02:27:03 2011
--- modules/renameat    Wed Nov  9 02:23:09 2011
***************
*** 10,27 ****
  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]
  
  configure.ac:
  gl_FUNC_RENAMEAT
--- 10,27 ----
  stdio
  extensions
  fcntl-h
  filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
  openat-h         [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
*** modules/symlinkat.orig      Wed Nov  9 02:27:03 2011
--- modules/symlinkat   Wed Nov  9 02:20:05 2011
***************
*** 7,21 ****
  m4/symlinkat.m4
  
  Depends-on:
- at-internal
- dosname
- errno
- extensions
- fchdir
- openat-die
- openat-h
- save-cwd
  unistd
  symlink         [test $HAVE_SYMLINKAT = 0]
  
  configure.ac:
--- 7,21 ----
  m4/symlinkat.m4
  
  Depends-on:
  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:
*** modules/unlinkat.orig       Wed Nov  9 02:27:03 2011
--- modules/unlinkat    Wed Nov  9 02:20:05 2011
***************
*** 8,26 ****
  m4/unlinkat.m4
  
  Depends-on:
! at-internal
! dosname
! errno
  extensions
! fchdir
! fcntl-h
! fstatat
! openat-die
! openat-h
  rmdir           [test $HAVE_UNLINKAT = 0]
! save-cwd
! sys_stat
! unistd
  unlink          [test $HAVE_UNLINKAT = 0]
  
  configure.ac:
--- 8,26 ----
  m4/unlinkat.m4
  
  Depends-on:
! unistd
  extensions
! 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        [test $HAVE_UNLINKAT = 0]
  unlink          [test $HAVE_UNLINKAT = 0]
  
  configure.ac:
*** modules/utimensat.orig      Wed Nov  9 02:27:03 2011
--- modules/utimensat   Wed Nov  9 02:20:05 2011
***************
*** 7,24 ****
  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]
  utimens         [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
  
  configure.ac:
  gl_FUNC_UTIMENSAT
--- 7,24 ----
  m4/utimensat.m4
  
  Depends-on:
  sys_stat
! 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
-- 
In memoriam The inmates of the Daugavpils Ghetto 
<http://en.wikipedia.org/wiki/Daugavpils_Ghetto>