From 42871028c008dc2252901e3d13bf7e4d4ad79f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Mon, 4 Jul 2011 14:07:35 -0400
Subject: [PATCH] Remove SFLPHONED_VERSION from global.h, use autoconf
PACKAGE_VERSION
---
sflphone-common/src/global.h | 2 --
sflphone-common/src/sip/sipvoiplink.cpp | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/src/global.h b/sflphone-common/src/global.h
index ed021d2149..249bcffb7d 100644
--- a/sflphone-common/src/global.h
+++ b/sflphone-common/src/global.h
@@ -43,8 +43,6 @@
#include <vector>
#include "logger.h"
-#define SFLPHONED_VERSION "0.9.14" /** Version number */
-
#define HOMEDIR (getenv ("HOME")) /** Home directory */
#define XDG_DATA_HOME (getenv ("XDG_DATA_HOME"))
#define XDG_CONFIG_HOME (getenv ("XDG_CONFIG_HOME"))
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 7d41dd3d75..09f5205e0c 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -32,6 +32,10 @@
* as that of the covered work.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "sipvoiplink.h"
#include "manager.h"
@@ -1389,7 +1393,7 @@ SIPVoIPLink::getCurrentCodecName(const CallID& id)
std::string SIPVoIPLink::getUseragentName (const AccountID& id)
{
/*
- useragent << PROGNAME << "/" << SFLPHONED_VERSION;
+ useragent << PROGNAME << "/" << PACKAGE_VERSION;
return useragent.str();
*/
@@ -1400,7 +1404,7 @@ std::string SIPVoIPLink::getUseragentName (const AccountID& id)
useragent << account->getUseragent();
if (useragent.str() == "sflphone" || useragent.str() == "")
- useragent << "/" << SFLPHONED_VERSION;
+ useragent << "/" << PACKAGE_VERSION;
return useragent.str ();
}
--
GitLab