diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-14 06:39:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:39 -0500 |
| commit | 8ed1176a8d3ae80d27010243e389d449ab5a0148 (patch) | |
| tree | 556c7ecae12769bc58fb32818be04820c5fbead7 | |
| parent | a4e94eedf04524d5271344a492a41da951c535c2 (diff) | |
| download | samba-8ed1176a8d3ae80d27010243e389d449ab5a0148.tar.gz samba-8ed1176a8d3ae80d27010243e389d449ab5a0148.tar.bz2 samba-8ed1176a8d3ae80d27010243e389d449ab5a0148.zip | |
r18501: libreplace needs 'long long', bailout if not present
or the size is not 8 bytes or more.
samba4 doesn't need type checks anymore
metze
(This used to be commit d8fdd05482fc6b9bfb48d72db6b467e3e5c05e4d)
| -rw-r--r-- | source4/build/m4/check_types.m4 | 17 | ||||
| -rw-r--r-- | source4/build/m4/env.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace_cc.m4 | 7 |
3 files changed, 7 insertions, 18 deletions
diff --git a/source4/build/m4/check_types.m4 b/source4/build/m4/check_types.m4 deleted file mode 100644 index 5bd3722fa2..0000000000 --- a/source4/build/m4/check_types.m4 +++ /dev/null @@ -1,17 +0,0 @@ -dnl SMB Build Environment Types Checks -dnl ------------------------------------------------------- -dnl Copyright (C) Stefan (metze) Metzmacher 2004 -dnl Released under the GNU GPL -dnl ------------------------------------------------------- -dnl - -AC_CHECK_SIZEOF(short,cross) -AC_CHECK_SIZEOF(int,cross) -AC_CHECK_SIZEOF(long,cross) -AC_CHECK_SIZEOF(long long,cross) -if test x"$ac_cv_type_long_long" != x"yes";then - AC_MSG_ERROR([Sorry we need type 'long long']) -fi -if test $ac_cv_sizeof_long_long -lt 8;then - AC_MSG_ERROR([Sorry we need sizeof(long long) >= 8]) -fi diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index f7f812ae24..7f6495fea2 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -38,5 +38,4 @@ m4_include(build/m4/check_perl.m4) m4_include(build/m4/check_cc.m4) m4_include(build/m4/check_ld.m4) m4_include(build/m4/check_make.m4) -m4_include(build/m4/check_types.m4) m4_include(build/m4/check_doc.m4) diff --git a/source4/lib/replace/libreplace_cc.m4 b/source4/lib/replace/libreplace_cc.m4 index 2c58933a65..9f6912741e 100644 --- a/source4/lib/replace/libreplace_cc.m4 +++ b/source4/lib/replace/libreplace_cc.m4 @@ -90,5 +90,12 @@ AC_CHECK_SIZEOF(ssize_t) AC_CHECK_TYPE(intptr_t, unsigned long long) AC_CHECK_TYPE(ptrdiff_t, unsigned long long) +if test x"$ac_cv_type_long_long" != x"yes";then + AC_MSG_ERROR([LIBREPLACE needs type 'long long']) +fi +if test $ac_cv_sizeof_long_long -lt 8;then + AC_MSG_ERROR([LIBREPLACE needs sizeof(long long) >= 8]) +fi + AC__LIBREPLACE_ONLY_CC_CHECKS_END ]) dnl end AC_LIBREPLACE_CC_CHECKS |