diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1996-04-01 15:25:05 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1996-04-01 15:25:05 +0000 |
| commit | 3a2b81c9d80ebd304c5b0410cfcceae73b54b72d (patch) | |
| tree | 8075c4f1676672fd7f2e2fac4424afa6dad38a3a | |
| parent | 3b99a2c8d5c0aec40323e725b4fe28b4f3953344 (diff) | |
Autoconfiguration plus poussee (pthreads, ...)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@717 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | config/Makefile-templ | 27 | ||||
| -rw-r--r-- | config/Makefile.nt | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/config/Makefile-templ b/config/Makefile-templ index 679855aee..a99c7e74c 100644 --- a/config/Makefile-templ +++ b/config/Makefile-templ @@ -161,6 +161,18 @@ SHARPBANGSCRIPTS=true ############# Configuration for the contributed libraries +### Which libraries to compile and install +# Currently available: +# unix Unix system calls +# str Regular expressions and high-level string processing +# num Arbitrary-precision rational arithmetic +# threads Lightweight concurrent processes +# (require POSIX threads) +# graph Portable drawing primitives for X11 +# dynlink Dynamic linking of bytecode +# +OTHERLIBRARIES=unix str num threads graph dynlink + ### Name of the target architecture for the "num" library # Known targets: # 68K vax ns mips alpha pyramid i960 @@ -183,3 +195,18 @@ BIGNUM_ARCH=C #X11_LIB=/usr/lib # For SunOS with OpenLook: #X11_LIB=/usr/openwin/lib + +### Link-time options to cslc or cslopt for linking with X11 libraries +#X11_LINK=-cclib -L$(X11_LIB) -ccopt -lX11 + +### Location of the include directory containing the POSIX pthread.h includes +# Needed for the "threads" package +#PTHREADS_INCLUDES=/usr/include + +### Location of the directory containing the POSIX pthreads library +# Needed for the "threads" package +#PTHREADS_LIB=/usr/lib + +### Link-time options to cslc or cslopt for linking with pthreads +#PTHREADS_LINK=-cclib -L$(PTHREADS_LIB) -ccopt -lpthreads + diff --git a/config/Makefile.nt b/config/Makefile.nt index d8962aa42..1b7ab562e 100644 --- a/config/Makefile.nt +++ b/config/Makefile.nt @@ -57,6 +57,8 @@ AFLAGS=/coff /Cp ############# Configuration for the contributed libraries +OTHERLIBRARIES=str num graph + ### Name of the target architecture for the "num" library BIGNUM_ARCH=C |