Skip to content

Commit 3def8fb

Browse files
committed
Clean artifact, and improve configure help
1 parent 9771f44 commit 3def8fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ misc-clean:
156156
rm -f aclocal.m4 config.log confcache
157157
rm -rf autom4te.cache
158158
rm -f build/make/Makefile build/make/Makefile-auto
159+
rm -f build/platform/meson/sage-configure-native-file.ini
159160
rm -rf src/lib
160161

161162
bdist-clean: clean

m4/ax_boost_base.m4

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,19 @@ AC_DEFUN([AX_BOOST_BASE],
4848
AC_ARG_WITH([boost],
4949
[AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
5050
[use Boost library from a standard location (ARG=yes),
51-
from the specified location (ARG=<path>),
52-
or disable it (ARG=no)
51+
or from the specified location (ARG=<path>),
5352
@<:@ARG=yes@:>@ ])],
5453
[
5554
AS_CASE([$withval],
56-
[no],[want_boost="no";_AX_BOOST_BASE_boost_path=""],
5755
[yes],[want_boost="yes";_AX_BOOST_BASE_boost_path=""],
56+
[no],[AC_MSG_ERROR([Boost is a prerequisite and cannot be turned off])],
5857
[want_boost="yes";_AX_BOOST_BASE_boost_path="$withval"])
5958
],
6059
[want_boost="yes"])
6160
6261
6362
AC_ARG_WITH([boost-libdir],
64-
[AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
63+
[AS_HELP_STRING([--with-boost-libdir=LIB_DIR (unmaintained, do not use!)],
6564
[Force given directory for boost libraries.
6665
Note that this will override library path detection,
6766
so use this parameter only if default library detection fails

0 commit comments

Comments
 (0)