[m-dev.] trivial diff: fix some long lines in configure.in
Fergus Henderson
fjh at cs.mu.OZ.AU
Sat May 22 12:47:30 AEST 1999
Estimated hours taken: 0.25
configure.in:
Reformat some things to avoid lines of > 80 columns.
I've included the output of `cvs diff' both with and without `-w'
(ignore whitespace).
cvs diff -w configure.in
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.167
diff -u -w -r1.167 configure.in
--- configure.in 1999/05/22 02:43:24 1.167
+++ configure.in 1999/05/22 02:43:34
@@ -2108,9 +2108,11 @@
;;
*)
sed -e '/END_OF_C_GRADE_INFO/,$d' < $c_file > confscratch
- if grep "TAG_BITS=$mercury_cv_low_tag_bits" confscratch > /dev/null 2>&1
+ if grep "TAG_BITS=$mercury_cv_low_tag_bits" \
+ confscratch > /dev/null 2>&1
then
- if grep "UNBOXED_FLOAT=$mercury_cv_unboxed_floats" confscratch > /dev/null 2>&1
+ if grep "UNBOXED_FLOAT=$mercury_cv_unboxed_floats" \
+ confscratch > /dev/null 2>&1
then
to_keep="$to_keep $c_file"
else
@@ -2124,7 +2126,7 @@
done
if test "$to_delete" = "" ; then
if test "$to_keep" != "" ; then
- MERCURY_MSG("no - they are compatible with autoconfigured settings")
+ MERCURY_MSG("no, they are compatible with autoconfigured settings")
else
MERCURY_MSG("there are no existing Mercury-generated C files")
fi
@@ -2134,8 +2136,9 @@
MERCURY_MSG("that is consistent with autoconfigured settings")
MERCURY_MSG("$to_delete")
else
- MERCURY_MSG("all Mercury generated C files must be rebuilt in a grade")
- MERCURY_MSG("that is consistent with autoconfigured settings")
+ MERCURY_MSG("all Mercury generated C files must be rebuilt")
+ MERCURY_MSG("in a grade that is consistent with the")
+ MERCURY_MSG("autoconfigured settings")
fi
MERCURY_MSG("installation may take longer than usual")
fi
cvs diff configure.in
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.167
diff -u -r1.167 configure.in
--- configure.in 1999/05/22 02:43:24 1.167
+++ configure.in 1999/05/22 02:43:34
@@ -2100,46 +2100,49 @@
to_keep=""
to_delete=""
if test "$BOOTSTRAP_MC" != "" ; then
- MERCURY_MSG("checking whether any C files need to be rebuilt...")
- for c_file in library/*.c compiler/*.c browser/*.c profiler/*.c
- do
- case $c_file in
- */'*.c')
- ;;
- *)
- sed -e '/END_OF_C_GRADE_INFO/,$d' < $c_file > confscratch
- if grep "TAG_BITS=$mercury_cv_low_tag_bits" confscratch > /dev/null 2>&1
- then
- if grep "UNBOXED_FLOAT=$mercury_cv_unboxed_floats" confscratch > /dev/null 2>&1
- then
- to_keep="$to_keep $c_file"
- else
- to_delete="$to_delete $c_file"
- fi
- else
- to_delete="$to_delete $c_file"
- fi
- ;;
- esac
- done
- if test "$to_delete" = "" ; then
- if test "$to_keep" != "" ; then
- MERCURY_MSG("no - they are compatible with autoconfigured settings")
- else
- MERCURY_MSG("there are no existing Mercury-generated C files")
- fi
- else
- if test "$to_keep" != "" ; then
- MERCURY_MSG("the following C files must be rebuilt in a grade")
- MERCURY_MSG("that is consistent with autoconfigured settings")
- MERCURY_MSG("$to_delete")
- else
- MERCURY_MSG("all Mercury generated C files must be rebuilt in a grade")
- MERCURY_MSG("that is consistent with autoconfigured settings")
- fi
- MERCURY_MSG("installation may take longer than usual")
- fi
- rm -f confscratch $to_delete
+ MERCURY_MSG("checking whether any C files need to be rebuilt...")
+ for c_file in library/*.c compiler/*.c browser/*.c profiler/*.c
+ do
+ case $c_file in
+ */'*.c')
+ ;;
+ *)
+ sed -e '/END_OF_C_GRADE_INFO/,$d' < $c_file > confscratch
+ if grep "TAG_BITS=$mercury_cv_low_tag_bits" \
+ confscratch > /dev/null 2>&1
+ then
+ if grep "UNBOXED_FLOAT=$mercury_cv_unboxed_floats" \
+ confscratch > /dev/null 2>&1
+ then
+ to_keep="$to_keep $c_file"
+ else
+ to_delete="$to_delete $c_file"
+ fi
+ else
+ to_delete="$to_delete $c_file"
+ fi
+ ;;
+ esac
+ done
+ if test "$to_delete" = "" ; then
+ if test "$to_keep" != "" ; then
+ MERCURY_MSG("no, they are compatible with autoconfigured settings")
+ else
+ MERCURY_MSG("there are no existing Mercury-generated C files")
+ fi
+ else
+ if test "$to_keep" != "" ; then
+ MERCURY_MSG("the following C files must be rebuilt in a grade")
+ MERCURY_MSG("that is consistent with autoconfigured settings")
+ MERCURY_MSG("$to_delete")
+ else
+ MERCURY_MSG("all Mercury generated C files must be rebuilt")
+ MERCURY_MSG("in a grade that is consistent with the")
+ MERCURY_MSG("autoconfigured settings")
+ fi
+ MERCURY_MSG("installation may take longer than usual")
+ fi
+ rm -f confscratch $to_delete
fi
#-----------------------------------------------------------------------------#
AC_OUTPUT(Mmake.common scripts/Mmake.vars scripts/mmc scripts/mprof
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh> | of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3 | -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list