[m-rev.] for review: four-space configure.in
Zoltan Somogyi
zs at csse.unimelb.edu.au
Mon Feb 25 15:42:07 AEDT 2008
configure.in:
Convert to four-space indentation.
Zoltan.
cvs diff: Diffing .
Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.519
diff -u -b -r1.519 configure.in
--- configure.in 20 Feb 2008 03:09:58 -0000 1.519
+++ configure.in 25 Feb 2008 04:23:11 -0000
@@ -1,4 +1,6 @@
#-----------------------------------------------------------------------------#
+# vim: ts=4 sw=4 expandtab
+#-----------------------------------------------------------------------------#
# Copyright (C) 1995-2008 The University of Melbourne.
# This file may only be copied under the terms of the GNU General
# Public Licence - see the file COPYING in the Mercury distribution.
@@ -63,15 +65,20 @@
RECONFIGURE_ARGS=
for arg
do
- if test $prefix_arg = true
+ if test "$prefix_arg" = true
then
prefix_arg=false
else
case "$arg" in
- --no-create | --no-recursion) ;;
- --prefix) prefix_arg=true ;;
- --prefix=*) ;;
- --enable-reconfigure=*) ;;
+ --no-create | --no-recursion)
+ ;;
+ --prefix)
+ prefix_arg=true
+ ;;
+ --prefix=*)
+ ;;
+ --enable-reconfigure=*)
+ ;;
*" "*|*" "*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]]*)
# The argument needs to be quoted.
RECONFIGURE_ARGS="$RECONFIGURE_ARGS '$arg'"
@@ -95,7 +102,7 @@
AC_DEFINE_UNQUOTED(MR_VERSION, "$VERSION")
if test "$prefix" = "NONE"; then
PREFIX="$ac_default_prefix"
- if test -d $PREFIX
+ if test -d "$PREFIX"
then
INSTALLABLE_PREFIX=yes
else
@@ -116,10 +123,9 @@
;;
esac
-# Using `cygpath -m' gives a path that works under both
-# Cygwin and native Windows, without causing quoting
-# problems in shell scripts. (`cygpath -m' converts the
-# path to Windows format, with '/' as the directory
+# Using `cygpath -m' gives a path that works under both Cygwin and native
+# Windows, without causing quoting problems in shell scripts.
+# (`cygpath -m' converts the path to Windows format, with '/' as the directory
# separator).
AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
AC_CHECK_PROG(CYGPATHU, cygpath, cygpath -u, echo)
@@ -181,10 +187,12 @@
)
case "$CONFIG_PREFIX" in
- yes) AC_MSG_ERROR(missing argument to --enable-reconfigure=... option)
+ yes)
+ AC_MSG_ERROR(missing argument to --enable-reconfigure=... option)
exit 1
;;
- no) AC_MSG_ERROR(invalid option --no-enable-reconfigure)
+ no)
+ AC_MSG_ERROR(invalid option --no-enable-reconfigure)
exit 1
;;
esac
@@ -394,10 +402,12 @@
mercury_cv_with_cc="$withval", mercury_cv_with_cc="")
case "$mercury_cv_with_cc" in
- yes) AC_MSG_ERROR(missing argument to --with-cc=... option)
+ yes)
+ AC_MSG_ERROR(missing argument to --with-cc=... option)
exit 1
;;
- no) AC_MSG_ERROR(invalid option --without-cc)
+ no)
+ AC_MSG_ERROR(invalid option --without-cc)
exit 1
;;
"")
@@ -621,8 +631,12 @@
# check that it really works
TMPFILE="`mktemp $TMPDIR/configure.XXXXXX < /dev/null`"
case "$TMPFILE" in
- $TMPDIR/configure.*) rm -f $TMPFILE ;;
- *) MKTEMP="" ;;
+ $TMPDIR/configure.*)
+ rm -f $TMPFILE
+ ;;
+ *)
+ MKTEMP=""
+ ;;
esac
fi
if test "$MKTEMP" = ""; then
@@ -638,11 +652,14 @@
# texi2dvi is currently broken on cygwin and mingw
case "$host" in
*-cygwin*)
- TEXI2DVI="" ;;
+ TEXI2DVI=""
+ ;;
*mingw*)
- TEXI2DVI="" ;;
+ TEXI2DVI=""
+ ;;
*)
- AC_PATH_PROG(TEXI2DVI,texi2dvi) ;;
+ AC_PATH_PROG(TEXI2DVI,texi2dvi)
+ ;;
esac
AC_SUBST(TEXI2DVI)
#-----------------------------------------------------------------------------#
@@ -674,9 +691,11 @@
# using GNU's hostname on OS X instead.
case "$host" in
*apple*darwin*)
- HOSTNAMECMD="$HOSTNAMECMD" ;;
+ HOSTNAMECMD="$HOSTNAMECMD"
+ ;;
*)
- HOSTNAMECMD="$HOSTNAMECMD -f" ;;
+ HOSTNAMECMD="$HOSTNAMECMD -f"
+ ;;
esac
;;
esac
@@ -703,15 +722,14 @@
# test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
CFLAGS="-O"
-# we also need to add the appropriate `-I' options so that the test programs
+# We also need to add the appropriate `-I' options so that the test programs
# can #include various Mercury runtime headers.
case "$MERCURY_CONF_RECONFIGURE" in
"")
CPPFLAGS="-Iruntime -Iruntime/machdeps -Itrace $CPPFLAGS"
;;
*)
- # We're generating a new configuration for
- # an existing installation.
+ # We are generating a new configuration for an existing installation.
CPPFLAGS="-I$PREFIX/lib/mercury/inc $CPPFLAGS"
;;
esac
@@ -804,9 +822,7 @@
yes
#endif
],
-[ac_microsoft=yes
-] AC_MSG_RESULT(yes), [ac_microsoft=no
-] AC_MSG_RESULT(no))
+[ac_microsoft=yes] AC_MSG_RESULT(yes), [ac_microsoft=no] AC_MSG_RESULT(no))
LDFLAGS_FOR_TRACE=
LD_LIBFLAGS_FOR_TRACE=
@@ -831,8 +847,10 @@
USING_MICROSOFT_CL_COMPILER="yes"
- case "$CYGPATH" in "echo")
- AC_MSG_WARN(cygpath required with Microsoft Visual C++) ;;
+ case "$CYGPATH" in
+ "echo")
+ AC_MSG_WARN(cygpath required with Microsoft Visual C++)
+ ;;
esac
FIX_PATH_FOR_CC="$CYGPATH"
@@ -860,8 +878,10 @@
# Suppress a warning from the linker on Darwin 9. `-s' is deprecated on it
# and has no effect other than causing the linker to emit a warning.
#
- case "$host" in *apple*darwin*9*)
- LD_STRIP_FLAG="" ;;
+ case "$host" in
+ *apple*darwin*9*)
+ LD_STRIP_FLAG=""
+ ;;
esac
LDFLAGS_FOR_DEBUG="-g"
@@ -875,11 +895,17 @@
# we use the former. For lcc 4.2, we need to use `-Wl-export-dynamic'.
#
case $FULLARCH in
- *-linux*aout) ;; # no special options needed
+ *-linux*aout)
+ # no special options needed
+ ;;
*-linux*)
case "$CC" in
- lcc*) LDFLAGS_FOR_TRACE="-Wl-export-dynamic" ;;
- *) LDFLAGS_FOR_TRACE="-rdynamic" ;;
+ lcc*)
+ LDFLAGS_FOR_TRACE="-Wl-export-dynamic"
+ ;;
+ *)
+ LDFLAGS_FOR_TRACE="-rdynamic"
+ ;;
esac
;;
esac
@@ -897,8 +923,8 @@
# do not get included in the archive table of contents, and so
# don't get found during linking. Whose !@#$ing idea was it to make
# that brain-damaged and non-standard-conforming mode the default?
- #
- case "$host" in *apple*darwin*)
+ case "$host" in
+ *apple*darwin*)
RANLIBFLAGS="-c"
;;
esac
@@ -993,8 +1019,8 @@
MERCURY_CHECK_ERLANG
#-----------------------------------------------------------------------------#
-mercury_check_for_functions () {
+mercury_check_for_functions () {
for mercury_cv_func in "$@"
do
mercury_cv_func_define="MR_HAVE_`echo $mercury_cv_func | \
@@ -1009,9 +1035,11 @@
# (at least for version b18, anyway) and trying it can crash Win95.
case "$host" in
*-cygwin*)
- ac_cv_func_mprotect=no ;;
+ ac_cv_func_mprotect=no
+ ;;
*mingw*)
- ac_cv_func_mprotect=no ;;
+ ac_cv_func_mprotect=no
+ ;;
esac
mercury_check_for_functions \
@@ -1026,6 +1054,7 @@
gettimeofday setenv putenv _putenv posix_spawn
#-----------------------------------------------------------------------------#
+
MERCURY_CHECK_FOR_HEADERS( \
unistd.h sys/wait.h sys/siginfo.h sys/signal.h ucontext.h \
asm/sigcontext.h sys/param.h sys/time.h sys/times.h \
@@ -1145,10 +1174,8 @@
AC_MSG_RESULT($mercury_cv_sigcontext_struct_2arg)
if test "$mercury_cv_sigcontext_struct_2arg" = no; then
- #
# Check for a sigcontext_struct in the third argument of
# the signal handler (Linux-68k has this).
- #
AC_MSG_CHECKING(for working \`sigcontext_struct' in third arg)
AC_CACHE_VAL(mercury_cv_sigcontext_struct_3arg,
mercury_cv_sigcontext_struct_3arg=no
@@ -1214,9 +1241,7 @@
AC_DEFINE(MR_HAVE_SIGCONTEXT_STRUCT)
AC_DEFINE(MR_HAVE_SIGINFO)
- #
# check for sigcontext_struct.eip
- #
AC_MSG_CHECKING(for \`sigcontext_struct' pc access at signals)
AC_CACHE_VAL(mercury_cv_pc_access,
mercury_cv_pc_access=no
@@ -1437,6 +1462,7 @@
fi
fi
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(for an integer type with the same size as a pointer)
AC_CACHE_VAL(mercury_cv_word_type,
AC_TRY_RUN([
@@ -1508,6 +1534,7 @@
AC_SUBST(MR_INTEGER_LENGTH_MODIFIER)
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(for an integer type of at least 64 bits)
AC_CACHE_VAL(mercury_cv_int_least64_type,
AC_TRY_RUN([
@@ -1573,6 +1600,7 @@
AC_SUBST(MR_INT_LEAST64_TYPE)
fi
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(for an integer type of at least 32 bits)
AC_CACHE_VAL(mercury_cv_int_least32_type,
AC_TRY_RUN([
@@ -1628,13 +1656,18 @@
AC_CHECK_TYPES([dev_t, ino_t])
case "$ac_cv_type_dev_t" in
- yes) AC_DEFINE_UNQUOTED(MR_HAVE_DEV_T) ;;
+ yes)
+ AC_DEFINE_UNQUOTED(MR_HAVE_DEV_T)
+ ;;
esac
case "$ac_cv_type_ino_t" in
- yes) AC_DEFINE_UNQUOTED(MR_HAVE_INO_T) ;;
+ yes)
+ AC_DEFINE_UNQUOTED(MR_HAVE_INO_T)
+ ;;
esac
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(for an integer type of at least 16 bits)
AC_CACHE_VAL(mercury_cv_int_least16_type,
AC_TRY_RUN([
@@ -1685,6 +1718,7 @@
AC_SUBST(MR_UINT_LEAST16_MAX)
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(the number of low tag bits available)
AC_CACHE_VAL(mercury_cv_low_tag_bits,
AC_TRY_RUN([
@@ -1736,7 +1770,9 @@
AC_DEFINE_UNQUOTED(MR_LOW_TAG_BITS, $mercury_cv_low_tag_bits)
LOW_TAG_BITS=$mercury_cv_low_tag_bits
AC_SUBST(LOW_TAG_BITS)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(the number of bytes per word)
AC_CACHE_VAL(mercury_cv_bytes_per_word,
AC_TRY_RUN([
@@ -1761,7 +1797,9 @@
AC_DEFINE_UNQUOTED(MR_BYTES_PER_WORD, $mercury_cv_bytes_per_word)
BYTES_PER_WORD=$mercury_cv_bytes_per_word
AC_SUBST(BYTES_PER_WORD)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(the number of words in a synchronization term)
AC_CACHE_VAL(mercury_cv_sync_term_size,
AC_TRY_RUN([
@@ -1793,7 +1831,9 @@
AC_DEFINE_UNQUOTED(MR_SYNC_TERM_SIZE, $mercury_cv_sync_term_size)
SYNC_TERM_SIZE=$mercury_cv_sync_term_size
AC_SUBST(SYNC_TERM_SIZE)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(the number of bits per word)
AC_CACHE_VAL(mercury_cv_bits_per_word,
AC_TRY_RUN([
@@ -1819,7 +1859,9 @@
AC_DEFINE_UNQUOTED(MR_BITS_PER_WORD, $mercury_cv_bits_per_word)
BITS_PER_WORD=$mercury_cv_bits_per_word
AC_SUBST(BITS_PER_WORD)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether we can use unboxed floats)
AC_CACHE_VAL(mercury_cv_unboxed_floats,
AC_TRY_RUN([
@@ -1852,7 +1894,9 @@
HAVE_BOXED_FLOATS="--no-unboxed-float"
fi
AC_SUBST(HAVE_BOXED_FLOATS)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether float is 64-bit)
AC_CACHE_VAL(mercury_cv_float_is_64_bit,
AC_TRY_RUN([
@@ -1872,7 +1916,9 @@
AC_DEFINE(MR_FLOAT_IS_64_BIT)
fi
AC_SUBST(MR_FLOAT_IS_64_BIT)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether double is 64-bit)
AC_CACHE_VAL(mercury_cv_double_is_64_bit,
AC_TRY_RUN([
@@ -1892,7 +1938,9 @@
AC_DEFINE(MR_DOUBLE_IS_64_BIT)
fi
AC_SUBST(MR_DOUBLE_IS_64_BIT)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether long double is 64-bit)
AC_CACHE_VAL(mercury_cv_long_double_is_64_bit,
AC_TRY_RUN([
@@ -1912,7 +1960,9 @@
AC_DEFINE(MR_LONG_DOUBLE_IS_64_BIT)
fi
AC_SUBST(MR_LONG_DOUBLE_IS_64_BIT)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether architecture is big-endian)
AC_CACHE_VAL(mercury_cv_is_bigender,
AC_TRY_RUN([
@@ -1936,7 +1986,9 @@
AC_DEFINE(MR_BIG_ENDIAN)
fi
AC_SUBST(MR_BIG_ENDIAN)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether architecture is little-endian)
AC_CACHE_VAL(mercury_cv_is_littleender,
AC_TRY_RUN([
@@ -1960,7 +2012,9 @@
AC_DEFINE(MR_LITTLE_ENDIAN)
fi
AC_SUBST(MR_LITTLE_ENDIAN)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether we can use files as locks)
AC_CACHE_VAL(mercury_cv_have_ocreat_oexcl,
AC_TRY_COMPILE([
@@ -1992,7 +2046,9 @@
if test "$mercury_cv_have_ocreat_oexcl" = yes; then
AC_DEFINE(MR_HAVE_OCREAT_OEXCL)
fi
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(return values of system)
AC_CACHE_VAL(mercury_cv_normal_system_retval,
AC_TRY_RUN([
@@ -2048,7 +2104,9 @@
# Warn since VC++6 compiler fails this test
AC_MSG_WARN(Unable to interpret return values from system)
fi
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(to see if we can handle contexts blocking on IO)
AC_CACHE_VAL(mercury_cv_can_do_pending_io,
AC_TRY_RUN([
@@ -2074,6 +2132,7 @@
AC_DEFINE(MR_CAN_DO_PENDING_IO)
fi
AC_SUBST(MR_CAN_DO_PENDING_IO)
+
#-----------------------------------------------------------------------------#
# There is a problem on some BSD based systems that FD_ZERO is defined
# defined in terms of bzero() but the appropriate header file for bzero()
@@ -2082,11 +2141,12 @@
AC_MSG_CHECKING(to see if strings.h is needed for bzero)
AC_CACHE_VAL(mercury_cv_bzero_needs_strings_header, [
-
save_CC="$CC"
case "$CC" in
- *gcc*) CC="$CC -Wall -Werror" ;;
+ *gcc*)
+ CC="$CC -Wall -Werror"
+ ;;
esac
cat > conftest.c << EOF
@@ -2178,8 +2238,12 @@
LIBRARY_PATH_FOR_GOTOS=
case "$ac_cv_prog_gcc" in yes)
case "`$CC --version < /dev/null`" in
- 2.8*) CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse" ;;
- *) CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse -fno-gcse" ;;
+ 2.8*)
+ CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse"
+ ;;
+ *)
+ CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse -fno-gcse"
+ ;;
esac
case "$host" in
mips-sgi-irix5.*)
@@ -2251,7 +2315,8 @@
mercury_cv_gcc_labels=no
;;
sparc*)
- case "`$CC --version < /dev/null`" in 2.8*)
+ case "`$CC --version < /dev/null`" in
+ 2.8*)
AC_MSG_WARN(
[Mercury might not work with gcc 2.8 on sparc!
**** We advise using gcc 2.95.x.])
@@ -2265,6 +2330,7 @@
AC_SUBST(CFLAGS_FOR_GOTOS)
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether we can use gcc labels)
# Set env vars for compiling with gcc non-local gotos
@@ -2370,12 +2436,15 @@
#-----------------------------------------------------------------------------#
# We need to ensure that runtime/mercury_conf.h exists, since some of the
# programs we attempt to compile below indirectly include it.
+
test -f runtime/mercury_conf.h || {
cat > runtime/mercury_conf.h <<EOF
#define MR_WORD_TYPE $MR_WORD_TYPE
EOF
}
+
#-----------------------------------------------------------------------------#
+
if test $mercury_cv_gcc_labels = yes || test $mercury_cv_asm_labels = yes; then
AC_MSG_CHECKING(whether we can use gcc labels and global registers)
@@ -2413,6 +2482,7 @@
else
mercury_cv_gcc_model_fast=no
fi
+
#-----------------------------------------------------------------------------#
AC_MSG_CHECKING(whether we can use global registers without gcc labels)
@@ -2475,6 +2545,7 @@
AC_MSG_RESULT($mercury_cv_profiling)
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(if C compiler is egcs)
case "`$CC --version < /dev/null 2>&1`" in
egcs-*)
@@ -2521,10 +2592,14 @@
# an internal compiler error when compiling library/random.c
# (when that file was build with mmc --intermodule-optimization -O4)
# So if we're using an egcs version of gcc, disable deep profiling.
-case "$host" in i*86-*-*)
- case "$mercury_cv_egcs" in yes)
- mercury_cv_can_enable_deep_profiler=no ;;
- esac ;;
+case "$host" in
+ i*86-*-*)
+ case "$mercury_cv_egcs" in
+ yes)
+ mercury_cv_can_enable_deep_profiler=no
+ ;;
+ esac
+ ;;
esac
case "$host" in
@@ -2584,16 +2659,19 @@
AC_SUBST(ENABLE_DEEP_PROFILER)
CGIDIR=$mercury_cv_cgi_dir
AC_SUBST(CGIDIR)
+
#-----------------------------------------------------------------------------#
# Figure out which flavour of pthreads to use, since none of the
# implementations seem to be exactly the same
case "$host" in
alpha*-dec-osf*)
- mercury_cv_use_digital_unix_threads=yes ;;
+ mercury_cv_use_digital_unix_threads=yes
+ ;;
*)
- mercury_cv_use_digital_unix_threads=no ;;
+ mercury_cv_use_digital_unix_threads=no
+ ;;
esac
if test $mercury_cv_use_digital_unix_threads = yes; then
@@ -2642,7 +2720,8 @@
*cygwin*)
THREAD_LIBS=""
case "$CC" in
- *cl* | *CL*) # cl is the Microsoft C compiler
+ *cl* | *CL*)
+ # cl is the Microsoft C compiler
CFLAGS_FOR_THREADS="-DMR_THREAD_SAFE -DGC_WIN32_THREADS /MD"
LDFLAGS_FOR_THREADS="/MD"
LD_LIBFLAGS_FOR_THREADS="/MD"
@@ -2655,7 +2734,8 @@
*mingw*)
THREAD_LIBS=""
case "$CC" in
- *cl* | *CL*) # cl is the Microsoft C compiler
+ *cl* | *CL*)
+ # cl is the Microsoft C compiler
CFLAGS_FOR_THREADS="-DMR_THREAD_SAFE -DGC_WIN32_THREADS /MD"
LDFLAGS_FOR_THREADS="/MD"
LD_LIBFLAGS_FOR_THREADS="/MD"
@@ -2726,8 +2806,11 @@
if test "$mercury_cv_thread_local_storage" = yes; then
case "$host" in
- *-solaris2.*) ;;
- *) AC_DEFINE(MR_THREAD_LOCAL_STORAGE) ;;
+ *-solaris2.*)
+ ;;
+ *)
+ AC_DEFINE(MR_THREAD_LOCAL_STORAGE)
+ ;;
esac
fi
@@ -2755,7 +2838,6 @@
)
case "$mercury_cv_user_base_grade" in
-
yes)
case "$user_llds_base_grade" in
asm_fast|asm_jump|fast|jump|reg|none)
@@ -2768,8 +2850,7 @@
;;
no)
- AC_MSG_ERROR(
-[invalid option --without-llds-base-grade])
+ AC_MSG_ERROR([invalid option --without-llds-base-grade])
;;
*)
@@ -2778,9 +2859,7 @@
;;
esac
;;
-
no)
-
if test $mercury_cv_asm_labels = yes; then
if test $mercury_cv_gcc_model_fast = yes; then
BEST_LLDS_BASE_GRADE=asm_fast
@@ -2849,7 +2928,8 @@
# Handle `--with-default-grade' (no `=GRADE') and
# `--without-default-grade' flags.
yes|no)
- AC_MSG_ERROR([Must supply a valid grade if using --with-default-grade.])
+ AC_MSG_ERROR(
+[Must supply a valid grade if using --with-default-grade.])
;;
*)
# Perhaps do better checking on the supplied value here.
@@ -3043,7 +3123,6 @@
AC_HELP_STRING([--enable-erlang-grade], [install the Erlang grade]),
enable_erlang_grade="$enableval",enable_erlang_grade=no)
-
AC_ARG_ENABLE(libgrades,
AC_HELP_STRING([--enable-libgrades=...],
[install exactly the given versions of the library.
@@ -3143,8 +3222,7 @@
# since non-GC grades might be best for some applications.
# - both LLDS and hlc grades
# It's also convenient if we support a time profiling variant of
- # the default grade, if this is not the same as the most efficient
- # grade.
+ # the default grade, if this is not the same as the most efficient grade.
if test $mercury_cv_profiling = yes; then
# Start with profiling versions of the default grade
LIBGRADES="$LIBGRADES $DEFAULT_BASE_GRADE.gc.prof"
@@ -3252,7 +3330,6 @@
# Add the .par (thread-safe) grade, if it is supported for this system
# Only enable it if this system has pthreads installed.
-#
if test "$enable_par_grades" = yes -a "$CFLAGS_FOR_THREADS" != "" \
-a "$MR_HAVE_PTHREAD_H" = 1
then
@@ -3356,7 +3433,6 @@
MERCURY_MSG("using \`$LIBGRADES' as the set of library grades to install")
# Check that the default grade is in the set of grades to install.
-#
have_default_grade="no"
for libgrade in $LIBGRADES
do
@@ -3418,16 +3494,14 @@
;;
rs6000-*|powerpc-*)
# NUM_REAL_REGS=10
- # but succip, sp, hp, maxfr, and curfr are real regs,
- # so subtract 5
+ # but succip, sp, hp, maxfr, and curfr are real regs, so subtract 5
NUM_REAL_R_REGS=5
NUM_REAL_R_TEMPS=6
HAVE_DELAY_SLOT=
;;
sparc-*)
# NUM_REAL_REGS=10
- # but succip, sp, hp, maxfr, and curfr are real regs,
- # so subtract 5
+ # but succip, sp, hp, maxfr, and curfr are real regs, so subtract 5
NUM_REAL_R_REGS=5
NUM_REAL_R_TEMPS=6
HAVE_DELAY_SLOT=--have-delay-slot
@@ -3457,6 +3531,7 @@
AC_SUBST(HAVE_DELAY_SLOT)
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether the assembler handles .type)
AC_CACHE_VAL(mercury_cv_cannot_grok_asm_type_directive, [
case "$host" in
@@ -3474,7 +3549,9 @@
if test $mercury_cv_cannot_grok_asm_type_directive = "yes"; then
AC_DEFINE(MR_CANNOT_GROK_ASM_TYPE_DIRECTIVE)
fi
+
#-----------------------------------------------------------------------------#
+
AC_PATH_PROG(AS,as)
AC_MSG_CHECKING(whether the assembler does full preprocessing)
@@ -3506,7 +3583,9 @@
AS="$GCC_PROG -c -x assembler-with-cpp"
fi
AC_SUBST(AS)
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether structure assignment conflicts with global registers)
AC_CACHE_VAL(mercury_cv_cannot_use_structure_assignment,
AC_TRY_RUN([
@@ -3541,7 +3620,9 @@
if test $mercury_cv_cannot_use_structure_assignment = "yes"; then
AC_DEFINE(MR_CANNOT_USE_STRUCTURE_ASSIGNMENT)
fi
+
#-----------------------------------------------------------------------------#
+
AC_MSG_CHECKING(whether Mercury supports shared libraries on this system)
# We ought to use $target here rather than $host - but we don't
# support cross-compilation at the moment anyhow.
@@ -3610,7 +3691,8 @@
$CC -o conftest conftest.c
ld_linux=`ldd ./conftest | \
awk '/ld-linux/{print $1;}'`
- case $ld_linux in /lib/ld-linux.so*)
+ case $ld_linux in
+ /lib/ld-linux.so*)
AC_MSG_RESULT($ld_linux)
SHARED_LIBS="$SHARED_LIBS $ld_linux"
SHARED_LIBS_SH="$SHARED_LIBS_SH $ld_linux"
@@ -3711,7 +3793,7 @@
CFLAGS_FOR_PIC="-fpic -DMR_PIC" # used only for libgc.{a,so}
EXT_FOR_PIC_OBJECTS=o
EXT_FOR_LINK_WITH_PIC_OBJECTS=o
- #
+
# Note that despite the above definition of CFLAGS_FOR_PIC,
# we don't use `-fpic' for shared libraries on Solaris
# (the definition of EXT_FOR_PIC_OBJECTS=o means that
@@ -3859,9 +3941,8 @@
then
AC_MSG_RESULT(yes)
# The MACOSX_DEPLOYMENT_TARGET environment variable
- # needs to be set when linking with two level
- # namespaces so we can use the
- # `-undefined dynamic_lookup' option.
+ # needs to be set when linking with two level namespaces
+ # so we can use the `-undefined dynamic_lookup' option.
SET_MACOSX_DEPLOYMENT_TARGET="\
MACOSX_DEPLOYMENT_TARGET=10.3; \
export MACOSX_DEPLOYMENT_TARGET"
@@ -3925,7 +4006,6 @@
# For a full list of the other gcc warnings that we don't
# enable, and why, see scripts/mgnuc.in.
CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
-
CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
CFLAGS_FOR_DEBUG="-g"
MCFLAGS_FOR_CC=
@@ -3992,18 +4072,17 @@
# Note that changes here may require changes in scripts/ml.in.
LD_STATIC_FLAGS=
-case "$C_COMPILER_TYPE" in gcc|lcc)
+case "$C_COMPILER_TYPE" in
+ gcc|lcc)
LD_STATIC_FLAGS=-static
;;
esac
case "$FULLARCH" in
*-linux*)
- # On Linux, if we're linking statically, we need to
- # pass `-defsym _DYNAMIC=0' to the linker, to avoid
- # undefined references to _DYNAMIC in
- # boehm_gc/dyn_load.c.
- # (We might eventually need similar treatment
- # for other OSs too.)
+ # On Linux, if we're linking statically, we need to pass
+ # `-defsym _DYNAMIC=0' to the linker, to avoid undefined references
+ # to _DYNAMIC in boehm_gc/dyn_load.c. (We might eventually need
+ # similar treatment for other OSs too.)
case "$C_COMPILER_TYPE" in
gcc)
LD_STATIC_FLAGS="-static -Wl-defsym -Wl_DYNAMIC=0"
@@ -4017,10 +4096,8 @@
rm -f conftest*
echo "int main() { return 0; }" > conftest.c
if
- echo $CC $LD_STATIC_FLAGS conftest.c \
- >&AC_FD_CC 2>&1 &&
- $CC $LD_STATIC_FLAGS conftest.c \
- >&AC_FD_CC 2>&1
+ echo $CC $LD_STATIC_FLAGS conftest.c >&AC_FD_CC 2>&1 &&
+ $CC $LD_STATIC_FLAGS conftest.c >&AC_FD_CC 2>&1
then
AC_MSG_RESULT(no)
else
@@ -4032,13 +4109,15 @@
esac
;;
alpha*-dec-osf*)
- case "$COMPILER" in cc)
+ case "$COMPILER" in
+ cc)
LD_STATIC_FLAGS=-non_shared
;;
esac
;;
*-sun-solaris*)
- case "$COMPILER" in cc)
+ case "$COMPILER" in
+ cc)
LD_STATIC_FLAGS="-B static"
;;
esac
@@ -4050,7 +4129,8 @@
# here immediately before the MSG_RESULT call.
AC_MSG_CHECKING(options for static linking)
AC_MSG_RESULT($LD_STATIC_FLAGS)
-case "$LD_STATIC_FLAGS" in "")
+case "$LD_STATIC_FLAGS" in
+ "")
AC_MSG_WARN(
[\`mmc --linkage static' and \`ml --static' not implemented with
**** this C compiler (\`$CC').])
@@ -4097,7 +4177,9 @@
if test "$USE_DLLS" = "yes"; then
AC_DEFINE(MR_USE_DLLS)
fi
+
#-----------------------------------------------------------------------------#
+
if test "$BOOTSTRAP_MC" = ""; then
BOOTSTRAP_MC=mmc
fi
@@ -4107,6 +4189,7 @@
AC_SUBST(BOOTSTRAP_MC_COMPILER)
AC_SUBST(BOOTSTRAP_MC_ARGS)
AC_SUBST(BOOTSTRAP_MC)
+
#-----------------------------------------------------------------------------#
# The following allows us to share some subroutines between the
@@ -4126,9 +4209,11 @@
# demangling hangs on cygwin, so don't enable it.
case "$host" in
*-cygwin*)
- DEMANGLE=false ;;
+ DEMANGLE=false
+ ;;
*)
- DEMANGLE=true ;;
+ DEMANGLE=true
+ ;;
esac
AC_SUBST_FILE(INIT_GRADE_OPTIONS)
@@ -4150,6 +4235,7 @@
# Check for the POSIX struct tms and times() function.
# This is used for the time__times procedure in library/times.m.
#
+
AC_MSG_CHECKING(for struct tms and times function)
AC_CACHE_VAL(mercury_cv_have_posix_times,
AC_TRY_LINK([
@@ -4168,9 +4254,7 @@
CSt = (long) t.tms_cstime;
],[mercury_cv_have_posix_times=yes],[mercury_cv_have_posix_times=no]))
-#
-# figure out whether the test succeeded
-#
+# Figure out whether the test succeeded.
if test "$mercury_cv_have_posix_times" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(MR_HAVE_POSIX_TIMES)
@@ -4182,6 +4266,7 @@
#
# Check for the environ global variable.
#
+
AC_MSG_CHECKING(for environ global variable)
AC_CACHE_VAL(mercury_cv_have_environ,
AC_TRY_LINK([
@@ -4192,9 +4277,7 @@
environ
],[mercury_cv_have_environ=yes],[mercury_cv_have_environ=no]))
-#
-# figure out whether the test succeeded
-#
+# Figure out whether the test succeeded.
if test "$mercury_cv_have_environ" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(MR_HAVE_ENVIRON)
@@ -4433,6 +4516,7 @@
# not static linking, then the test will pass, but it will cause
# problems later on when we try to link things statically).
#
+
AC_ARG_ENABLE(extern-debug,
AC_HELP_STRING([--disable-extern-debug],
[disable the external (separate process) debugger]),
@@ -4571,12 +4655,12 @@
fi
#-----------------------------------------------------------------------------#
+#
# Check for a XUL browser and xsltproc and if we find both then set the
# default xml_browser_command and xml_tmp_filename mdb options.
#
AC_PATH_PROGS(XUL_BROWSER, firefox mozilla, "")
-
AC_PATH_PROGS(XSLTPROC, xsltproc, "")
if test "$XUL_BROWSER" != "" && test "$XSLTPROC" != ""; then
@@ -4658,6 +4742,7 @@
fi
rm -f confscratch $to_delete
fi
+
#-----------------------------------------------------------------------------#
AC_MSG_CHECKING(for C shell executable)
@@ -4712,7 +4797,7 @@
# file, not the installed one, so that we can test changes
# to this file without having to install first. We therefore create
# a copy of the mdbrc.in for use with the test suite.
-#
+
case $test_mdbrc in
"")
;;
@@ -4799,7 +4884,7 @@
# This is especially true of files in the runtime or java directories;
# if you add new .in files to either of those you *must* update
# scripts/mercury_config.in.
-#
+
AC_OUTPUT($output_files
"$test_flags"
"$test_mdbrc"
@@ -4811,13 +4896,12 @@
for header in $CONFIG_HEADERS ; do
if test "$header" = "runtime/mercury_conf.h"; then
if $had_old_conf_h && \
- cmp runtime/mercury_conf.h "$conf_h_copy" \
- > /dev/null && \
+ cmp runtime/mercury_conf.h "$conf_h_copy" > /dev/null && \
test -f runtime/mercury_conf.h.date
then
- # The date file need not be updated, so don't
- # update it, since that would lead to the
- # recompilation of a bunch of files.
+ # The date file need not be updated, so don't update it,
+ # since that would lead to the recompilation of a bunch
+ # of files.
true
else
touch runtime/mercury_conf.h.date
@@ -4853,10 +4937,9 @@
chmod a-x "$file"
done
-case "$remake_dependencies.$reconfiguring" in "true.no")
- MERCURY_MSG(
-"regenerating dependencies to enable GCC backend.")
-
+case "$remake_dependencies.$reconfiguring" in
+ "true.no")
+ MERCURY_MSG("regenerating dependencies to enable GCC backend.")
MMAKE_DIR=`pwd`/scripts scripts/mmake depend || exit 1
;;
esac
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_allegro
cvs diff: Diffing extras/graphics/mercury_allegro/examples
cvs diff: Diffing extras/graphics/mercury_allegro/samples
cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo
cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel
cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2
cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/posix/samples
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing ssdb
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to: mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions: mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------
More information about the reviews
mailing list