X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fcopy-file-tests;h=cc06a0bb50a278a1392d4b7566cfd6da34dbc526;hb=bbfcd2f1a92c9bdbb8d7d7d0a8a8c6665c316747;hp=424ff3153232afa93cf9d27eab03f1e66bfa2702;hpb=3ecbd9ebd7a287c741c5e340ab3a43192b3781a5;p=gnulib.git

diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index 424ff3153..cc06a0bb5 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -1,33 +1,21 @@
 Files:
 tests/test-copy-file.sh
+tests/test-copy-file-1.sh
+tests/test-copy-file-2.sh
 tests/test-copy-file.c
-tests/test-copy-file-sameacls.c
+tests/macros.h
 
 Depends-on:
 acl
+acl-tests
 progname
 read-file
 xalloc
 
 configure.ac:
-AC_REQUIRE([gl_FUNC_ACL])
-save_LIBS="$LIBS"
-LIBS="$LIB_ACL $LIBS"
-dnl Test for functions present on Linux, FreeBSD, MacOS X, IRIX, Tru64, Cygwin.
-AC_CHECK_FUNCS([acl_get_file])
-dnl Test for functions present on Solaris.
-AC_CHECK_FUNCS([acl])
-dnl Test for functions present on HP-UX.
-AC_CHECK_FUNCS([getacl])
-dnl Test for functions present on AIX.
-AC_CHECK_FUNCS([aclx_get])
-dnl Test for functions present on older AIX.
-AC_CHECK_FUNCS([statacl])
-LIBS="$save_LIBS"
 
 Makefile.am:
-TESTS += test-copy-file.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
-check_PROGRAMS += test-copy-file test-copy-file-sameacls
+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) @LIBINTL@
-test_copy_file_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@