diff options
| author | conversy | 2003-10-07 13:10:11 +0000 |
|---|---|---|
| committer | conversy | 2003-10-07 13:10:11 +0000 |
| commit | 45f3c83d58945f998aedeb7d3d0f9f2fb7cf6c21 (patch) | |
| tree | d1924dfa534b6d91d1d21916ca6394eddaa0a035 | |
| parent | 40369046de5ed65212d926be164e3732fc196786 (diff) | |
| download | tkzinc-45f3c83d58945f998aedeb7d3d0f9f2fb7cf6c21.zip tkzinc-45f3c83d58945f998aedeb7d3d0f9f2fb7cf6c21.tar.gz tkzinc-45f3c83d58945f998aedeb7d3d0f9f2fb7cf6c21.tar.bz2 tkzinc-45f3c83d58945f998aedeb7d3d0f9f2fb7cf6c21.tar.xz | |
fixed for macosx
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | generic/OverlapMan.c | 4 | ||||
| -rw-r--r-- | libtess/memalloc.h | 2 | ||||
| -rw-r--r-- | tclconfig/tcl.m4 | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 7a5d894..c9c0957 100644 --- a/Makefile.in +++ b/Makefile.in @@ -332,7 +332,7 @@ depend: $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJECTS) -rm -f $($(PACKAGE)_LIB_FILE) ${MAKE_LIB} - $(RANLIB) $($(PACKAGE)_LIB_FILE) + #$(RANLIB) $($(PACKAGE)_LIB_FILE) #$(Om_LIB_FILE): $(Om_OBJECTS) # -rm -f $(Om_LIB_FILE) diff --git a/generic/OverlapMan.c b/generic/OverlapMan.c index 29f872f..a57dea9 100644 --- a/generic/OverlapMan.c +++ b/generic/OverlapMan.c @@ -40,7 +40,11 @@ static const char compile_id[]="$Compile: " __FILE__ " " __DATE__ " " __TIME__ " #include "OverlapMan.h" +#if defined(__APPLE__) +#include <stdlib.h> +#else #include "malloc.h" +#endif #include "private.h" #include <stdio.h> diff --git a/libtess/memalloc.h b/libtess/memalloc.h index f421af7..0a55694 100644 --- a/libtess/memalloc.h +++ b/libtess/memalloc.h @@ -42,7 +42,7 @@ #ifndef __memalloc_simple_h_ #define __memalloc_simple_h_ -#if defined(__VMS) || defined(darwin) +#if defined(__VMS) || defined(darwin) || defined(__APPLE__) # include <stdlib.h> #else # include <malloc.h> diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 index 48a6f3e..9a7e253 100644 --- a/tclconfig/tcl.m4 +++ b/tclconfig/tcl.m4 @@ -2594,7 +2594,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}" fi eval eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" - RANLIB=: + #RANLIB=: else eval eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" fi |