[Firebird-checkins] SF.net SVN: firebird:[51888] firebird/trunk

[<ale...@us...>]

Revision: 51888
          http://firebird.svn.sourceforge.net/firebird/?rev=51888&view=rev
Author:   alexpeshkoff
Date:     2010-11-10 12:43:56 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
Damyan's patch to enable changing firebird.log filename

Modified Paths:
--------------
    firebird/trunk/configure.in
    firebird/trunk/src/common/file_params.h
    firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp

Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in	2010-11-10 03:19:00 UTC (rev 51887)
+++ firebird/trunk/configure.in	2010-11-10 12:43:56 UTC (rev 51888)
@@ -32,6 +32,17 @@
 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(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)
 

Modified: firebird/trunk/src/common/file_params.h
===================================================================
--- firebird/trunk/src/common/file_params.h	2010-11-10 03:19:00 UTC (rev 51887)
+++ firebird/trunk/src/common/file_params.h	2010-11-10 12:43:56 UTC (rev 51888)
@@ -68,7 +68,7 @@
 #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;

Modified: firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
===================================================================
--- firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp	2010-11-10 03:19:00 UTC (rev 51887)
+++ firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp	2010-11-10 12:43:56 UTC (rev 51888)
@@ -273,7 +273,7 @@
 		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";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.