Commit b1f0add6 authored by Erick's avatar Erick

Added --libraries to stklos-config. It displays the used/compiled

libraries at STklos building time
parent 3621af63
......@@ -72,6 +72,7 @@ examples/threads
# FFI directory
ffi/.libs/libffi.lai
ffi/configure.lineno
ffi/fficonfig.h
ffi/include/ffi.h
ffi/include/ffitarget.h
......@@ -79,6 +80,8 @@ ffi/libffi.pc
ffi/src/.dirstamp
ffi/src/x86/.dirstamp
ffi/stamp-h1
ffi/testsuite/site.bak
ffi/testsuite/site.exp
# Gc directory
......@@ -104,8 +107,7 @@ gc/windows-untested
# GMP directory
gmp/config.h
gmp/gmp-stklos.h
gmp/stamp-h
gmp/stamp-h1
# GTklos directory
gtklos/TODO
gtklos/gtklosconf.h
......@@ -119,6 +121,7 @@ pcre/.libs
pcre/RunTest
pcre/chartables.c
pcre/config.h
pcre/configure.lineno
pcre/dftables
pcre/libpcre.pc
pcre/libpcrecpp.pc
......@@ -131,6 +134,10 @@ pcre/pcredemo
pcre/pcregrep
pcre/pcretest
pcre/stamp-h1
pcre/testNinput
pcre/testsavedregex
pcre/teststderr
pcre/testtry
# pkgman
pkgman/stklos-pkg
......
......@@ -159,6 +159,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -593,6 +593,7 @@ ac_func_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIB_SUMMARY
CALLCC_STK
THREADS
FFIINC
......@@ -6457,7 +6458,7 @@ then
else
echo "... Using system libgc library"
GC=""
if test "$PKGCONFIG" != "false" ;then
if test $PKGCONFIG --exists bdw-gc ;then
GCINC=$(pkg-config bdw-gc --cflags)
GCLIB=$(pkg-config bdw-gc --libs)
else
......@@ -6582,6 +6583,7 @@ else
fi
if test "$PROV_GMP" = "no" ;then
# Check whether --with-gmp-light was given.
if test "${with_gmp_light+set}" = set; then :
......@@ -6590,6 +6592,7 @@ else
PROV_GMP="no"
fi
fi
if test "$HAVE_GMP" = "no" -o "$PROV_GMP" = "yes"
then
......@@ -6693,7 +6696,7 @@ then
else
echo "... Using system libpcre library"
PCRE=""
if test "$PKGCONFIG" != "false" ;then
if $PKGCONFIG --exists libpcre ;then
PCREINC="$($PKGCONFIG --cflags libpcre)"
PCRELIB="$($PKGCONFIG --libs libpcre) -lpcreposix"
else
......@@ -6785,7 +6788,7 @@ then
else
echo "... Using system libffi library"
FFI=""
if test "$PKGCONFIG" != "false" ;then
if $PKGCONFIG --exists libffi ;then
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
......@@ -6821,6 +6824,12 @@ fi
###
### Finishing ...
###
LIB_SUMMARY="(:system ($SYST_LIBS) :compiled ($COMP_LIBS))"
### Output files
......@@ -6862,6 +6871,7 @@ fi
ac_config_files="$ac_config_files Makefile src/Makefile src/extraconf.h doc/Makefile lib/Makefile utils/Makefile lib/boot-callcc.stk utils/stklos-config utils/stklos-script examples/Makefile lib/Match.d/Makefile lib/SILex.d/Makefile lib/Lalr.d/Makefile lib/ScmPkg.d/Makefile tests/Makefile doc/stklos.1 doc/stklos-config.1 doc/stklos-compile.1 doc/stklos-genlex.1 doc/stklos-install.1 doc/stklos-pkg.1 doc/skb/stklos-version.stk pkgman/Makefile"
cat >confcache <<\_ACEOF
......
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 28-Oct-2009 15:10 (eg)
### Last file update: 28-Oct-2009 18:58 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [0.99dev])
......@@ -212,7 +212,7 @@ then
else
echo "... Using system libgc library"
GC=""
if test "$PKGCONFIG" != "false" ;then
if test $PKGCONFIG --exists bdw-gc ;then
GCINC=$(pkg-config bdw-gc --cflags)
GCLIB=$(pkg-config bdw-gc --libs)
else
......@@ -248,9 +248,11 @@ AC_ARG_WITH(provided-bignum,
[ --with-provided-bignum use the provided Bignum (GMPlite) library],
PROV_GMP="yes", PROV_GMP="no")
AC_ARG_WITH(gmp-light,
[ --with-gmp-light a synonym for --with-provided-bignum],
PROV_GMP="yes", PROV_GMP="no")
if test "$PROV_GMP" = "no" ;then
AC_ARG_WITH(gmp-light,
[ --with-gmp-light a synonym for --with-provided-bignum],
PROV_GMP="yes", PROV_GMP="no")
fi
if test "$HAVE_GMP" = "no" -o "$PROV_GMP" = "yes"
then
......@@ -306,7 +308,7 @@ then
else
echo "... Using system libpcre library"
PCRE=""
if test "$PKGCONFIG" != "false" ;then
if $PKGCONFIG --exists libpcre ;then
PCREINC="$($PKGCONFIG --cflags libpcre)"
PCRELIB="$($PKGCONFIG --libs libpcre) -lpcreposix"
else
......@@ -350,7 +352,7 @@ then
else
echo "... Using system libffi library"
FFI=""
if test "$PKGCONFIG" != "false" ;then
if $PKGCONFIG --exists libffi ;then
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
......@@ -372,6 +374,12 @@ AC_TRY_RUN([ void inner (char *foo) { char bar; exit (!(foo >= &bar)); }
echo "Stack direction is not detected when cross compiling for now")
###
### Finishing ...
###
LIB_SUMMARY="(:system ($SYST_LIBS) :compiled ($COMP_LIBS))"
### Output files
AC_SUBST(STKCFLAGS)
AC_SUBST(VERSION)
......@@ -412,6 +420,7 @@ AC_SUBST(FFIINC)
AC_SUBST(THREADS)
AC_SUBST(CALLCC_STK)
AC_SUBST(LIB_SUMMARY)
AC_CONFIG_FILES([Makefile src/Makefile src/extraconf.h doc/Makefile
lib/Makefile utils/Makefile lib/boot-callcc.stk
......
......@@ -136,6 +136,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -47,6 +47,9 @@ The suffix for shared libraries.
.IP "--threads | -t"
The name thread system compiled in
.B stklos.
.IP "--libraries | -L"
Display informations on the libraries which are compiled and the one
which are used when the system was compiled
.IP "--help | -h | -?"
Show a list of options
......
......@@ -124,6 +124,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -128,6 +128,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -168,6 +168,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -127,6 +127,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -127,6 +127,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -128,6 +128,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -128,6 +128,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -178,6 +178,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
This diff is collapsed.
This diff is collapsed.
......@@ -21,7 +21,7 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 19-May-2000 18:44 (eg)
* Last file update: 28-Oct-2009 13:17 (eg)
* Last file update: 28-Oct-2009 18:49 (eg)
*/
#define PREFIXDIR "@PREFIX@"
......@@ -34,6 +34,7 @@
#define @OS_NAME@ 1
#define @OS_NAME_VERSION@ 1
#define STACK_GROWS_@STACK_DIRECTION@
#define LIB_SUMMARY "@LIB_SUMMARY@"
/* Various stuff */
#define @OS_FLAVOUR@ 1
......@@ -103,6 +103,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -128,6 +128,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_SUMMARY = @LIB_SUMMARY@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
......
......@@ -22,7 +22,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 27-Jul-2000 23:58 (eg)
# Last file update: 10-Jun-2007 11:16 (eg)
# Last file update: 28-Oct-2009 18:55 (eg)
prefix=@prefix@
......@@ -44,6 +44,8 @@ Options:
platform
[--threads | -t ] Display the name of the valiable thread
system
[--libraries |-L ] Display a summary of used and compiled
libraries
[--help | -h | -?] Show a list of options
EOF
exit $1
......@@ -80,6 +82,9 @@ while test $# -gt 0; do
--threads|-t)
echo @THREADS@
;;
--libraries|-L)
echo "@LIB_SUMMARY@"
;;
--help|-h|-\?)
usage 0 1>&2
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment