From 0ffce1084ad4bed632664ebc2f6a8696c2a8d3d9 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 23 Oct 2012 11:26:25 +0200 Subject: [PATCH] Added support for release names through ./configure RELEASE=name --- configure.ac | 4 ++++ src/controller.cpp | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 71bd3c3a..0c40c29c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,10 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset mkdir socket strerror]) AC_SUBST([global_CFLAGS], [-funsigned-char]) +#allow release names +AC_ARG_VAR([RELEASE], [Sets a specific release name]) +AC_DEFINE_UNQUOTED([RELEASE], ["$RELEASE"]) + #allow verbose mode compiles AC_ARG_ENABLE([verbose], AC_HELP_STRING([--enable-verbose], [Compile with verbose messages]), AC_DEFINE([DEBUG], [4])) diff --git a/src/controller.cpp b/src/controller.cpp index edc78018..d3af85e7 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -668,7 +668,7 @@ int main(int argc, char ** argv){ it->H.Clean(); it->H.SetHeader("Content-Type", "text/html"); it->H.SetHeader("X-Info", "To force an API response, request the file /api"); - it->H.SetHeader("Server", "mistserver/" PACKAGE_VERSION "/" + Util::Config::libver); + it->H.SetHeader("Server", "mistserver/" PACKAGE_VERSION "/" + Util::Config::libver + "/" RELEASE); it->H.SetBody(std::string((char*)server_html, (size_t)server_html_len)); it->C.Send(it->H.BuildResponse("200", "OK")); it->H.Clean(); @@ -685,8 +685,7 @@ int main(int argc, char ** argv){ //sent current configuration, no matter if it was changed or not //Response["streams"] = Storage["streams"]; Response["config"] = Controller::Storage["config"]; - Controller::checkCapable(Response["capabilities"]); - Response["config"]["version"] = PACKAGE_VERSION "/" + Util::Config::libver; + Response["config"]["version"] = PACKAGE_VERSION "/" + Util::Config::libver + "/" RELEASE; Response["streams"] = Controller::Storage["streams"]; //add required data to the current unix time to the config, for syncing reasons Response["config"]["time"] = Util::epoch();