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

diff --git a/source/build/m4/check_types.m4 b/source/build/m4/check_types.m4
deleted file mode 100644 (file)
index 5bd3722..0000000
--- a/source/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/source/build/m4/env.m4 b/source/build/m4/env.m4
index f7f812ae245b844e99d09242466f0a8be9de5333..7f6495fea299619fdec1730d7197590c1c29129a 100644 (file)
--- a/source/build/m4/env.m4
+++ b/source/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/source/lib/replace/libreplace_cc.m4 b/source/lib/replace/libreplace_cc.m4
index 2c58933a650c23c8813adf1c78aeb5aba04f68c8..9f6912741e9e14b25de3dd5b36d02e97c559e80d 100644 (file)
--- a/source/lib/replace/libreplace_cc.m4
+++ b/source/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