r20777: only include closefrom.c if the system doesn't have it.

hopefully solaris build fine now...

metze

diff --git a/source/heimdal_build/config.m4 b/source/heimdal_build/config.m4
index 8a69a880d4b5a7c53cd1c91bc3d0a1b1de5d22e0..462521d6b6184dcd9df79a68539ef5454d0ca6cc 100644 (file)
--- a/source/heimdal_build/config.m4
+++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index e08cdef135e060edc20314be6d2b52de0172a0ce..56c7c2bc206a5a7ccab0ee49eccf1c5e29adf929 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/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 \