From bfa965376a554aab0f998fc238e74d1cf85e6c68 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 8 Jan 2013 16:23:48 +0100 Subject: [PATCH] Better method to set release names. --- configure.ac | 4 ---- src/Makefile.am | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f9dbfa4c..b85f4beb 100644 --- a/configure.ac +++ b/configure.ac @@ -41,10 +41,6 @@ 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/Makefile.am b/src/Makefile.am index 42b18dfb..4f695de7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,9 @@ BUILT_SOURCES=server.html.h embed.js.h # Do not clean below files, build machines do not have closure installed EXTRA_DIST=server.html server.html.h embed.js.h -AM_CPPFLAGS = $(global_CFLAGS) $(MIST_CFLAGS) +RELEASE ?= "Generic_`getconf LONG_BIT`" + +AM_CPPFLAGS = $(global_CFLAGS) $(MIST_CFLAGS) -DRELEASE=\"$(RELEASE)\" LDADD = $(MIST_LIBS) SUBDIRS=converters analysers bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP MistConnHTTPProgressive MistConnHTTPDynamic MistConnHTTPSmooth MistConnHTTPLive MistConnTS MistPlayer