[lwatch-cvs] files ylwrap, NONE, 1.1 INSTALL, 1.6, 1.7 depcomp, 1.2, 1.3 install-sh, 1.4, 1.5 missi
Brought to you by:
arturcz
Menu
▾
▴
[lwatch-cvs] files ylwrap, NONE, 1.1 INSTALL, 1.6, 1.7 depcomp, 1.2, 1.3 install-sh, 1.4, 1.5 missing, 1.4, 1.5 mkinstalldirs, 1.4, 1.5
|
From: Artur R. C. <ar...@us...> - 2007-07-07 16:48:52
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4787 Modified Files: INSTALL depcomp install-sh missing mkinstalldirs Added Files: ylwrap Log Message: Update to automake 1.10 and autoconf 2.61 Index: mkinstalldirs =================================================================== RCS file: /cvsroot/lwatch/files/mkinstalldirs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mkinstalldirs 3 Feb 2003 14:07:25 -0000 1.4 --- mkinstalldirs 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,13 **** #! /bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman <fri...@pr...> # Created: 1993-05-16 ! # Public domain errstatus=0 ! dirmode="" usage="\ ! Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." # process command line arguments --- 1,28 ---- #! /bin/sh # mkinstalldirs --- make directory hierarchy ! ! scriptversion=2006-05-11.19 ! ! # Original author: Noah Friedman <fri...@pr...> # Created: 1993-05-16 ! # Public domain. ! # ! # This file is maintained in Automake, please report ! # bugs to <bug...@gn...> or send patches to ! # <aut...@gn...>. + nl=' + ' + IFS=" "" $nl" errstatus=0 ! dirmode= usage="\ ! Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ! ! Create each directory DIR (with mode MODE, if specified), including all ! leading file name components. ! ! Report bugs to <bug...@gn...>." # process command line arguments *************** *** 15,20 **** case $1 in -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ;; -m) # -m PERM arg --- 30,35 ---- case $1 in -h | --help | --h*) # -h for help ! echo "$usage" ! exit $? ;; -m) # -m PERM arg *************** *** 24,27 **** --- 39,46 ---- shift ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; --) # stop option processing shift *************** *** 51,65 **** esac case $dirmode in '') ! if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" fi ;; *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" fi ;; --- 70,104 ---- esac + # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and + # mkdir -p a/c at the same time, both will detect that a is missing, + # one will create a, then the other will try to create a and die with + # a "File exists" error. This is a problem when calling mkinstalldirs + # from a parallel make. We use --version in the probe to restrict + # ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') ! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) ! if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ! test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; *************** *** 68,78 **** for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift - pathcomp= for d do ! pathcomp="$pathcomp$d" case $pathcomp in -*) pathcomp=./$pathcomp ;; --- 107,125 ---- for file do ! case $file in ! /*) pathcomp=/ ;; ! *) pathcomp= ;; ! esac ! oIFS=$IFS ! IFS=/ ! set fnord $file shift + IFS=$oIFS for d do ! test "x$d" = x && continue ! ! pathcomp=$pathcomp$d case $pathcomp in -*) pathcomp=./$pathcomp ;; *************** *** 85,103 **** if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp="$pathcomp/" done done --- 132,150 ---- if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr= ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp=$pathcomp/ done done *************** *** 108,111 **** # mode: shell-script # sh-indentation: 2 # End: - # mkinstalldirs ends here --- 155,161 ---- # mode: shell-script # sh-indentation: 2 + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" # End: --- NEW FILE: ylwrap --- #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. scriptversion=2005-05-14.22 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # Written by Tom Tromey <tr...@cy...>. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # This file is maintained in Automake, please report # bugs to <bug...@gn...> or send patches to # <aut...@gn...>. case "$1" in '') echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 exit 1 ;; --basedir) basedir=$2 shift 2 ;; -h|--h*) cat <<\EOF Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... Wrapper for lex/yacc invocations, renaming files as desired. INPUT is the input file OUTPUT is one file PROG generates DESIRED is the file we actually want instead of OUTPUT PROGRAM is program to run ARGS are passed to PROG Any number of OUTPUT,DESIRED pairs may be used. Report bugs to <bug...@gn...>. EOF exit $? ;; -v|--v*) echo "ylwrap $scriptversion" exit $? ;; esac # The input. input="$1" shift case "$input" in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. ;; *) # Relative path. Make it absolute. input="`pwd`/$input" ;; esac pairlist= while test "$#" -ne 0; do if test "$1" = "--"; then shift break fi pairlist="$pairlist $1" shift done # The program to run. prog="$1" shift # Make any relative path in $prog absolute. case "$prog" in [\\/]* | ?:[\\/]*) ;; *[\\/]*) prog="`pwd`/$prog" ;; esac # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 mkdir $dirname || exit 1 cd $dirname case $# in 0) $prog "$input" ;; *) $prog "$@" "$input" ;; esac ret=$? if test $ret -eq 0; then set X $pairlist shift first=yes # Since DOS filename conventions don't allow two dots, # the DOS version of Bison writes out y_tab.c instead of y.tab.c # and y_tab.h instead of y.tab.h. Test to see if this is the case. y_tab_nodot="no" if test -f y_tab.c || test -f y_tab.h; then y_tab_nodot="yes" fi # The directory holding the input. input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` # Quote $INPUT_DIR so we can use it in a regexp. # FIXME: really we should care about more than `.' and `\'. input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` while test "$#" -ne 0; do from="$1" # Handle y_tab.c and y_tab.h output by DOS if test $y_tab_nodot = "yes"; then if test $from = "y.tab.c"; then from="y_tab.c" else if test $from = "y.tab.h"; then from="y_tab.h" fi fi fi if test -f "$from"; then # If $2 is an absolute path name, then just use that, # otherwise prepend `../'. case "$2" in [\\/]* | ?:[\\/]*) target="$2";; *) target="../$2";; esac # We do not want to overwrite a header file if it hasn't # changed. This avoid useless recompilations. However the # parser itself (the first file) should always be updated, # because it is the destination of the .y.c rule in the # Makefile. Divert the output of all other files to a temporary # file so we can compare them to existing versions. if test $first = no; then realtarget="$target" target="tmp-`echo $target | sed s/.*[\\/]//g`" fi # Edit out `#line' or `#' directives. # # We don't want the resulting debug information to point at # an absolute srcdir; it is better for it to just mention the # .y file with no path. # # We want to use the real output file name, not yy.lex.c for # instance. # # We want the include guards to be adjusted too. FROM=`echo "$from" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` TARGET=`echo "$2" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? # Check whether header files must be updated. if test $first = no; then if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then echo "$2" is unchanged rm -f "$target" else echo updating "$2" mv -f "$target" "$realtarget" fi fi else # A missing file is only an error for the first file. This # is a blatant hack to let us support using "yacc -d". If -d # is not specified, we don't want an error when the header # file is "missing". if test $first = yes; then ret=1 fi fi shift shift first=no done else ret=$? fi # Remove the directory. cd .. rm -rf $dirname exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-end: "$" # End: Index: missing =================================================================== RCS file: /cvsroot/lwatch/files/missing,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** missing 3 Feb 2003 14:07:25 -0000 1.4 --- missing 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,5 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. --- 1,9 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2006-05-10.23 ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ! # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. *************** *** 16,21 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. # As a special exception to the GNU General Public License, if you --- 20,25 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 30,33 **** --- 34,39 ---- run=: + sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' + sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the *************** *** 39,43 **** fi ! case "$1" in --run) # Try to run requested program, and just exit if it succeeds. --- 45,51 ---- fi ! msg="missing on your system" ! ! case $1 in --run) # Try to run requested program, and just exit if it succeeds. *************** *** 45,54 **** shift "$@" && exit 0 ;; - esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. - case "$1" in -h|--h|--he|--hel|--help) --- 53,66 ---- shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -h|--h|--he|--hel|--help) *************** *** 68,71 **** --- 80,84 ---- autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] *************** *** 75,83 **** makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; --- 88,100 ---- makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 88,99 **** ;; ! aclocal*) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 fi echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from --- 105,146 ---- ;; ! esac ! ! # Now exit if we have it, but it failed. Also exit now if we ! # don't have it and --version was passed (most likely to detect ! # the program). ! case $1 in ! lex|yacc) ! # Not GNU programs, they don't have --version. ! ;; ! ! tar) ! if test -n "$run"; then ! echo 1>&2 "ERROR: \`tar' requires --run" ! exit 1 ! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ! exit 1 ! fi ! ;; ! ! *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; + esac + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case $1 in + aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from *************** *** 103,113 **** autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU --- 150,155 ---- autoconf) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU *************** *** 117,127 **** autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them --- 159,164 ---- autoheader) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them *************** *** 131,135 **** touch_files= for f in $files; do ! case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; --- 168,172 ---- touch_files= for f in $files; do ! case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *************** *** 141,151 **** automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. --- 178,183 ---- automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. *************** *** 157,174 **** autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. ! You can get \`$1Help2man' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ! test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file --- 189,201 ---- autom4te) echo 1>&2 "\ ! WARNING: \`$1' is needed, but is $msg. ! You might have modified some files without having the proper tools for further handling them. ! You can get \`$1' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file *************** *** 186,204 **** bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi --- 213,231 ---- bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi *************** *** 206,213 **** esac fi ! if [ ! -f y.tab.h ]; then echo >y.tab.h fi ! if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi --- 233,240 ---- esac fi ! if test ! -f y.tab.h; then echo >y.tab.h fi ! if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi *************** *** 216,230 **** lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi --- 243,257 ---- lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi *************** *** 232,236 **** esac fi ! if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi --- 259,263 ---- esac fi ! if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi *************** *** 238,257 **** help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ! if test -z "$file"; then ! file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` ! fi ! if [ -f "$file" ]; then touch $file else --- 265,277 ---- help2man) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ! if test -f "$file"; then touch $file else *************** *** 263,273 **** makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious --- 283,288 ---- makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious *************** *** 275,283 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file ;; --- 290,311 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! # The file to touch is that specified with -o ... ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n ' ! /^@setfilename/{ ! s/.* \([^ ]*\) *$/\1/ ! p ! q ! }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; *************** *** 285,292 **** tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. --- 313,316 ---- *************** *** 301,305 **** firstarg="$1" if shift; then ! case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` --- 325,329 ---- firstarg="$1" if shift; then ! case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` *************** *** 307,311 **** ;; esac ! case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` --- 331,335 ---- ;; esac ! case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` *************** *** 324,331 **** *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." --- 348,355 ---- *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." *************** *** 335,336 **** --- 359,367 ---- exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: depcomp =================================================================== RCS file: /cvsroot/lwatch/files/depcomp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** depcomp 3 Feb 2003 14:07:25 -0000 1.2 --- depcomp 7 Jul 2007 16:48:48 -0000 1.3 *************** *** 1,6 **** #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects ! # Copyright 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 1,9 ---- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects ! ! scriptversion=2006-10-15.18 ! ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software ! # Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 16,21 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. # As a special exception to the GNU General Public License, if you --- 19,24 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 26,45 **** # Originally written by Alexandre Oliva <ol...@dc...>. if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi - # `libtool' can also be set to `yes' or `no'. - - if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" - fi tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} --- 29,71 ---- # Originally written by Alexandre Oliva <ol...@dc...>. + case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF + Usage: depcomp [--help] [--version] PROGRAM [ARGS] + + Run PROGRAMS ARGS to compile a file, generating dependencies + as side-effects. + + Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + + Report bugs to <bug...@gn...>. + EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; + esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi + # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. + depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} *************** *** 67,71 **** ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. ! "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : --- 93,110 ---- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. ! ## Unfortunately, FreeBSD c89 acceptance of flags depends upon ! ## the command line argument order; so add the flags where they ! ## appear in depend2.am. Note that the slowdown incurred here ! ## affects only configure: in makefiles, %FASTDEP% shortcuts this. ! for arg ! do ! case $arg in ! -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ! *) set fnord "$@" "$arg" ;; ! esac ! shift # fnord ! shift # $arg ! done ! "$@" stat=$? if test $stat -eq 0; then : *************** *** 173,182 **** aix) # The C for AIX Compiler uses -M and outputs the dependencies ! # in a .u file. This file always lives in the current directory. ! # Also, the AIX compiler puts `$object:' at the start of each line; ! # $object doesn't have directory information. ! stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M --- 212,221 ---- aix) # The C for AIX Compiler uses -M and outputs the dependencies ! # in a .u file. In older versions, this file always lives in the ! # current directory. Also, the AIX compiler puts `$object:' at the ! # start of each line; $object doesn't have directory information. ! # Version 6 uses the directory in both cases. ! stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" if test "$libtool" = yes; then "$@" -Wc,-M *************** *** 184,189 **** "$@" -M fi - stat=$? if test $stat -eq 0; then : else --- 223,234 ---- "$@" -M fi stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else *************** *** 193,196 **** --- 238,242 ---- if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to *************** *** 207,210 **** --- 253,334 ---- ;; + icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + + hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side *************** *** 218,227 **** if test "$libtool" = yes; then ! tmpdepfile1="$dir.libs/$base.lo.d" ! tmpdepfile2="$dir.libs/$base.d" "$@" -Wc,-MD else ! tmpdepfile1="$dir$base.o.d" ! tmpdepfile2="$dir$base.d" "$@" -MD fi --- 342,368 ---- if test "$libtool" = yes; then ! # With Tru64 cc, shared objects can also be used to make a ! # static library. This mechanism is used in libtool 1.4 series to ! # handle both shared and static libraries in a single compilation. ! # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ! # ! # With libtool 1.5 this exception was removed, and libtool now ! # generates 2 separate objects for the 2 libraries. These two ! # compilations output dependencies in $dir.libs/$base.o.d and ! # in $dir$base.o.d. We have to check for both files, because ! # one of the two compilations can be disabled. We should prefer ! # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ! # automatically cleaned when .libs/ is deleted, while ignoring ! # the former would cause a distcleancheck panic. ! tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ! tmpdepfile2=$dir$base.o.d # libtool 1.5 ! tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ! tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else ! tmpdepfile1=$dir$base.o.d ! tmpdepfile2=$dir$base.d ! tmpdepfile3=$dir$base.d ! tmpdepfile4=$dir$base.d "$@" -MD fi *************** *** 230,246 **** if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi ! if test -f "$tmpdepfile1"; then ! tmpdepfile="$tmpdepfile1" ! else ! tmpdepfile="$tmpdepfile2" ! fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ! # That's a space and a tab in the []. ! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" --- 371,386 ---- if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi ! for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ! do ! test -f "$tmpdepfile" && break ! done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ! # That's a tab and a space in the []. ! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" *************** *** 255,259 **** dashmstdout) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout, regardless of -o. "$@" || exit $? --- 395,399 ---- dashmstdout) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? *************** *** 266,272 **** fi ! # Remove `-o $object'. We will use -o /dev/null later, ! # however we can't do the remplacement now because ! # `-o $object' might simply not be used IFS=" " for arg --- 406,410 ---- fi ! # Remove `-o $object'. IFS=" " for arg *************** *** 288,292 **** test -z "$dashmflag" && dashmflag=-M ! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" --- 426,434 ---- test -z "$dashmflag" && dashmflag=-M ! # Require at least two characters before searching for `:' ! # in the target name. This is to cope with DOS-style filenames: ! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ! "$@" $dashmflag | ! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" *************** *** 307,310 **** --- 449,459 ---- makedepend) "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi # X makedepend shift *************** *** 319,323 **** -D*|-I*) set fnord "$@" "$arg"; shift ;; ! -*) ;; *) --- 468,474 ---- -D*|-I*) set fnord "$@" "$arg"; shift ;; ! # Strip any option that makedepend may not understand. Remove ! # the object too, otherwise makedepend will parse it as a source file. ! -*|$object) ;; *) *************** *** 340,344 **** cpp) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout. "$@" || exit $? --- 491,495 ---- cpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout. "$@" || exit $? *************** *** 371,375 **** "$@" -E | ! sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" --- 522,527 ---- "$@" -E | ! sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ! -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" *************** *** 382,386 **** msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? --- 534,538 ---- msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? *************** *** 422,423 **** --- 574,584 ---- exit 0 + + # Local Variables: + # mode: shell-script + # sh-indentation: 2 + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: INSTALL =================================================================== RCS file: /cvsroot/lwatch/files/INSTALL,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** INSTALL 14 Aug 2004 15:30:20 -0000 1.6 --- INSTALL 7 Jul 2007 16:48:48 -0000 1.7 *************** *** 1,9 **** ! $Id$ ! $Source$ ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software ! Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. --- 1,9 ---- ! Installation Instructions ! ************************* ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006 Free Software Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. *************** *** 11,15 **** ================== ! These are generic installation instructions. The `configure' shell script attempts to guess correct values for --- 11,18 ---- ================== ! Briefly, the shell commands `./configure; make; make install' should ! configure, build, and install this package. The following ! more-detailed instructions are generic; see the `README' file for ! instructions specific to this package. The `configure' shell script attempts to guess correct values for *************** *** 24,30 **** It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves ! the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale ! cache files.) If you need to do unusual things to compile the package, please try --- 27,33 ---- It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves ! the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale ! cache files. If you need to do unusual things to compile the package, please try *************** *** 36,53 **** The file `configure.ac' (or `configure.in') is used to create ! `configure' by a program called `autoconf'. You only need ! `configure.ac' if you want to change it or regenerate `configure' using ! a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. If you're ! using `csh' on an old version of System V, you might need to type ! `sh ./configure' instead to prevent `csh' from trying to execute ! `configure' itself. ! Running `configure' takes awhile. While running, it prints some ! messages telling which features it is checking for. 2. Type `make' to compile the package. --- 39,53 ---- The file `configure.ac' (or `configure.in') is used to create ! `configure' by a program called `autoconf'. You need `configure.ac' if ! you want to change it or regenerate `configure' using a newer version ! of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. ! Running `configure' might take a while. While running, it prints ! some messages telling which features it is checking for. 2. Type `make' to compile the package. *************** *** 71,77 **** ===================== ! Some systems require unusual options for compilation or linking that ! the `configure' script does not know about. Run `./configure --help' ! for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters --- 71,77 ---- ===================== ! Some systems require unusual options for compilation or linking that the ! `configure' script does not know about. Run `./configure --help' for ! details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters *************** *** 79,83 **** is an example: ! ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. --- 79,83 ---- is an example: ! ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. *************** *** 86,119 **** ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you must use a version of `make' that ! supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! If you have to use a `make' that does not support the `VPATH' ! variable, you have to compile the package for one architecture at a ! time in the source code directory. After you have installed the ! package for one architecture, use `make distclean' before reconfiguring ! for another architecture. Installation Names ================== ! By default, `make install' will install the package's files in ! `/usr/local/bin', `/usr/local/man', etc. You can specify an ! installation prefix other than `/usr/local' by giving `configure' the ! option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! give `configure' the option `--exec-prefix=PATH', the package will use ! PATH as the prefix for installing programs and libraries. ! Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=PATH' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. --- 86,117 ---- ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! With a non-GNU `make', it is safer to compile the package for one ! architecture at a time in the source code directory. After you have ! installed the package for one architecture, use `make distclean' before ! reconfiguring for another architecture. Installation Names ================== ! By default, `make install' installs the package's commands under ! `/usr/local/bin', include files under `/usr/local/include', etc. You ! can specify an installation prefix other than `/usr/local' by giving ! `configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! pass the option `--exec-prefix=PREFIX' to `configure', the package uses ! PREFIX as the prefix for installing programs and libraries. ! Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. *************** *** 126,130 **** ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE --- 124,128 ---- ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE *************** *** 141,149 **** ========================== ! There may be some features `configure' cannot figure out ! automatically, but needs to determine by the type of machine the package ! will run on. Usually, assuming the package is built to be run on the ! _same_ architectures, `configure' can figure that out, but if it prints ! a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: --- 139,147 ---- ========================== ! There may be some features `configure' cannot figure out automatically, ! but needs to determine by the type of machine the package will run on. ! Usually, assuming the package is built to be run on the _same_ ! architectures, `configure' can figure that out, but if it prints a ! message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: *************** *** 160,164 **** If you are _building_ compiler tools for cross-compiling, you should ! use the `--target=TYPE' option to select the type of system they will produce code for. --- 158,162 ---- If you are _building_ compiler tools for cross-compiling, you should ! use the option `--target=TYPE' to select the type of system they will produce code for. *************** *** 171,177 **** ================ ! If you want to set default values for `configure' scripts to share, ! you can create a site shell script called `config.site' that gives ! default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the --- 169,175 ---- ================ ! If you want to set default values for `configure' scripts to share, you ! can create a site shell script called `config.site' that gives default ! values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the *************** *** 182,186 **** ================== ! Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these --- 180,184 ---- ================== ! Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these *************** *** 190,201 **** ./configure CC=/usr/local2/bin/gcc ! will cause the specified gcc to be used as the C compiler (unless it is overridden in the site shell script). `configure' Invocation ====================== ! `configure' recognizes the following options to control how it ! operates. `--help' --- 188,203 ---- ./configure CC=/usr/local2/bin/gcc ! causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). + Unfortunately, this technique does not work for `CONFIG_SHELL' due to + an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + `configure' Invocation ====================== ! `configure' recognizes the following options to control how it operates. `--help' Index: install-sh =================================================================== RCS file: /cvsroot/lwatch/files/install-sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install-sh 3 Feb 2003 14:07:25 -0000 1.4 --- install-sh 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,18 **** #!/bin/sh - # # install - install a program, script, or datafile ! # This comes from X11R5 (mit/util/scripts/install.sh). # ! # Copyright 1991 by the Massachusetts Institute of Technology # ! # Permission to use, copy, modify, distribute, and sell this software and its ! # documentation for any purpose is hereby granted without fee, provided that ! # the above copyright notice appear in all copies and that both that ! # copyright notice and this permission notice appear in supporting ! # documentation, and that the name of M.I.T. not be used in advertising or ! # publicity pertaining to distribution of the software without specific, ! # written prior permission. M.I.T. makes no representations about the ! # suitability of this software for any purpose. It is provided "as is" ! # without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent --- 1,37 ---- #!/bin/sh # install - install a program, script, or datafile ! ! scriptversion=2006-10-14.15 ! ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. # ! # Copyright (C) 1994 X Consortium ! # ! # Permission is hereby granted, free of charge, to any person obtaining a copy ! # of this software and associated documentation files (the "Software"), to ! # deal in the Software without restriction, including without limitation the ! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ! # sell copies of the Software, and to permit persons to whom the Software is ! # furnished to do so, subject to the following conditions: ! # ! # The above copyright notice and this permission notice shall be included in ! # all copies or substantial portions of the Software. ! # ! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent *************** *** 21,27 **** # # This script is compatible with the BSD install script, but was written ! # from scratch. It can only install one file at a time, a restriction ! # shared with many OS's install programs. # set DOITPROG to echo to test this script --- 40,48 ---- # # This script is compatible with the BSD install script, but was written ! # from scratch. + nl=' + ' + IFS=" "" $nl" # set DOITPROG to echo to test this script *************** *** 29,35 **** # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" ! ! # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" --- 50,61 ---- # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" + if test -z "$doit"; then + doit_exec=exec + else + doit_exec=$doit + fi ! # Put in absolute file names if you don't have them in your path; ! # or use environment vars. mvprog="${MVPROG-mv}" *************** *** 42,276 **** mkdirprog="${MKDIRPROG-mkdir}" ! transformbasename="" ! transform_arg="" ! instcmd="$mvprog" ! chmodcmd="$chmodprog 0755" ! chowncmd="" ! chgrpcmd="" ! stripcmd="" rmcmd="$rmprog -f" mvcmd="$mvprog" ! src="" ! dst="" ! dir_arg="" ! while [ x"$1" != x ]; do ! case $1 in ! -c) instcmd=$cpprog ! shift ! continue;; ! -d) dir_arg=true ! shift ! continue;; ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! -o) chowncmd="$chownprog $2" ! shift ! ... [truncated message content] |
