devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 13:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into otr

Browse Source 
Conflicts:
	.gitignore
	Makefile.am
This commit is contained in:
James Booth
2013-09-17 01:34:57 +01:00
parent e90ba5747b ee8ff948bf
commit cab2e3cfe4
9 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/profanity.c
View File

@@ -21,6 +21,10 @@
*/
#include "config.h"
#ifdef HAVE_GIT_VERSION
#include "gitversion.c"
#endif
#include <locale.h>
#include <signal.h>
#include <stdlib.h>
@@ -618,7 +622,11 @@ _init(const int disable_tls, char *log_level)
log_level_t prof_log_level = log_level_from_string(log_level);
log_init(prof_log_level);
if (strcmp(PACKAGE_STATUS, "development") == 0) {
log_info("Starting Profanity (%sdev)...", PACKAGE_VERSION);
#ifdef HAVE_GIT_VERSION
log_info("Starting Profanity (%sdev.%s.%s)...", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
#else
log_info("Starting Profanity (%sdev)...", PACKAGE_VERSION);
#endif
} else {
log_info("Starting Profanity (%s)...", PACKAGE_VERSION);
}