From dbdb4cc2694e7dddbf335eb3c7c56495bbe600b1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 14 Jan 2007 18:48:14 +0000
Subject: r20777: only include closefrom.c if the system doesn't have it.

hopefully solaris build fine now...

metze
(This used to be commit f9a6649f08a6634db4059b904e95ca870e2ab095)
---
 source4/heimdal_build/config.m4 | 6 ++++++
 source4/heimdal_build/config.mk | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 8a69a880d4..462521d6b6 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -253,6 +253,12 @@ fi
 
 SMB_EXT_LIB(NSL,[${NSL_LIBS}],[],[],[])
 
+# only add closefrom if needed
+SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO)
+if test t$ac_cv_func_closefrom != tyes; then
+	SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, YES)
+fi
+
 # only add getprogname if needed
 SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, NO)
 SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, NO)
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index e08cdef135..56c7c2bc20 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -368,6 +368,10 @@ OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
 OBJ_FILES = ../heimdal/lib/roken/getprogname.o
 
+[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] 
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
+OBJ_FILES = ../heimdal/lib/roken/closefrom.o
+
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] 
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
 OBJ_FILES = ../heimdal/lib/roken/getprogname.ho
@@ -394,7 +398,6 @@ OBJ_FILES = \
 	../heimdal/lib/roken/base64.o \
 	../heimdal/lib/roken/hex.o \
 	../heimdal/lib/roken/bswap.o \
-	../heimdal/lib/roken/closefrom.o \
 	../heimdal/lib/roken/dumpdata.o \
 	../heimdal/lib/roken/emalloc.o \
 	../heimdal/lib/roken/get_window_size.o \
@@ -425,6 +428,7 @@ PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_GAI_STRERROR \
 			HEIMDAL_ROKEN_INET_ATON \
 			HEIMDAL_ROKEN_GETPROGNAME \
+			HEIMDAL_ROKEN_CLOSEFROM \
 			GAI \
 			NSL \
 			RESOLV \
-- 
cgit