diff --git a/configure.ac b/configure.ac
index 1d070f0df..a25dc9a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,704 +1,705 @@
 ## $Id$
 ## Purpose: CDS Invenio main configure.ac file.
 ## Note: If you change this file, please run "autoreconf" to regenerate the "configure" script.
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 CERN.
 ##
 ## CDS Invenio 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 of the
 ## License, or (at your option) any later version.
 ##
 ## CDS Invenio 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 CDS Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## Initialize autoconf and automake:
 AC_INIT(cds-invenio, 0.93.50.20070904, cds.support@cern.ch)
 AM_INIT_AUTOMAKE(cds-invenio, 0.93.50.20070904)
 
 ## Check for install:
 AC_PROG_INSTALL
 
 ## Define WEBURL URL:
 AC_ARG_WITH(weburl, AC_HELP_STRING([--with-weburl], [specify URL where web files will be reached (e.g. http://webserver.domain.com)]), WEBURL=${withval})
 if test -z "$WEBURL"; then
    AC_MSG_ERROR([
    You have not used the "--with-weburl" argument that should define the corresponding URL where the site will be reached.  
    Example: "--with-weburl=http://webserver.domain.com".])
 fi   
 
 AC_ARG_WITH(sweburl, AC_HELP_STRING([--with-sweburl], [specify URL where HTTPS files will be reached (e.g. https://webserver.domain.com)]), SWEBURL=${withval})
 if test -z "${SWEBURL}"; then
    SWEBURL="${WEBURL}"
    AC_MSG_WARN([
    You have not specified secure URL for accessing the site (--with-sweburl). 
    User authentication will be done in clear text across the network.
    ])
 fi   
 
 ## Define DBHOST database host:
 AC_ARG_WITH(dbhost, AC_HELP_STRING([--with-dbhost], [specify DB server (e.g. sqlserver.domain.com)]), DBHOST=${withval})
 if test -z "$DBHOST"; then
    AC_MSG_ERROR([
    You have not used the "--with-dbhost" argument that should define which DB server to use.  
    Example: "--with-dbhost=sqlserver.domain.com".])
 fi   
 
 ## Define DBNAME database name:
 AC_ARG_WITH(dbname, AC_HELP_STRING([--with-dbname], [specify DB name (e.g. cdsinvenio)]), DBNAME=${withval})
 if test -z "$DBNAME"; then
    AC_MSG_ERROR([
    You have not used the "--with-dbname" argument that should define DB name.  
    Example: "--with-dbname=cdsinvenio".])
 fi   
 
 ## Define DBUSER user name:
 AC_ARG_WITH(dbuser, AC_HELP_STRING([--with-dbuser], [specify DB user name (e.g. cdsinvenio)]), DBUSER=${withval})
 if test -z "$DBUSER"; then
    AC_MSG_ERROR([
    You have not used the "--with-dbuser" argument that should define DB user name.  
    Example: "--with-dbuser=cdsinvenio".])
 fi   
 
 ## Define DBPASS user password:
 AC_ARG_WITH(dbpass, AC_HELP_STRING([--with-dbpass], [specify DB user password (e.g. myp1ss)]), DBPASS=${withval})
 if test -z "$DBPASS"; then
    AC_MSG_ERROR([
    You have not used the "--with-dbpass" argument that should define DB user password.  
    Example: "--with-dbpass=myp1ss".])
 fi   
 
 ## Check for gettext support
 AM_GNU_GETTEXT(external)
 AM_GNU_GETTEXT_VERSION(0.14.4)
 
 ## Check for WML:
 AC_PATH_PROG(WML, wml)
 if test -z "$WML"; then
    AC_MSG_ERROR([
    WML (Website META Language) was not found in your PATH.  Please install it first.  
    Available from <http://www.engelschall.com/sw/wml/>.])
 fi
 
 ## Set option -c in WML so that it can work from a separate build tree
 WML="${WML} -c"
 
 ## Check for MySQL client:
 AC_PATH_PROG(MYSQL, mysql)
 if test -z "$MYSQL"; then
    AC_MSG_ERROR([
    MySQL command-line client was not found in your PATH.  Please install it first.
    Available from <http://mysql.com/>.])
 fi
 
 ## Check for Python:
 AC_MSG_CHECKING(for python)
 AC_ARG_WITH(python, AC_HELP_STRING([--with-python], [path to a specific Python binary (optional)]), PYTHON=${withval})
 if test -n "$PYTHON"; then
    AC_MSG_RESULT($PYTHON)
 else
    AC_PATH_PROG(PYTHON, python)
    if test -z "$PYTHON"; then
       AC_MSG_ERROR([
       Python was not found in your PATH.  Please either install it 
       in your PATH or specify --with-python configure option.
       Python is available from <http://python.org/>.])
    fi
 fi
 
 ## Check for Python version and modules:
 AC_MSG_CHECKING(for required Python modules)
 $PYTHON ${srcdir}/configure-tests.py
 if test $? -ne 0; then
    AC_MSG_ERROR([Please fix the above Python problem before continuing.])
 fi
 AC_MSG_RESULT(found)
 
 ## Check for PHP
 AC_PATH_PROG(PHP, php)
 
 ## Check for Acrobat Reader:
 AC_PATH_PROG(ACROREAD, acroread)
 if test -z "$ACROREAD"; then
    AC_MSG_WARN([
    Acrobat Reader was not found in your PATH.  It is used in 
    the WebSubmit module for automatic conversion of submitted documents.  
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Acrobat Reader is available from
    <http://www.adobe.com/products/acrobat/readstep.html>.])
 fi
 
 ## Check for gzip:
 AC_PATH_PROG(GZIP, gzip)
 if test -z "$GZIP"; then
    AC_MSG_WARN([
    Gzip was not found in your PATH.  It is used in 
    the WebSubmit module to compress the data submitted in an archive.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Gzip is available from
    <http://www.gzip.org/>.])
 fi
 
 ## Check for gunzip:
 AC_PATH_PROG(GUNZIP, gunzip)
 if test -z "$GUNZIP"; then
    AC_MSG_WARN([
    Gunzip was not found in your PATH.  It is used in 
    the WebSubmit module to correctly deal with submitted compressed
    files.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Gunzip is available from
    <http://www.gzip.org/>.])
 fi
 
 ## Check for tar:
 AC_PATH_PROG(TAR, tar)
 if test -z "$TAR"; then
    AC_MSG_WARN([
    Tar was not found in your PATH.  It is used in 
    the WebSubmit module to pack the submitted data into an archive.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Tar is available from
    <ftp://prep.ai.mit.edu/pub/gnu/tar/>.])
 fi
 
 ## Check for ps2pdf:
 AC_PATH_PROG(PS2PDF, ps2pdf)
 if test -z "$PS2PDF"; then
    AC_MSG_WARN([
    ps2pdf was not found in your PATH.  It is used in 
    the WebSubmit module to convert submitted PostScripts into PDF.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  PS2PDF is available from
    <http://www.cs.wisc.edu/~ghost/doc/AFPL/6.50/Ps2pdf.htm>.])
 fi
 
 ## Check for pdftotext:
 AC_PATH_PROG(PDFTOTEXT, pdftotext)
 if test -z "$PDFTOTEXT"; then
    AC_MSG_WARN([
    pdftotext was not found in your PATH.  It is used for the fulltext indexation 
    of PDF files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  pdftotext is available from <http://www.foolabs.com/xpdf/home.html>. 
    ])
 fi
 
 ## Check for pstotext:
 AC_PATH_PROG(PSTOTEXT, pstotext)
 if test -z "$PSTOTEXT"; then
    AC_MSG_WARN([
    pstotext was not found in your PATH.  It is used for the fulltext indexation 
    of PDF and PostScript files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  pstotext is available from <http://www.cs.wisc.edu/~ghost/doc/AFPL/>.
    ])
 fi
 
 ## Check for ps2ascii:
 AC_PATH_PROG(PSTOASCII, ps2ascii)
 if test -z "$PSTOASCII"; then
    AC_MSG_WARN([
    ps2ascii was not found in your PATH.  It is used for the fulltext indexation 
    of PostScript files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  ps2ascii is available from <http://www.cs.wisc.edu/~ghost/doc/AFPL/>.
    ])
 fi
 
 ## Check for antiword:
 AC_PATH_PROG(ANTIWORD, antiword)
 if test -z "$ANTIWORD"; then
    AC_MSG_WARN([
    antiword was not found in your PATH.  It is used for the fulltext indexation 
    of Microsoft Word files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  antiword is available from <http://www.winfield.demon.nl/index.html>. 
    ])
 fi
 
 ## Check for catdoc:
 AC_PATH_PROG(CATDOC, catdoc)
 if test -z "$CATDOC"; then
    AC_MSG_WARN([
    catdoc was not found in your PATH.  It is used for the fulltext indexation 
    of Microsoft Word files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  catdoc is available from <http://www.ice.ru/~vitus/catdoc/index.html>.
    ])
 fi
 
 ## Check for wvText:
 AC_PATH_PROG(WVTEXT, wvText)
 if test -z "$WVTEXT"; then
    AC_MSG_WARN([
    wvText was not found in your PATH.  It is used for the fulltext indexation 
    of Microsoft Word files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  wvText is available from <http://sourceforge.net/projects/wvware>.
    ])
 fi     
 
 ## Check for ppthtml:
 AC_PATH_PROG(PPTHTML, ppthtml)
 if test -z "$PPTHTML"; then
    AC_MSG_WARN([
    ppthtml was found in your PATH. It is used for the fulltext indexation 
    of Microsoft PowerPoint files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  ppthtml is available from <http://www.xlhtml.org/>.
    ])
 fi
 
 ## Check for xlhtml:
 AC_PATH_PROG(XLHTML, xlhtml)
 if test -z "$XLHTML"; then
    AC_MSG_WARN([
    xlhtml was found in your PATH. It is used for the fulltext indexation 
    of Microsoft Excel files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  xlhtml is available from <http://chicago.sourceforge.net/xlhtml/>.
    ])
 fi
 
 ## Check for html2text:
 AC_PATH_PROG(HTMLTOTEXT, html2text)
 if test -z "$HTMLTOTEXT"; then
    AC_MSG_WARN([
    html2text was found in your PATH. It is used for the fulltext indexation 
    of Microsoft PowerPoint and Excel files.
    You can continue without it but you may miss fulltext searching capability 
    of CDS Invenio.  We recomend you to install it first and to rerun the configure 
    script.  html2text is available from <http://userpage.fu-berlin.de/~mbayer/tools/html2text.html>.
    ])
 fi
 
 ## Check for Giftext:
 AC_PATH_PROG(GIFTEXT, giftext)
 if test -z "$GIFTEXT"; then
    AC_MSG_WARN([
    Giftext was not found in your PATH.  It is used in 
    the WebSubmit module to create an icon from a submitted picture.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Giftext is available from
    <http://prtr-13.ucsc.edu/~badger/software/libungif/getting.shtml>.])
 fi
 
 ## Check for file:
 AC_PATH_PROG(FILE, file)
 if test -z "$FILE"; then
    AC_MSG_WARN([
    File was not found in your PATH.  It is used in 
    the WebSubmit module to check the validity of the submitted files.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  File is available from
    <ftp://ftp.astron.com/pub/file/>.])
 fi
 
 ## Check for convert:
 AC_PATH_PROG(CONVERT, convert)
 if test -z "$CONVERT"; then
    AC_MSG_WARN([
    Convert was not found in your PATH.  It is used in 
    the WebSubmit module to create an icon from a submitted picture.
    You can continue without it but you will miss some CDS Invenio 
    functionality.  We recommend you to install it first and to rerun 
    the configure script.  Convert is available from
    <http://www.imagemagick.org/>.])
 fi
 
 ## Check for CLISP:
 AC_MSG_CHECKING(for clisp)
 AC_ARG_WITH(clisp, AC_HELP_STRING([--with-clisp], [path to a specific CLISP binary (optional)]), CLISP=${withval})
 if test -n "$CLISP"; then
    AC_MSG_RESULT($CLISP)
 else
    AC_PATH_PROG(CLISP, clisp)
    if test -z "$CLISP"; then
       AC_MSG_WARN([
       GNU CLISP was not found in your PATH.  It is used by the WebStat
       module to produce statistics about CDS Invenio usage.  (Alternatively,
       SBCL or CMUCL can be used instead of CLISP.)
       You can continue without it but you will miss this feature.  We 
       recommend you to install it first (if you don't have neither CMUCL
       nor SBCL) and to rerun the configure script.  
       GNU CLISP is available from <http://clisp.cons.org/>.])
    fi
 fi
 
 ## Check for CMUCL:
 AC_MSG_CHECKING(for cmucl)
 AC_ARG_WITH(cmucl, AC_HELP_STRING([--with-cmucl], [path to a specific CMUCL binary (optional)]), CMUCL=${withval})
 if test -n "$CMUCL"; then
    AC_MSG_RESULT($CMUCL)
 else
    AC_PATH_PROG(CMUCL, cmucl)
    if test -z "$CMUCL"; then
       AC_MSG_CHECKING(for lisp) # CMUCL can also be installed under `lisp' exec name
       AC_PATH_PROG(CMUCL, lisp) 
    fi
    if test -z "$CMUCL"; then   
       AC_MSG_WARN([
       CMUCL was not found in your PATH.  It is used by the WebStat
       module to produce statistics about CDS Invenio usage.  (Alternatively,
       CLISP or SBCL can be used instead of CMUCL.)
       You can continue without it but you will miss this feature.  We 
       recommend you to install it first (if you don't have neither CLISP
       nor SBCL) and to rerun the configure script.  
       CMUCL is available from <http://www.cons.org/cmucl/>.])
    fi    
 fi
 
 ## Check for SBCL:
 AC_MSG_CHECKING(for sbcl)
 AC_ARG_WITH(sbcl, AC_HELP_STRING([--with-sbcl], [path to a specific SBCL binary (optional)]), SBCL=${withval})
 if test -n "$SBCL"; then
    AC_MSG_RESULT($SBCL)
 else
    AC_PATH_PROG(SBCL, sbcl)
    if test -z "$SBCL"; then
       AC_MSG_WARN([
       SBCL was not found in your PATH.  It is used by the WebStat
       module to produce statistics about CDS Invenio usage.  (Alternatively,
       CLISP or CMUCL can be used instead of SBCL.)
       You can continue without it but you will miss this feature.  We 
       recommend you to install it first (if you don't have neither CLISP
       nor CMUCL) and to rerun the configure script.  
       SBCL is available from <http://sbcl.sourceforge.net/>.])
    fi    
 fi
 
 ## Check for gnuplot:
 AC_PATH_PROG(GNUPLOT, gnuplot)
 if test -z "$GNUPLOT"; then
    AC_MSG_WARN([
    Gnuplot was not found in your PATH.  It is used by the BibRank
    module to produce graphs about download and citation history.
    You can continue without it but you will miss these graphs.  We 
    recommend you to install it first and to rerun the configure script.  
    Gnuplot is available from <http://www.gnuplot.info/>.])
 fi
 
 ## Substitute variables:
 AC_SUBST(VERSION)
 AC_SUBST(WML)
 AC_SUBST(MYSQL)
 AC_SUBST(PHP)
 AC_SUBST(PYTHON)
 AC_SUBST(CLIDIR)
 AC_SUBST(WEBURL)
 AC_SUBST(SWEBURL)
 AC_SUBST(DBHOST)
 AC_SUBST(DBNAME)
 AC_SUBST(DBUSER)
 AC_SUBST(DBPASS)
 AC_SUBST(PDFTOTEXT)
 AC_SUBST(PSTOTEXT)
 AC_SUBST(PSTOASCII)
 AC_SUBST(ANTIWORD)
 AC_SUBST(CATDOC)
 AC_SUBST(WVTEXT)
 AC_SUBST(PPTHTML)
 AC_SUBST(XLHTML)
 AC_SUBST(HTMLTOTEXT)
 AC_SUBST(localstatedir, `eval echo "${localstatedir}"`)
 AC_SUBST(CACHEDIR)
 AC_SUBST(CLISP)
 AC_SUBST(CMUCL)
 AC_SUBST(SBCL)
 AC_SUBST(GNUPLOT)
 AC_SUBST(DJPEG)
 AC_SUBST(CONVERT)
 AC_SUBST(GIFTEXT)
 AC_SUBST(JPEGSIZE)
 AC_SUBST(PNMSCALE)
 AC_SUBST(PPMQUANT)
 AC_SUBST(PPMTOGIF)
 AC_SUBST(GIFINTER)
 AC_SUBST(GIFRSIZE)
 
 ## Define output files:
 AC_CONFIG_FILES([config.nice  \
 	  Makefile \
           po/Makefile.in \
 	  config/Makefile \
 	  config/configbis.wml \
 	  modules/Makefile \
 	  modules/bibconvert/Makefile \
 	  modules/bibconvert/bin/Makefile \
 	  modules/bibconvert/bin/bibconvert \
 	  modules/bibconvert/doc/Makefile \
 	  modules/bibconvert/doc/admin/Makefile \
 	  modules/bibconvert/doc/hacking/Makefile \
 	  modules/bibconvert/etc/Makefile \
 	  modules/bibconvert/lib/Makefile \
 	  modules/bibmatch/Makefile \
 	  modules/bibmatch/bin/Makefile \
 	  modules/bibmatch/bin/bibmatch \
 	  modules/bibmatch/doc/Makefile \
 	  modules/bibmatch/doc/admin/Makefile \
 	  modules/bibmatch/etc/Makefile \
 	  modules/bibmatch/lib/Makefile \
 	  modules/bibedit/Makefile \
 	  modules/bibedit/bin/Makefile \
 	  modules/bibedit/bin/refextract \
 	  modules/bibedit/bin/xmlmarclint \
 	  modules/bibedit/bin/xmlmarc2textmarc \
 	  modules/bibedit/doc/Makefile \
 	  modules/bibedit/doc/admin/Makefile \
 	  modules/bibedit/doc/hacking/Makefile \
 	  modules/bibedit/etc/Makefile \
 	  modules/bibedit/lib/Makefile \
 	  modules/bibedit/web/Makefile \
 	  modules/bibedit/web/admin/Makefile \
 	  modules/bibformat/Makefile \
 	  modules/bibformat/bin/Makefile \
 	  modules/bibformat/bin/bibformat \
 	  modules/bibformat/bin/bibreformat \
 	  modules/bibformat/doc/Makefile \
 	  modules/bibformat/doc/admin/Makefile \
 	  modules/bibformat/doc/hacking/Makefile \
 	  modules/bibformat/etc/Makefile \
 	  modules/bibformat/etc/output_formats/Makefile \
 	  modules/bibformat/etc/format_templates/Makefile \
 	  modules/bibformat/lib/Makefile \
 	  modules/bibformat/lib/elements/Makefile \
 	  modules/bibformat/lib/core/Makefile \
 	  modules/bibformat/lib/common/Makefile \
 	  modules/bibformat/web/Makefile \
 	  modules/bibformat/web/admin/Makefile \
 	  modules/bibharvest/Makefile \
 	  modules/bibharvest/bin/Makefile \
 	  modules/bibharvest/bin/bibharvest \
 	  modules/bibharvest/bin/oaiharvest \
 	  modules/bibharvest/bin/oaiarchive \
 	  modules/bibharvest/doc/Makefile \
 	  modules/bibharvest/doc/admin/Makefile \
 	  modules/bibharvest/doc/hacking/Makefile \
 	  modules/bibharvest/lib/Makefile \
 	  modules/bibharvest/web/Makefile \
 	  modules/bibharvest/web/admin/Makefile \
 	  modules/bibclassify/Makefile \
 	  modules/bibclassify/bin/Makefile \
 	  modules/bibclassify/bin/bibclassify \
 	  modules/bibclassify/bin/bibclassifyd \
 	  modules/bibclassify/doc/Makefile \
 	  modules/bibclassify/doc/admin/Makefile \
 	  modules/bibclassify/doc/hacking/Makefile \
 	  modules/bibclassify/etc/Makefile
 	  modules/bibclassify/lib/Makefile
 	  modules/bibindex/Makefile \
 	  modules/bibindex/bin/Makefile \
 	  modules/bibindex/bin/bibindex \
 	  modules/bibindex/bin/bibstat \
 	  modules/bibindex/doc/Makefile \
 	  modules/bibindex/doc/admin/Makefile \
 	  modules/bibindex/doc/hacking/Makefile \
 	  modules/bibindex/lib/Makefile \
 	  modules/bibindex/web/Makefile \
 	  modules/bibindex/web/admin/Makefile \
 	  modules/bibrank/Makefile \
 	  modules/bibrank/bin/Makefile \
 	  modules/bibrank/bin/bibrank \
 	  modules/bibrank/bin/bibrankgkb \
 	  modules/bibrank/doc/Makefile \
 	  modules/bibrank/doc/admin/Makefile \
 	  modules/bibrank/doc/hacking/Makefile \
 	  modules/bibrank/etc/Makefile \
 	  modules/bibrank/etc/bibrankgkb.cfg \
 	  modules/bibrank/etc/demo_jif.cfg \
 	  modules/bibrank/etc/template_single_tag_rank_method.cfg \
 	  modules/bibrank/lib/Makefile \
 	  modules/bibrank/web/Makefile \
 	  modules/bibrank/web/admin/Makefile \
 	  modules/bibsched/Makefile \
 	  modules/bibsched/bin/Makefile \
 	  modules/bibsched/bin/bibsched \
 	  modules/bibsched/bin/bibtaskex \
 	  modules/bibsched/doc/Makefile \
 	  modules/bibsched/doc/admin/Makefile \
 	  modules/bibsched/doc/hacking/Makefile \
 	  modules/bibsched/lib/Makefile \
 	  modules/bibupload/Makefile \
 	  modules/bibupload/bin/Makefile \
 	  modules/bibupload/bin/bibupload \
 	  modules/bibupload/doc/Makefile \
 	  modules/bibupload/doc/admin/Makefile \
 	  modules/bibupload/doc/hacking/Makefile \
 	  modules/bibupload/lib/Makefile \
 	  modules/elmsubmit/Makefile \
 	  modules/elmsubmit/bin/Makefile \
 	  modules/elmsubmit/bin/elmsubmit \
 	  modules/elmsubmit/doc/Makefile \
 	  modules/elmsubmit/doc/admin/Makefile \
 	  modules/elmsubmit/doc/hacking/Makefile \
 	  modules/elmsubmit/etc/Makefile \
 	  modules/elmsubmit/etc/elmsubmit.cfg \
 	  modules/elmsubmit/lib/Makefile \
 	  modules/elmsubmit/lib/magic/Makefile \
 	  modules/miscutil/Makefile \
 	  modules/miscutil/bin/Makefile \
 	  modules/miscutil/bin/dbexec \
 	  modules/miscutil/bin/dbtest \
 	  modules/miscutil/bin/testsuite \
 	  modules/miscutil/bin/regressiontestsuite \
 	  modules/miscutil/lib/Makefile \
 	  modules/miscutil/demo/Makefile \
 	  modules/miscutil/sql/Makefile \
 	  modules/miscutil/web/Makefile \
 	  modules/miscutil/doc/Makefile \
 	  modules/miscutil/doc/hacking/Makefile \
 	  modules/webaccess/Makefile \
 	  modules/webaccess/bin/Makefile \
 	  modules/webaccess/bin/authaction \
 	  modules/webaccess/bin/webaccessadmin \
 	  modules/webaccess/doc/Makefile \
 	  modules/webaccess/doc/admin/Makefile \
 	  modules/webaccess/doc/hacking/Makefile \
 	  modules/webaccess/lib/Makefile \
 	  modules/webaccess/web/Makefile \
 	  modules/webaccess/web/admin/Makefile \
 	  modules/webalert/Makefile \
 	  modules/webalert/bin/Makefile \
 	  modules/webalert/bin/alertengine \
 	  modules/webalert/doc/Makefile \
 	  modules/webalert/doc/admin/Makefile \
 	  modules/webalert/doc/hacking/Makefile \
 	  modules/webalert/lib/Makefile \
 	  modules/webalert/web/Makefile \
 	  modules/webhelp/Makefile \
 	  modules/webhelp/web/Makefile \
 	  modules/webhelp/web/hacking/Makefile \
 	  modules/webhelp/web/admin/Makefile \
 	  modules/webhelp/web/admin/howto/Makefile \
 	  modules/websearch/Makefile \
 	  modules/websearch/bin/Makefile \
 	  modules/websearch/bin/webcoll \
 	  modules/websearch/doc/Makefile \
 	  modules/websearch/doc/admin/Makefile \
 	  modules/websearch/doc/hacking/Makefile \
 	  modules/websearch/lib/Makefile \
 	  modules/websearch/web/Makefile \
 	  modules/websearch/web/admin/Makefile \
 	  modules/websession/Makefile \
 	  modules/websession/bin/Makefile \
 	  modules/websession/bin/sessiongc \
 	  modules/websession/doc/Makefile \
 	  modules/websession/doc/admin/Makefile \
 	  modules/websession/doc/hacking/Makefile \
 	  modules/websession/lib/Makefile \
 	  modules/websession/web/Makefile \
 	  modules/webstat/Makefile \
 	  modules/webstat/bin/Makefile \
 	  modules/webstat/bin/webstat \
 	  modules/webstat/bin/webstatadmin \
 	  modules/webstat/doc/Makefile \
 	  modules/webstat/doc/admin/Makefile \
 	  modules/webstat/doc/hacking/Makefile \
 	  modules/webstat/etc/Makefile \
 	  modules/webstat/lib/Makefile \
 	  modules/webstyle/Makefile \
 	  modules/webstyle/css/Makefile \
 	  modules/webstyle/doc/Makefile \
 	  modules/webstyle/doc/admin/Makefile \
 	  modules/webstyle/doc/hacking/Makefile \
 	  modules/webstyle/img/Makefile \
 	  modules/webstyle/lib/Makefile \
 	  modules/webcomment/Makefile \
 	  modules/webcomment/doc/Makefile \
 	  modules/webcomment/doc/admin/Makefile \
 	  modules/webcomment/doc/hacking/Makefile \
 	  modules/webcomment/lib/Makefile \
 	  modules/webcomment/web/Makefile \
 	  modules/webcomment/web/admin/Makefile \
 	  modules/webbasket/Makefile \
 	  modules/webbasket/doc/Makefile \
 	  modules/webbasket/doc/admin/Makefile \
 	  modules/webbasket/doc/hacking/Makefile \
 	  modules/webbasket/lib/Makefile \
 	  modules/webbasket/web/Makefile \
 	  modules/webmessage/Makefile \
 	  modules/webmessage/bin/Makefile \
 	  modules/webmessage/bin/webmessageadmin \
 	  modules/webmessage/doc/Makefile \
 	  modules/webmessage/doc/admin/Makefile \
 	  modules/webmessage/doc/hacking/Makefile \
 	  modules/webmessage/lib/Makefile \
 	  modules/webmessage/web/Makefile \
 	  modules/websubmit/Makefile \
 	  modules/websubmit/bin/Makefile \
 	  modules/websubmit/bin/thumbmaker \
 	  modules/websubmit/etc/Makefile \
 	  modules/websubmit/etc/bibconvert/Makefile \
 	  modules/websubmit/etc/bibconvert/KB/Makefile \
 	  modules/websubmit/etc/bibconvert/config/Makefile \
+	  modules/websubmit/etc/bibconvert/config/DEMOPICcreate.tpl \
 	  modules/websubmit/etc/bibconvert/config/EDSPICTcreate.tpl \
 	  modules/websubmit/etc/bibconvert/config/EDSRPICTcreate.tpl \
 	  modules/websubmit/etc/bibconvert/config/EDSTEXTcreate.tpl \
 	  modules/websubmit/etc/bibconvert/config/EDSRTEXTcreate.tpl \
 	  modules/websubmit/doc/Makefile \
 	  modules/websubmit/doc/admin/Makefile \
 	  modules/websubmit/doc/hacking/Makefile \
 	  modules/websubmit/lib/Makefile \
 	  modules/websubmit/lib/functions/Makefile \
 	  modules/websubmit/web/Makefile \
 	  modules/websubmit/web/admin/Makefile \
 	  ])
 
 AC_CONFIG_COMMANDS(.wmlrc, [
 cat<<EOF>.wmlrc
 -Iconfig -I${srcdir}/config
 EOF
 ])
 
 ## Finally, write output files:
 AC_OUTPUT
 
 ## Write help:
 AC_MSG_RESULT([****************************************************************************])
 AC_MSG_RESULT([** Your CDS Invenio installation is now ready for building.               **]) 
 AC_MSG_RESULT([** You have entered the following parameters:                             **]) 
 AC_MSG_RESULT([**   - CDS Invenio main install directory: ${prefix}])
 AC_MSG_RESULT([**   - Web home URL: $WEBURL])
 AC_MSG_RESULT([**   - Secure web home URL: $SWEBURL])
 AC_MSG_RESULT([**   - DB server: $DBHOST])
 AC_MSG_RESULT([**   - DB name: $DBNAME])
 AC_MSG_RESULT([**   - DB username: $DBUSER])
 AC_MSG_RESULT([**   - DB password: $DBPASS])
 AC_MSG_RESULT([**   - Python executable: $PYTHON])
 AC_MSG_RESULT([**   - CLISP executable: $CLISP])
 AC_MSG_RESULT([**   - CMUCL executable: $CMUCL])
 AC_MSG_RESULT([**   - SBCL executable: $SBCL])
 AC_MSG_RESULT([** Here are the steps to continue the building process:                   **])
 AC_MSG_RESULT([**   1) Customize self-explanatory config file './config/config.wml'.     **])
 AC_MSG_RESULT([**   2) Type 'make' to build your customized CDS Invenio installation.    **])
 AC_MSG_RESULT([**   3) Type 'make create-tables' if you have not created tables before.  **])
 AC_MSG_RESULT([**   4) Type 'make install' to install the system.                        **])
 AC_MSG_RESULT([**   5) Type 'make create-demo-site' to install and test the demo site.   **])
 AC_MSG_RESULT([** Good luck, and thanks for choosing CDS Invenio.                        **])
 AC_MSG_RESULT([**              -- CDS Development Group <cds.support@cern.ch>            **])
 AC_MSG_RESULT([****************************************************************************])
 
 ## end of file