svn commit: samba r20592 - in
branches/SAMBA_4_0/source/heimdal_build: .
jpeach at samba.org
jpeach at samba.org
Sun Jan 7 04:43:05 GMT 2007
Author: jpeach
Date: 2007-01-07 04:43:04 +0000 (Sun, 07 Jan 2007)
New Revision: 20592
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20592
Log:
Use the Heimdal copy of err.h only if the build host doesn't have it.
Removed:
branches/SAMBA_4_0/source/heimdal_build/err.h
Modified:
branches/SAMBA_4_0/source/heimdal_build/config.m4
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4 2007-01-07 01:04:49 UTC (rev 20591)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4 2007-01-07 04:43:04 UTC (rev 20592)
@@ -31,12 +31,19 @@
])
+dnl Not all systems have err.h, so we provide a replacement. Heimdal
+dnl unconditionally #includes <err.h>, so we need to create an err.h,
+dnl but we can't just have a static one because we don't want to use
+dnl it on systems that have a real err.h. If the system has a real
+dnl err.h, we should use that (eg. on Darwin, the declarations get
+dnl linker attributes added, so we can't guarantee that our local
+dnl declarations will be correct). Phew!
+AC_CHECK_HEADERS([err.h], [],
+ [ cp heimdal/lib/roken/err.hin heimdal_build/err.h ])
-
AC_CHECK_HEADERS([ \
crypt.h \
curses.h \
- err.h \
errno.h \
inttypes.h \
netdb.h \
@@ -89,6 +96,7 @@
closefrom \
hstrerror \
err \
+ warn \
errx \
warnx \
flock \
Deleted: branches/SAMBA_4_0/source/heimdal_build/err.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/err.h 2007-01-07 01:04:49 UTC (rev 20591)
+++ branches/SAMBA_4_0/source/heimdal_build/err.h 2007-01-07 04:43:04 UTC (rev 20592)
@@ -1,9 +0,0 @@
-#ifndef _ERR_H
-#define _ERR_H 1
-
-void err(int eval, const char *format, ...);
-void errx(int eval, const char *format, ...);
-void warnx(const char *format, ...);
-void warn(const char *format, ...);
-
-#endif /* err.h */
More information about the samba-cvs
mailing list