diff options
| author | Volker Lendecke <vl@samba.org> | 2013-01-12 16:08:07 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-01-14 21:16:23 +0100 |
| commit | e0bfb59803184c44cfc354b99ba3d8d7bbfc72b9 (patch) | |
| tree | 9472551c7fe96fb464d5803701c4fa2337c0e416 /lib | |
| parent | d87ad906df96ac82924ccaf1a127b20c745f1dca (diff) | |
| download | samba-e0bfb59803184c44cfc354b99ba3d8d7bbfc72b9.tar.gz samba-e0bfb59803184c44cfc354b99ba3d8d7bbfc72b9.tar.bz2 samba-e0bfb59803184c44cfc354b99ba3d8d7bbfc72b9.zip | |
Fix bug 9548: Correctly detect O_DIRECT
Reviewed by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Jan 14 21:16:23 CET 2013 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/libreplace.m4 | 21 | ||||
| -rw-r--r-- | lib/replace/wscript | 11 |
2 files changed, 21 insertions, 11 deletions
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index ac2af27f31..5a4184493e 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -357,6 +357,16 @@ if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then fi +dnl Check if the C compiler understands volatile (it should, being ANSI). +AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [ + AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0], + libreplace_cv_volatile=yes,libreplace_cv_volatile=no)]) +if test x"$libreplace_cv_volatile" = x"yes"; then + AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile]) +fi + +m4_include(system/config.m4) + AC_CACHE_CHECK([for O_DIRECT flag to open(2)],libreplace_cv_HAVE_OPEN_O_DIRECT,[ AC_TRY_COMPILE([ #include <unistd.h> @@ -369,17 +379,6 @@ if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then AC_DEFINE(HAVE_OPEN_O_DIRECT,1,[Whether the open(2) accepts O_DIRECT]) fi - -dnl Check if the C compiler understands volatile (it should, being ANSI). -AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [ - AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0], - libreplace_cv_volatile=yes,libreplace_cv_volatile=no)]) -if test x"$libreplace_cv_volatile" = x"yes"; then - AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile]) -fi - -m4_include(system/config.m4) - m4_include(dlfcn.m4) m4_include(strptime.m4) m4_include(win32.m4) diff --git a/lib/replace/wscript b/lib/replace/wscript index 296dae907f..674b99d1f2 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -106,6 +106,17 @@ struct foo bar = { .y = 'X', .x = 1 }; conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h') conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h') + conf.CHECK_CODE(''' + #include <unistd.h> + #ifdef HAVE_FCNTL_H + #include <fcntl.h> + #endif + int main(void) { int fd = open("/dev/null", O_DIRECT); } + ''', + define='HAVE_OPEN_O_DIRECT', + addmain=False, + msg='Checking for O_DIRECT flag to open(2)') + conf.CHECK_TYPES('"long long" intptr_t uintptr_t ptrdiff_t comparison_fn_t') conf.CHECK_TYPE('_Bool', define='HAVE__Bool') conf.CHECK_TYPE('bool', define='HAVE_BOOL') |