svn commit: samba r22912 - in branches/SAMBA_3_0_25/source: .

jra at samba.org jra at samba.org
Tue May 15 16:56:21 GMT 2007


Author: jra
Date: 2007-05-15 16:56:21 +0000 (Tue, 15 May 2007)
New Revision: 22912

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22912

Log:
As I'd merged James's fix, it's my fault and I need to merge
Volker's build fix :-(. From r22892
"Fix the build, it did not find that gettimeofday takes two arguments on
my box. AC_TRY_LINK seems not to take a main { } frame."
Jeremy.

Modified:
   branches/SAMBA_3_0_25/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0_25/source/configure.in
===================================================================
--- branches/SAMBA_3_0_25/source/configure.in	2007-05-15 15:49:55 UTC (rev 22911)
+++ branches/SAMBA_3_0_25/source/configure.in	2007-05-15 16:56:21 UTC (rev 22912)
@@ -2109,12 +2109,11 @@
 AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[
 AC_TRY_LINK([
 #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)])
+#include <unistd.h>], [struct timeval tv; return gettimeofday(&tv, NULL);],
+           samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,
+	   samba_cv_HAVE_GETTIMEOFDAY_TZ=no)])
 if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
-    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday takes a tz argument])
 fi
 
 if test x"$samba_cv_WITH_PROFILE" = x"yes"; then



More information about the samba-cvs mailing list