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

configure: fix boehm autodetection

Browse source 
Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
This commit is contained in:
Daniel Kochmański 2015-08-20 20:50:13 +02:00
parent d477737304
commit 54777b8b40
3 changed files with 4 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/aclocal.m4 vendored
View file

@ -958,8 +958,8 @@ if test "${enable_boehm}" = auto -o "${enable_boehm}" = system; then
AC_MSG_CHECKING( [whether we can use the existing Boehm-Weiser library] )
AC_MSG_RESULT( [${system_boehm}] )
if test "${system_boehm}" = "no"; then
if test "${enable_boehm}" = "auto"; then
enable_boehm="included";
if test "${enable_boehm}" = "auto" -o "${enable_boehm}" = "included"; then
enable_boehm="included";
else
AC_MSG_ERROR([System Boehm GC library requested but not found.])
fi

26
src/configure vendored
View file

@ -765,9 +765,7 @@ enable_rpath
enable_threads
enable_boehm
enable_libatomic
enable_slow_config
enable_soname
with_system_boehm
with_gmp
with_C_gmp
with_system_gmp
@ -1453,8 +1451,6 @@ Optional Features:
(no|included|system|auto, default=auto)
--enable-libatomic version of the libatomic-ops library
(auto|included|system, default=auto)
DEPRECATED: use --with-system-boehm=no
--enable-soname link and install the library using version numbers
(no|yes, default=yes)
--enable-local-gmp Deprecated! See --with-system-gmp
@ -1481,7 +1477,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-cross-config=f supply configuration for a cross compiler
--with-system-boehm Deprecated! See --enable-boehm
--with-gmp=args supply arguments for configuring GMP library
--with-C-gmp=args configure GMP to build using portable C
--with-system-gmp use already installed GMP library (default=auto)
@ -2640,14 +2635,6 @@ else
fi
# Check whether --enable-slow-config was given.
if test "${enable_slow_config+set}" = set; then :
enableval=$enable_slow_config;
else
enable_slow_config=no
fi
# Check whether --enable-soname was given.
if test "${enable_soname+set}" = set; then :
enableval=$enable_soname;
@ -2657,15 +2644,6 @@ fi
# Check whether --with-system-boehm was given.
if test "${with_system_boehm+set}" = set; then :
withval=$with_system_boehm; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-system-boehm is deprecated, use --enable-boehm=system instead!" >&5
$as_echo "$as_me: WARNING: --with-system-boehm is deprecated, use --enable-boehm=system instead!" >&2;}
test ${withval} = "no" || enable_boehm="system"
fi
# Check whether --with-gmp was given.
if test "${with_gmp+set}" = set; then :
withval=$with_gmp;
@ -6062,8 +6040,8 @@ $as_echo_n "checking whether we can use the existing Boehm-Weiser library ... "
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${system_boehm} " >&5
$as_echo "${system_boehm} " >&6; }
if test "${system_boehm}" = "no"; then
if test "${enable_boehm}" = "auto"; then
enable_boehm="included";
if test "${enable_boehm}" = "auto" -o "${enable_boehm}" = "included"; then
enable_boehm="included";
else
as_fn_error $? "System Boehm GC library requested but not found." "$LINENO" 5
fi

10
src/configure.ac
View file

@ -56,22 +56,12 @@ AC_ARG_ENABLE(libatomic,
[(auto|included|system, default=auto)] ),
[], [enable_libatomic=auto] )
AC_ARG_ENABLE(slow-config,
AS_HELP_STRING( [DEPRECATED: use --with-system-boehm=no] ),
[], [enable_slow_config=no] )
AC_ARG_ENABLE(soname,
AS_HELP_STRING( [--enable-soname],
[link and install the library using version numbers]
[(no|yes, default=yes)]),
[], [enable_soname=yes] )
AC_ARG_WITH(system-boehm,
AS_HELP_STRING( [--with-system-boehm], [Deprecated! See --enable-boehm] ),
[AC_MSG_WARN(
[--with-system-boehm is deprecated, use --enable-boehm=system instead!])
test ${withval} = "no" || enable_boehm="system"])
AC_ARG_WITH(gmp,
AS_HELP_STRING( [--with-gmp=args],
[supply arguments for configuring GMP library]),