diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-14 18:48:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:52 -0500 |
| commit | dbdb4cc2694e7dddbf335eb3c7c56495bbe600b1 (patch) | |
| tree | 55f687954aeb4f7943e27489b32006c7ded8cba8 | |
| parent | 47523dbc6a03498b362f08897c260f7cdebe271b (diff) | |
| download | samba-dbdb4cc2694e7dddbf335eb3c7c56495bbe600b1.tar.gz samba-dbdb4cc2694e7dddbf335eb3c7c56495bbe600b1.tar.bz2 samba-dbdb4cc2694e7dddbf335eb3c7c56495bbe600b1.zip | |
r20777: only include closefrom.c if the system doesn't have it.
hopefully solaris build fine now...
metze
(This used to be commit f9a6649f08a6634db4059b904e95ca870e2ab095)
| -rw-r--r-- | source4/heimdal_build/config.m4 | 6 | ||||
| -rw-r--r-- | source4/heimdal_build/config.mk | 6 |
2 files changed, 11 insertions, 1 deletions
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 \ |