mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-24 13:31:58 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'with-libgc-prefix' into 'develop'

Browse source 
Add --with-libgc-prefix=path and friends

See merge request !44
This commit is contained in:
Daniel Kochmański 2017-01-17 07:05:21 +00:00
commit 901f6e3f1c
2 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/configure vendored
View file

@ -776,6 +776,9 @@ with_gmp_libdir
with_libffi_prefix
with_libffi_incdir
with_libffi_libdir
with_libgc_prefix
with_libgc_incdir
with_libgc_libdir
with___thread
enable_opcode8
with_cxx
@ -1491,6 +1494,12 @@ Optional Packages:
path to system LIBFFI includes (overrides prefix)
--with-libffi-libdir=path
path to system LIBFFI libraries (overrides prefix)
--with-libgc-prefix=path
prefix for system LIBGC includes and libraries
--with-libgc-incdir=path
path to system LIBGC includes (overrides prefix)
--with-libgc-libdir=path
path to system LIBGC libraries (overrides prefix)
--with-__thread Enable __thread thread-local variables (yes|NO|auto)
(supported by NPTL-aware glibc and maybe Windows)
--with-cxx build ECL using C++ compiler (default=NO)
@ -2734,6 +2743,27 @@ fi
# Check whether --with-libgc-prefix was given.
if test "${with_libgc_prefix+set}" = set; then :
withval=$with_libgc_prefix; LIBGC_INCDIR="$withval/include"; LIBGC_LIBDIR="$withval/lib"
fi
# Check whether --with-libgc-incdir was given.
if test "${with_libgc_incdir+set}" = set; then :
withval=$with_libgc_incdir; LIBGC_INCDIR="$withval"
fi
# Check whether --with-libgc-libdir was given.
if test "${with_libgc_libdir+set}" = set; then :
withval=$with_libgc_libdir; LIBGC_LIBDIR="$withval"
fi
# Check whether --with-__thread was given.
if test "${with___thread+set}" = set; then :
withval=$with___thread;
@ -5727,6 +5757,20 @@ fi
CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
if test "x$LIBGC_INCDIR" != "x"; then
LIBGC_CPPFLAGS="-I$LIBGC_INCDIR"
fi
if test "x$LIBGC_LIBDIR" != "x"; then
LIBGC_LDFLAGS="-L$LIBGC_LIBDIR"
if test "$enable_rpath" = "yes"; then
if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
LIBGC_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBGC_LIBDIR,"`" $LIBGC_LDFLAGS"
fi
fi
fi
CPPFLAGS="$CPPFLAGS $LIBGC_CPPFLAGS"
LDFLAGS="$LDFLAGS $LIBGC_LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwnam in -lsun" >&5
$as_echo_n "checking for getpwnam in -lsun... " >&6; }

32
src/configure.ac
View file

@ -120,6 +120,22 @@ AC_ARG_WITH(libffi-libdir,
[path to system LIBFFI libraries (overrides prefix)] ),
[LIBFFI_LIBDIR="$withval"], [])
dnl LIBGC library options
AC_ARG_WITH(libgc-prefix,
AS_HELP_STRING( [--with-libgc-prefix=path],
[prefix for system LIBGC includes and libraries] ),
[LIBGC_INCDIR="$withval/include"; LIBGC_LIBDIR="$withval/lib"], [])
AC_ARG_WITH(libgc-incdir,
AS_HELP_STRING( [--with-libgc-incdir=path],
[path to system LIBGC includes (overrides prefix)] ),
[LIBGC_INCDIR="$withval"], [])
AC_ARG_WITH(libgc-libdir,
AS_HELP_STRING( [--with-libgc-libdir=path],
[path to system LIBGC libraries (overrides prefix)] ),
[LIBGC_LIBDIR="$withval"], [])
dnl
AC_ARG_WITH(__thread,
AS_HELP_STRING( [--with-__thread],
@ -488,6 +504,22 @@ fi
CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
dnl ======================================================================
dnl LIBGC library
if test "x$LIBGC_INCDIR" != "x"; then
LIBGC_CPPFLAGS="-I$LIBGC_INCDIR"
fi
if test "x$LIBGC_LIBDIR" != "x"; then
LIBGC_LDFLAGS="-L$LIBGC_LIBDIR"
if test "$enable_rpath" = "yes"; then
if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
LIBGC_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBGC_LIBDIR,"`" $LIBGC_LDFLAGS"
fi
fi
fi
CPPFLAGS="$CPPFLAGS $LIBGC_CPPFLAGS"
LDFLAGS="$LDFLAGS $LIBGC_LDFLAGS"
dnl =====================================================================
dnl Checks for libraries