svn commit: samba r8450 - in branches/SAMBA_4_0/source: heimdal_build lib/replace

[tridge at samba.org]

Author: tridge
Date: 2005-07-14 06:36:19 +0000 (Thu, 14 Jul 2005)
New Revision: 8450

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

Log:
more configure tests for solaris. It now builds some binaries, but
fails in the ejs floating point code.

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.h
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/heimdal_build/replace.c
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.h	2005-07-14 05:54:32 UTC (rev 8449)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h	2005-07-14 06:36:19 UTC (rev 8450)
@@ -3,6 +3,9 @@
   Samba source tree
 */
 
+#ifndef HAVE_HEIMDAL_CONFIG_H
+#define HAVE_HEIMDAL_CONFIG_H 1
+
 /* bring in the samba4 config.h */
 #include "include/config.h"
 
@@ -42,3 +45,5 @@
 #include <stdarg.h>
 #include "lib/replace/replace.h"
 #endif
+
+#endif

Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-07-14 05:54:32 UTC (rev 8449)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-07-14 06:36:19 UTC (rev 8450)
@@ -87,6 +87,8 @@
 	hstrerror				\
 	err					\
 	errx					\
+	warnx					\
+	flock					\
 	writev
 ])
 
@@ -174,6 +176,10 @@
 AC_PROG_LEX
 AC_PROG_YACC
 
+AC_CHECK_TYPES(u_int32_t)
+AC_CHECK_TYPES(u_int16_t)
+AC_CHECK_TYPES(u_int8_t)
+
 # to enable kerberos, unpack a heimdal source tree in the heimdal directory
 # of the samba source tree
 if test -d heimdal; then

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-07-14 05:54:32 UTC (rev 8449)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-07-14 06:36:19 UTC (rev 8450)
@@ -179,7 +179,6 @@
 	heimdal/lib/asn1/der_length.o \
 	heimdal/lib/asn1/der_copy.o \
 	heimdal/lib/asn1/der_cmp.o \
-	heimdal/lib/asn1/timegm.o \
 	heimdal/lib/asn1/asn1_AD_IF_RELEVANT.o \
 	heimdal/lib/asn1/asn1_APOptions.o \
 	heimdal/lib/asn1/asn1_AP_REP.o \
@@ -282,7 +281,8 @@
 	heimdal/lib/roken/strlwr.o \
 	heimdal/lib/roken/strsep_copy.o \
 	heimdal/lib/roken/strupr.o \
-	heimdal/lib/roken/strpool.o
+	heimdal/lib/roken/strpool.o \
+	heimdal_build/replace.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################

Modified: branches/SAMBA_4_0/source/heimdal_build/replace.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/replace.c	2005-07-14 05:54:32 UTC (rev 8449)
+++ branches/SAMBA_4_0/source/heimdal_build/replace.c	2005-07-14 06:36:19 UTC (rev 8450)
@@ -24,6 +24,7 @@
 #include "config.h"
 #include <stdio.h>
 #include "err.h"
+#include "roken.h"
 
 #ifndef HAVE_ERR
  void err(int eval, const char *format, ...)
@@ -47,3 +48,31 @@
 	exit(eval);
 }
 #endif
+
+#ifndef HAVE_WARNX
+ void warnx(const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+}
+#endif
+
+#ifndef HAVE_FLOCK
+ int flock(int fd, int op)
+{
+	switch (op & (LOCK_UN|LOCK_SH|LOCK_EX)) {
+	case LOCK_UN:
+		return fcntl_lock(fd, F_SETLK, 0, 0, F_UNLCK);
+	case LOCK_SH:
+		return fcntl_lock(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW, 
+				  0, 0, F_RDLCK);
+	case LOCK_EX:
+		return fcntl_lock(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW, 
+				  0, 0, F_WRLCK);
+	}
+	errno = EINVAL;
+	return -1;
+}
+#endif

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2005-07-14 05:54:32 UTC (rev 8449)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2005-07-14 06:36:19 UTC (rev 8450)
@@ -119,4 +119,16 @@
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
+#ifndef HAVE_U_INT32_T
+typedef unsigned u_int32_t;
 #endif
+
+#ifndef HAVE_U_INT16_T
+typedef unsigned short u_int16_t;
+#endif
+
+#ifndef HAVE_U_INT8_T
+typedef unsigned char u_int8_t;
+#endif
+
+#endif