I added the case insensitive file system detection logic in
configure, later a --enable-case-insensitive-file-system-check
option is added due to sagemath's requirement.
Turns out this can be simplified:
The only problematic situation is:
1. in-tree build
2. and build without pre-generated (aka non release tarball build)
3. and on a case insensitive file system
So I removed the --enable-case-insensitive-file-system-check
option and only do the check in configure when pre-generated
is not available.
- Qian
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/fricas-devel/768505e8-d3fc-4188-baab-48992d985991%40gmail.com.
diff --git a/configure b/configure
index 46cdd288..9480fbd6 100755
--- a/configure
+++ b/configure
@@ -748,7 +748,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_case_insensitive_file_system_check
with_pre_generated
with_lisp
with_lisp_flavor
@@ -1401,9 +1400,6 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-case-insensitive-file-system-check
- enable case-insensitive-file-system-check (default
- yes)
--enable-gmp use gmp for bignums with SBCL or Clozure CL
--enable-debug-compiler (for BOOT or SPAD compiler developers) add debug
information to every component of a compiler
@@ -2471,33 +2467,6 @@ $as_echo "$as_me: WARNING: Cross build is not supported." >&2;}
$as_echo "$as_me: WARNING: Please notify [email protected] if you succeed." >&2;}
fi
-# Check whether --enable-case-insensitive-file-system-check was given.
-if test "${enable_case_insensitive_file_system_check+set}" = set; then :
- enableval=$enable_case_insensitive_file_system_check; fricas_test_case_insensitive_fs=$enableval
-else
- fricas_test_case_insensitive_fs=yes
-fi
-
-if test x$fricas_test_case_insensitive_fs = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in-tree build on case insensitive file system" >&5
-$as_echo_n "checking for in-tree build on case insensitive file system... " >&6; }
- if test "$fricas_top_srcdir" = "$fricas_pwd"; then
- rm -f ac_TEST_filenames_CASE_sensitive ac_test_filenames_case_sensitive
- echo foo > ac_test_filenames_case_sensitive
- if test -f ac_TEST_filenames_CASE_sensitive; then
- rm ac_test_filenames_case_sensitive
- as_fn_error $? "in tree build on case insensitive file system is not supported. Use out-of-source-tree build instead." "$LINENO" 5
- else
- rm ac_test_filenames_case_sensitive
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
-fi
-
## Accumulate list of utils needed for the build platform
fricas_all_prerequisites=
@@ -4001,6 +3970,26 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$PREGENERATED\"" >&5
$as_echo "\"$PREGENERATED\"" >&6; }
+if test -z "$PREGENERATED" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in-tree build on case insensitive file system" >&5
+$as_echo_n "checking for in-tree build on case insensitive file system... " >&6; }
+ if test "$fricas_top_srcdir" = "$fricas_pwd"; then
+ rm -f ac_TEST_filenames_CASE_sensitive ac_test_filenames_case_sensitive
+ echo foo > ac_test_filenames_case_sensitive
+ if test -f ac_TEST_filenames_CASE_sensitive; then
+ rm ac_test_filenames_case_sensitive
+ as_fn_error $? "in-tree build (without pre-generated) on case insensitive
+ file system is not supported. Use out-of-source-tree build instead." "$LINENO" 5
+ else
+ rm ac_test_filenames_case_sensitive
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
## ------------------------
## -- Which Lisp to use? --
diff --git a/configure.ac b/configure.ac
index 928dc589..073f3e96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,28 +64,6 @@ if test $build != $target; then
AC_MSG_WARN([Please notify [email protected] if you succeed.])
fi
-AC_ARG_ENABLE([case-insensitive-file-system-check],
- [AS_HELP_STRING([--enable-case-insensitive-file-system-check],
- [enable case-insensitive-file-system-check (default yes)])],
- [fricas_test_case_insensitive_fs=$enableval],
- [fricas_test_case_insensitive_fs=yes])
-if test x$fricas_test_case_insensitive_fs = xyes; then
- AC_MSG_CHECKING([for in-tree build on case insensitive file system])
- if test "$fricas_top_srcdir" = "$fricas_pwd"; then
- rm -f ac_TEST_filenames_CASE_sensitive ac_test_filenames_case_sensitive
- echo foo > ac_test_filenames_case_sensitive
- if test -f ac_TEST_filenames_CASE_sensitive; then
- rm ac_test_filenames_case_sensitive
- AC_MSG_ERROR([in tree build on case insensitive file system is not supported. Use out-of-source-tree build instead.])
- else
- rm ac_test_filenames_case_sensitive
- AC_MSG_RESULT([no])
- fi
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
## Accumulate list of utils needed for the build platform
fricas_all_prerequisites=
@@ -175,6 +153,23 @@ AC_ARG_WITH([pre-generated],
)
AC_MSG_RESULT(["$PREGENERATED"])
+if test -z "$PREGENERATED" ; then
+ AC_MSG_CHECKING([for in-tree build on case insensitive file system])
+ if test "$fricas_top_srcdir" = "$fricas_pwd"; then
+ rm -f ac_TEST_filenames_CASE_sensitive ac_test_filenames_case_sensitive
+ echo foo > ac_test_filenames_case_sensitive
+ if test -f ac_TEST_filenames_CASE_sensitive; then
+ rm ac_test_filenames_case_sensitive
+ AC_MSG_ERROR([in-tree build (without pre-generated) on case insensitive
+ file system is not supported. Use out-of-source-tree build instead.])
+ else
+ rm ac_test_filenames_case_sensitive
+ AC_MSG_RESULT([no])
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
## ------------------------
## -- Which Lisp to use? --
