Mercurial > gnulib
changeset 15626:a508d7847f6d
fdatasync: port to Solaris
Cater to Solaris requiring extra libraries for fdatasync.
* m4/fdatasync.m4 (gl_FUNC_FDATASYNC): Set LIB_FDATASYNC.
* modules/fdatasync (Link): Document it.
* modules/fdatasync-tests (test_fdatasync_LDADD): Link with it.
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Fri, 16 Sep 2011 14:12:01 -0600 |
| parents | eab059ee71cc |
| children | 4afad5701552 |
| files | ChangeLog m4/fdatasync.m4 modules/fdatasync modules/fdatasync-tests |
| diffstat | 4 files changed, 29 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 16 13:49:16 2011 -0600 +++ b/ChangeLog Fri Sep 16 14:12:01 2011 -0600 @@ -1,6 +1,11 @@ 2011-09-16 Eric Blake <eblake@redhat.com> - fdatasync: port to MacOS X 10.7. + fdatasync: port to Solaris + * m4/fdatasync.m4 (gl_FUNC_FDATASYNC): Set LIB_FDATASYNC. + * modules/fdatasync (Link): Document it. + * modules/fdatasync-tests (test_fdatasync_LDADD): Link with it. + + fdatasync: port to MacOS X 10.7 * m4/fdatasync.m4 (gl_FUNC_FDATASYNC): Check for present but not declared. * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Another default.
--- a/m4/fdatasync.m4 Fri Sep 16 13:49:16 2011 -0600 +++ b/m4/fdatasync.m4 Fri Sep 16 14:12:01 2011 -0600 @@ -1,4 +1,4 @@ -# fdatasync.m4 serial 2 +# fdatasync.m4 serial 3 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,13 +7,26 @@ AC_DEFUN([gl_FUNC_FDATASYNC], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([fdatasync]) - if test $ac_cv_func_fdatasync = no; then - HAVE_FDATASYNC=0 - fi - dnl MacOS X 10.7 has fdatasync but does not declare it. + + dnl Using AC_CHECK_FUNCS_ONCE would break our subsequent AC_SEARCH_LIBS AC_CHECK_DECLS_ONCE([fdatasync]) + LIB_FDATASYNC= + AC_SUBST([LIB_FDATASYNC]) + if test $ac_cv_have_decl_fdatasync = no; then HAVE_DECL_FDATASYNC=0 + dnl MacOS X 10.7 has fdatasync but does not declare it. + AC_CHECK_FUNCS([fdatasync]) + if test $ac_cv_func_fdatasync = no; then + HAVE_FDATASYNC=0 + fi + else + dnl Solaris <= 2.6 has fdatasync() in libposix4. + dnl Solaris 7..10 has it in librt. + gl_saved_libs=$LIBS + AC_SEARCH_LIBS([fdatasync], [rt posix4], + [test "$ac_cv_search_fdatasync" = "none required" || + LIB_FDATASYNC=$ac_cv_search_fdatasync]) + LIBS=$gl_saved_libs fi ])