Hartmut Haase wrote:
> Hi Jean-Marc,
> after todays update I configured with
> ./configure --with-frontend=qt --with-version-suffix=-latestcvs
> and got the the following error messages for make:
>
> Making all in client
> make[3]: Entering directory `/home/haase/Software/lyx-devel/src/client'
> if g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I./../ -I../../boost -W
> -Wall
> -I/usr/X11R6/include -g -O -fno-exceptions -MT messages.o -MD -MP -MF
> ".deps/messages.Tpo" \
> -c -o messages.o `test -f 'messages.C' || echo './'`messages.C; \
> then mv -f ".deps/messages.Tpo" ".deps/messages.Po"; \
> else rm -f ".deps/messages.Tpo"; exit 1; \
> fi
> messages.C:14:34: support/path_defines.h: Datei oder Verzeichnis nicht
> gefunden
> Do you know why? The file support/path_defines.h really does not exist.
Something has gone wrong with your update. I attach my copy of messages.C
--
Angus
/* \file messages.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "messages.h"
#include "support/filetools.h"
#include "support/package.h"
#include <boost/regex.hpp>
using lyx::support::package;
using std::string;
#ifdef ENABLE_NLS
#if 0
-#include <locale>
// This version of the Pimpl utilizes the message capability of
// libstdc++ that is distributed with GNU G++.
class Messages::Pimpl {
public:
typedef std::messages<char>::catalog catalog;
Pimpl(string const & l)
: lang_(l),
loc_gl(lang_.c_str()),
mssg_gl(std::use_facet<std::messages<char> >(loc_gl))
{
//lyxerr << "Messages: language(" << l
// << ") in dir(" << dir << ")" << std::endl;
cat_gl = mssg_gl.open(PACKAGE, loc_gl, package().locale_dir().c_str());
}
~Pimpl()
{
mssg_gl.close(cat_gl);
}
string const get(string const & msg) const
{
return mssg_gl.get(cat_gl, 0, 0, msg);
}
private:
///
string lang_;
///
std::locale loc_gl;
///
std::messages<char> const & mssg_gl;
///
catalog cat_gl;
};
#else
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
# if HAVE_GETTEXT
# include <libintl.h> // use the header already in the system *EK*
# else
# include "../intl/libintl.h"
# endif
// This is a more traditional variant.
class Messages::Pimpl {
public:
Pimpl(string const & l)
: lang_(l)
{
//lyxerr << "Messages: language(" << l
// << ") in dir(" << dir << ")" << std::endl;
}
~Pimpl() {}
string const get(string const & m) const
{
if (m.empty())
return m;
char * old = strdup(setlocale(LC_ALL, 0));
char * n = setlocale(LC_ALL, lang_.c_str());
bindtextdomain(PACKAGE, package().locale_dir().c_str());
textdomain(PACKAGE);
const char* msg = gettext(m.c_str());
// Some english words have different translations, depending
// on context. In these cases the original string is
// augmented by context information (e.g.
// "To:[[as in 'From page x to page y']]" and
// "To:[[as in 'From format x to format y']]".
// This means that we need to filter out everything in
// double square brackets at the end of the string,
// otherwise the user sees bogus messages.
// If we are unable to honour the request we just
// return what we got in.
string translated(n ? msg : m);
static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
boost::smatch sub;
if (regex_match(translated, sub, reg))
translated = sub.str(1);
setlocale(LC_ALL, old);
free(old);
return translated;
}
private:
///
string lang_;
};
#endif
#else // ENABLE_NLS
// This is the dummy variant.
class Messages::Pimpl {
public:
Pimpl(string const &) {}
~Pimpl() {}
string const get(string const & m) const
{
return m;
}
};
#endif
Messages::Messages()
: pimpl_(new Pimpl(""))
{}
Messages::Messages(string const & l)
: pimpl_(new Pimpl(l))
{}
// We need this for the sake of scoped_ptr
Messages::~Messages()
{}
string const Messages::get(string const & msg) const
{
return pimpl_->get(msg);
}
