diff options
| author | Guillem Jover <guillem@debian.org> | 2010-11-25 07:57:09 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2010-11-25 07:57:09 +0100 |
| commit | 7e8695bdb8fb3a1dd4cf2ba4a48586e068fe3058 (patch) | |
| tree | 7670ca88aecef40bbbbabc36bf622d18ed6a4b2b /m4 | |
| parent | 93bba14d3659578f19b5273dea2142d09a150a19 (diff) | |
| parent | 81aacd4b0a84df492d0ba33110537efb6fef836d (diff) | |
| download | dpkg-7e8695bdb8fb3a1dd4cf2ba4a48586e068fe3058.tar.gz | |
Merge branch 'sid' (through tag '1.15.8.6')
Conflicts:
debian/changelog
m4/dpkg-funcs.m4
man/dpkg.1
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/dpkg-funcs.m4 | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/m4/dpkg-funcs.m4 b/m4/dpkg-funcs.m4 index c5ea87c44..0877a4a95 100644 --- a/m4/dpkg-funcs.m4 +++ b/m4/dpkg-funcs.m4 @@ -85,21 +85,33 @@ AC_DEFUN([DPKG_MMAP], ]) ]) -# DPKG_FUNC_ASYNC_SYNC +# DPKG_FUNC_SYNC_SYNC # -------------------- -# Define HAVE_ASYNC_SYNC if sync() is asynchronous -AC_DEFUN([DPKG_FUNC_ASYNC_SYNC], +# Define USE_SYNC_SYNC if sync() is synchronous and it has been enabled +# on configure +AC_DEFUN([DPKG_FUNC_SYNC_SYNC], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_MSG_CHECKING([whether sync is asynchronous]) + + AC_MSG_CHECKING([whether sync is synchronous]) AS_CASE([$host_os], - [linux-*], [dpkg_cv_async_sync=no], - [dpkg_cv_async_sync=yes]) - AS_IF([test "x$dpkg_cv_async_sync" = "xyes"], - [AC_DEFINE([HAVE_ASYNC_SYNC], 1, - [Define to 1 if the 'sync' function is asynchronous])]) - AC_MSG_RESULT([$dpkg_cv_async_sync]) -])# DPKG_FUNC_ASYNC_SYNC + [linux-*], [dpkg_cv_sync_sync=yes], + [dpkg_cv_sync_sync=no]) + AC_MSG_RESULT([$dpkg_cv_sync_sync]) + + AC_ARG_ENABLE([sync-sync], + AS_HELP_STRING([--enable-sync-sync], + [enable usage of synchronous sync(2) if available]), + [], + [enable_sync_sync=no]) + AC_MSG_CHECKING([whether to use synchronous sync]) + AS_IF([test "x$dpkg_cv_sync_sync" = "xyes" && + test "x$enable_sync_sync" = "xyes"], + [AC_DEFINE([USE_SYNC_SYNC], 1, + [Define to 1 if sync(2) is synchronous])], + [enable_sync_sync=no]) + AC_MSG_RESULT([$enable_sync_sync]) +])# DPKG_FUNC_SYNC_SYNC # DPKG_CHECK_COMPAT_FUNCS(LIST) # ----------------------- |