From: Wilfried Göesgens Date: Thu, 6 Apr 2006 22:05:35 +0000 (+0000) Subject: more modern version. X-Git-Tag: v7.86~4065 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=79d535772455fb960dcbdbd0325d954d5e2c6fb6;p=citadel.git more modern version. --- diff --git a/webcit/INSTALL b/webcit/INSTALL index 095b1eb40..23e5f25d0 100644 --- a/webcit/INSTALL +++ b/webcit/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives @@ -102,16 +102,16 @@ 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=PREFIX'. +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 -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +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 @@ -159,7 +159,7 @@ where SYSTEM can have one of these forms: need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -189,8 +189,13 @@ them in the `configure' command line, using `VAR=value'. For example: ./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). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== diff --git a/webcit/autogen.sh b/webcit/autogen.sh index ed15af560..952620849 100755 --- a/webcit/autogen.sh +++ b/webcit/autogen.sh @@ -1,5 +1,6 @@ #!/bin/bash # tool to generate the automaticaly provided stuff svn log >ChangeLog -intltoolize --force 2>&1 |grep -v "You should update your 'aclocal.m4' by running aclocal." +#intltoolize --force 2>&1 |grep -v "You should update your 'aclocal.m4' by running aclocal." +autopoint --force autoreconf -i --force 2>&1|grep -v 'warning: underquoted definition' diff --git a/webcit/configure.in b/webcit/configure.in index d555e1534..3d820e2e9 100644 --- a/webcit/configure.in +++ b/webcit/configure.in @@ -393,7 +393,7 @@ AC_SUBST(SETUP_LIBS) AC_ARG_WITH(rundir, [ --with-rundir=DIR where to find the citadel servers sockets (overridable by -h at runtime.)], [ rundir=$withval ],[ rundir=/usr/local/citadel ] ) -AC_DEFINE_UNQUOTED([RUNDIR],["$rundir"],where should we make look for citadel sockets??) +AC_DEFINE_UNQUOTED([RUNDIR],["$rundir"],[where should we make look for citadel sockets?]) AC_ARG_WITH(staticdir, [ --with-staticdir=DIR where to put datafiles], @@ -403,13 +403,13 @@ AC_SUBST(staticdir) AC_ARG_WITH(staticrundir, [ --with-staticrundir=DIR where to search datafiles at runtime], [ staticrundir=$withval ],[ staticrundir=$staticdir ] ) -AC_DEFINE_UNQUOTED([DATADIR],["$staticrundir"],where should we make our root?) +AC_DEFINE_UNQUOTED([DATADIR],["$staticrundir"],[where should we make our root?]) AC_ARG_WITH(editordir, [ --with-editordir=DIR where to search the editor at runtime], [ editordir=$withval ],[ editordir=$staticrundir ] ) AC_SUBST(editordir) -AC_DEFINE_UNQUOTED([EDITORDIR],["$editordir"],where find the editor (tiny_mce)?) +AC_DEFINE_UNQUOTED([EDITORDIR],["$editordir"],[where find the editor (tiny_mce)?]) diff --git a/webcit/missing b/webcit/missing index 64b5f901d..894e786e1 100755 --- a/webcit/missing +++ b/webcit/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2004-09-07.08 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ scriptversion=2004-09-07.08 # 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. +# 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 @@ -87,12 +87,12 @@ Supported PROGRAM values: yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit 0 + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit 0 + exit $? ;; -*) @@ -288,11 +288,18 @@ WARNING: \`$1' is $msg. You should only need it if call might also be the consequence of using a buggy \`make' (AIX, 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 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + # ... 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 ;;