8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00

Damyan's patch to enable changing firebird.log filename

This commit is contained in:
alexpeshkoff 2010-11-10 12:43:56 +00:00
parent 35d85c14a3
commit 56cffa651b
3 changed files with 14 additions and 2 deletions

View File

@ -32,6 +32,17 @@ AC_ARG_WITH([$1],
AC_SUBST([$3])
])
define([XE_CONF_FILE],[
AC_ARG_WITH([$1],
[AC_HELP_STRING([--with-$1], [$2])],
[[$3]="$withval"
AC_DEFINE_UNQUOTED([$3], "$[$3]", [$2])],
[[$3]="$4"
AC_DEFINE_UNQUOTED([$3], ["$4"], [$2])]
)
AC_SUBST([$3])
])
sinclude(acx_pthread.m4)
sinclude(binreloc.m4)
@ -556,6 +567,7 @@ XE_CONF_DIR(fbmisc, [misc DIR (PREFIX/misc)], FB_MISCDIR, /misc)
XE_CONF_DIR(fbsecure-db, [security database DIR (PREFIX)], FB_SECDBDIR)
XE_CONF_DIR(fbmsg, [message files DIR (PREFIX)], FB_MSGDIR)
XE_CONF_DIR(fblog, [log files DIR (PREFIX)], FB_LOGDIR)
XE_CONF_FILE(fblogfilename, [log file name within log dir (firebird.log)], FB_LOGFILENAME, firebird.log)
XE_CONF_DIR(fbglock, [guardian lock DIR (PREFIX)], FB_GUARDDIR)
XE_CONF_DIR(fbplugins, [plugins DIR (PREFIX)], FB_PLUGDIR, /plugins)

View File

@ -68,7 +68,7 @@ static const char MSG_FILE_LANG[] = "intl/%.10s.msg";
#endif
static const char* const LOCKDIR = "firebird"; // created in WORKFILE
static const char* const LOGFILE = "firebird.log";
static const char* const LOGFILE = FB_LOGFILENAME;
static const char* const MSG_FILE = "firebird.msg";
// Keep in sync with MSG_FILE_LANG
const int LOCALE_MAX = 10;

View File

@ -273,7 +273,7 @@ void SRVRMGR_msg_get( USHORT number, TEXT * msg)
rs = "can not quit now, use shut -ign";
break;
case MSG_STARTERR:
rs = "check $FIREBIRD/firebird.log file for errors";
rs = "check "FB_LOGFILENAME" for errors";
break;
case MSG_STARTFAIL:
rs = "can not start server";