[m-rev.] diff: autoconf csh pathname
Zoltan Somogyi
zs at cs.mu.OZ.AU
Wed May 7 16:33:20 AEST 2003
tools/dotime:
tools/dotime.in:
Delete dotime from CVS and add dotime.in in its place. Whereas
dotime had a csh executable hardwired in, dotime.in takes this
pathname from autoconfiguration.
tools/Mmakefile:
Add dotime to the list of autoconfigured scripts.
tools/.nocopyright:
Update the list of scripwnocopyright files.
configure.in:
Autodetect the path name of the C shell executable.
Zoltan.
cvs diff: Diffing .
Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.362
diff -u -b -r1.362 configure.in
--- configure.in 6 May 2003 12:25:26 -0000 1.362
+++ configure.in 7 May 2003 06:25:48 -0000
@@ -3540,13 +3540,41 @@
fi
#-----------------------------------------------------------------------------#
+AC_MSG_CHECKING(for C shell executable)
+cshpath=""
+for prog in tcsh csh
+do
+ for dir in `echo $PATH | tr '[:]' '[ ]'`
+ do
+ if test -x "$dir/$prog"
+ then
+ if test "$cshpath" = ""
+ then
+ cshpath="$dir/$prog"
+ fi
+ fi
+ done
+done
+
+if test "$cshpath" = ""
+then
+ AC_MSG_RESULT(no)
+ CSHPATH="no csh path"
+else
+ AC_MSG_RESULT($cshpath)
+ CSHPATH="$cshpath"
+fi
+AC_SUBST(CSHPATH)
+
+#-----------------------------------------------------------------------------#
+
# Any new entries here may need to be handled by scripts/mercury_config.
AC_OUTPUT(Mmake.common scripts/Mmake.vars scripts/mmc
scripts/mercury.bat scripts/mprof scripts/mercury_update_interface
scripts/mgnuc scripts/parse_ml_options.sh-subr scripts/ml
scripts/c2init scripts/mmake scripts/mdb scripts/mdbrc scripts/mdprof
scripts/mkfifo_using_mknod bindist/bindist.INSTALL bindist/bindist.Makefile
-scripts/mercury_config scripts/Mercury.config tools/lmc
+scripts/mercury_config scripts/Mercury.config tools/lmc tools/dotime
,
[
# Only do this when compiling the source, not when reconfiguring
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/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
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/graphics
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/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/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
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/odbc
cvs diff: Diffing extras/posix
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/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
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/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
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 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/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
Index: tools/.nocopyright
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/.nocopyright,v
retrieving revision 1.6
diff -u -b -r1.6 .nocopyright
--- tools/.nocopyright 28 Mar 2002 03:44:41 -0000 1.6
+++ tools/.nocopyright 7 May 2003 06:31:05 -0000
@@ -13,7 +13,7 @@
cvdr
cvspatch
divide
-dotime
+dotime.in
expand_params
gdbrun
generate_index_html
@@ -24,7 +24,7 @@
list.mundook
list.murlibobo
list.muse
-lmc
+lmc.in
make_arena
makebatch
next_param
Index: tools/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/Mmakefile,v
retrieving revision 1.1
diff -u -b -r1.1 Mmakefile
--- tools/Mmakefile 17 Apr 2003 06:24:29 -0000 1.1
+++ tools/Mmakefile 7 May 2003 06:21:15 -0000
@@ -11,7 +11,7 @@
MERCURY_DIR=..
include $(MERCURY_DIR)/Mmake.common
-CONFIGURED_SCRIPTS = lmc
+CONFIGURED_SCRIPTS = lmc dotime
.SUFFIXES: .in
Index: tools/dotime
===================================================================
RCS file: tools/dotime
diff -N tools/dotime
--- tools/dotime 22 Oct 1996 06:50:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-#!/usr/local/bin/tcsh -f
-time $*
Index: tools/dotime.in
===================================================================
RCS file: tools/dotime.in
diff -N tools/dotime.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tools/dotime.in 7 May 2003 06:20:23 -0000
@@ -0,0 +1,2 @@
+#!@CSHPATH@ -f
+time $*
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: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list