summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathaniel McCallum <nathaniel@natemccallum.com>2009-06-22 15:26:33 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-06-29 13:39:52 +1000
commit1e21adaaf6409ab3e2d33a5e48da282e1926a720 (patch)
tree99118cbe7b6affd3a011f1b2e3009c491cf06182
parentbc7b608625d427e9e6cb38312326eec59d571653 (diff)
downloadsamba-1e21adaaf6409ab3e2d33a5e48da282e1926a720.tar.gz
samba-1e21adaaf6409ab3e2d33a5e48da282e1926a720.tar.bz2
samba-1e21adaaf6409ab3e2d33a5e48da282e1926a720.zip
Two patches which fix issues on cross compiling/building
-rw-r--r--lib/util/time.m42
-rw-r--r--source4/build/m4/check_cc.m44
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/util/time.m4 b/lib/util/time.m4
index f61ae4cd25..675e20129f 100644
--- a/lib/util/time.m4
+++ b/lib/util/time.m4
@@ -3,7 +3,7 @@ AC_TRY_RUN([
#include <sys/time.h>
#include <unistd.h>
main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
- samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,samba_cv_HAVE_GETTIMEOFDAY_TZ=no,samba_cv_HAVE_GETTIMEOFDAY_TZ=cross)])
+ samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,samba_cv_HAVE_GETTIMEOFDAY_TZ=no,samba_cv_HAVE_GETTIMEOFDAY_TZ=yes)])
if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
fi
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
index 55802850b0..32e4b5083d 100644
--- a/source4/build/m4/check_cc.m4
+++ b/source4/build/m4/check_cc.m4
@@ -45,7 +45,9 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_C
return 0;
}
],
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)])
+ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,
+ samba_cv_CC_NEGATIVE_ENUM_VALUES=no,
+ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes)])
if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum support])
fi