From: Bruno Haible Date: Fri, 13 Jan 2023 08:30:29 +0000 (+0100) Subject: qcopy-acl: Adjust link dependencies. X-Git-Tag: v1.0~1845 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=be8884dd02e43c1078aa8b751ae1a6f0ea0f245d;p=gnulib.git qcopy-acl: Adjust link dependencies. * modules/qcopy-acl (Depends-on): Add condition. (configure.ac): Set QCOPY_ACL_LIB. (Link): Add $(QCOPY_ACL_LIB). Remove $(LIB_ACL). * modules/qacl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB). * modules/acl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB). * modules/copy-file (Link): Add $(QCOPY_ACL_LIB). * modules/supersede (Link): Add $(QCOPY_ACL_LIB). * modules/acl-tests (Makefile.am): Link test-copy-acl with $(QCOPY_ACL_LIB). * modules/copy-file-tests (Makefile.am): Link test-copy-file with $(QCOPY_ACL_LIB). * modules/supersede-tests (Makefile.am): Link test-supersede with $(QCOPY_ACL_LIB). --- diff --git a/ChangeLog b/ChangeLog index 1ff605c36a..11334b1afa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2023-01-13 Bruno Haible + + qcopy-acl: Adjust link dependencies. + * modules/qcopy-acl (Depends-on): Add condition. + (configure.ac): Set QCOPY_ACL_LIB. + (Link): Add $(QCOPY_ACL_LIB). Remove $(LIB_ACL). + * modules/qacl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB). + * modules/acl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB). + * modules/copy-file (Link): Add $(QCOPY_ACL_LIB). + * modules/supersede (Link): Add $(QCOPY_ACL_LIB). + * modules/acl-tests (Makefile.am): Link test-copy-acl with + $(QCOPY_ACL_LIB). + * modules/copy-file-tests (Makefile.am): Link test-copy-file with + $(QCOPY_ACL_LIB). + * modules/supersede-tests (Makefile.am): Link test-supersede with + $(QCOPY_ACL_LIB). + 2023-01-13 Bruno Haible qcopy-acl: Avoid autoconf warning. diff --git a/modules/acl b/modules/acl index 8bcfd99420..bcc1f4906c 100644 --- a/modules/acl +++ b/modules/acl @@ -22,6 +22,8 @@ Include: Link: $(MBRTOWC_LIB) +$(LIB_ACL) +$(QCOPY_ACL_LIB) License: GPL diff --git a/modules/acl-tests b/modules/acl-tests index 44190b607d..2ee34c6523 100644 --- a/modules/acl-tests +++ b/modules/acl-tests @@ -26,5 +26,5 @@ TESTS += \ TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) -test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) +test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) @LIBINTL@ $(MBRTOWC_LIB) test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/copy-file b/modules/copy-file index dac8bd6358..a73e2a474c 100644 --- a/modules/copy-file +++ b/modules/copy-file @@ -37,6 +37,7 @@ Include: Link: $(LIB_ACL) +$(QCOPY_ACL_LIB) $(MBRTOWC_LIB) License: diff --git a/modules/copy-file-tests b/modules/copy-file-tests index 1c554696f9..087797c727 100644 --- a/modules/copy-file-tests +++ b/modules/copy-file-tests @@ -18,4 +18,4 @@ Makefile.am: TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-copy-file -test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB) +test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/qacl b/modules/qacl index 45753c7623..445f639f7b 100644 --- a/modules/qacl +++ b/modules/qacl @@ -15,6 +15,10 @@ Makefile.am: Include: +Link: +$(LIB_ACL) +$(QCOPY_ACL_LIB) + License: GPL diff --git a/modules/qcopy-acl b/modules/qcopy-acl index e0cd914953..8dd147927d 100644 --- a/modules/qcopy-acl +++ b/modules/qcopy-acl @@ -6,10 +6,16 @@ lib/qcopy-acl.c m4/xattr.m4 Depends-on: -acl-permissions +acl-permissions [test "$use_xattr" != yes] configure.ac: gl_FUNC_XATTR +if test "$use_xattr" = yes; then + QCOPY_ACL_LIB="$LIB_XATTR" +else + QCOPY_ACL_LIB="$LIB_ACL" +fi +AC_SUBST([QCOPY_ACL_LIB]) Makefile.am: lib_SOURCES += qcopy-acl.c @@ -18,7 +24,7 @@ Include: "acl.h" Link: -$(LIB_ACL) +$(QCOPY_ACL_LIB) License: GPL diff --git a/modules/supersede b/modules/supersede index 3118fad426..1f434fe221 100644 --- a/modules/supersede +++ b/modules/supersede @@ -36,6 +36,7 @@ Include: Link: $(LIB_ACL) +$(QCOPY_ACL_LIB) $(GETRANDOM_LIB) $(CLOCK_TIME_LIB) $(LIBTHREAD) diff --git a/modules/supersede-tests b/modules/supersede-tests index f3a9d777d9..d4b0566b0d 100644 --- a/modules/supersede-tests +++ b/modules/supersede-tests @@ -19,4 +19,4 @@ configure.ac: Makefile.am: TESTS += test-supersede check_PROGRAMS += test-supersede -test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD) +test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD)