From: Andre <maan@p133.(none)>
Date: Wed, 28 Jun 2006 13:02:39 +0000 (+0200)
Subject: get rid of -DVERSION
X-Git-Tag: v0.2.14~59^2~18
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=52f6c9ab26c8a64ec413c7b4ae8cf43ac8f628a5

get rid of -DVERSION

It's identical to PACKAGE_VERSION, so use PACKAGE_VERSION in the
C Code and get rid of the preprocessor define.
---

diff --git a/Makefile.in b/Makefile.in
index 2c47a2cd..e51a20eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,6 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-version = @PACKAGE_VERSION@
 codename = oriented abstraction
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@ -42,7 +41,6 @@ CPPFLAGS += -DFONTDIR='"$(PKGDATADIR)/fonts"'
 CPPFLAGS += -DPICDIR='"$(PKGDATADIR)/pics"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DSYSTEM='"$(system)"'
-CPPFLAGS += -DVERSION='"$(version)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
diff --git a/command.c b/command.c
index ea42ef43..52d56c9e 100644
--- a/command.c
+++ b/command.c
@@ -603,7 +603,8 @@ static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
+	return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \""
+			CODENAME "\"\n"
 			COPYRIGHT "\n"
 			"built: " BUILD_DATE "\n"
 			SYSTEM ", " CC_VERSION "\n"
@@ -1100,7 +1101,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	in_addr = addr;
 	challenge_nr = random();
 	/* send Welcome message */
-	ret = send_va_buffer(fd, "This is para_server, version " VERSION  ".\n" );
+	ret = send_va_buffer(fd, "This is para_server, version "
+		PACKAGE_VERSION  ".\n" );
 	if (ret < 0)
 		goto err_out;
 	/* recv auth request line */
diff --git a/daemon.c b/daemon.c
index d3a43b9a..edaf7f9c 100644
--- a/daemon.c
+++ b/daemon.c
@@ -101,7 +101,8 @@ void close_log(FILE* logfile)
  */
 void log_welcome(const char *whoami, int loglevel)
 {
-	PARA_INFO_LOG("welcome to %s " VERSION " ("BUILD_DATE")\n", whoami);
+	PARA_INFO_LOG("welcome to %s " PACKAGE_VERSION " ("BUILD_DATE")\n",
+		whoami);
 	PARA_DEBUG_LOG("using loglevel %d\n", loglevel);
 }
 
diff --git a/gui.c b/gui.c
index ffd1ea84..c0588197 100644
--- a/gui.c
+++ b/gui.c
@@ -31,7 +31,7 @@ INIT_GUI_ERRLISTS;
 extern const char *status_item_list[NUM_STAT_ITEMS];
 static char *stat_content[NUM_STAT_ITEMS];
 
-#define STANDARD_STATUS_BAR "para_gui " VERSION " (hit ? for help)"
+#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)"
 
 static int signal_pipe;
 
@@ -339,7 +339,7 @@ static void print_status_bar(void)
 	if (!curses_active)
 		return;
 	wmove(sb.win, 0, 0);
-	align_str(sb.win,STANDARD_STATUS_BAR, sb.cols, CENTER);
+	align_str(sb.win, STANDARD_STATUS_BAR, sb.cols, CENTER);
 	wrefresh(sb.win);
 }
 
@@ -540,7 +540,7 @@ static void print_welcome(void)
 	int ll = conf.loglevel_arg;
 	if (ll > NOTICE)
 		return;
-	outputf(COLOR_WELCOME, "Welcome to para_gui " VERSION
+	outputf(COLOR_WELCOME, "Welcome to para_gui " PACKAGE_VERSION
 		" \"" CODENAME "\". Theme: %s", theme.name);
 	wclrtoeol(bot.win);
 }
@@ -1224,7 +1224,8 @@ static void com_enlarge_top_win(void)
 
 static void com_version(void)
 {
-	print_in_bar(COLOR_MSG, "para_gui " VERSION " \"" CODENAME "\"");
+	print_in_bar(COLOR_MSG, "para_gui " PACKAGE_VERSION " \""
+		CODENAME "\"");
 }
 
 static void com_quit(void)
diff --git a/http_recv.c b/http_recv.c
index 6a2f60f1..386aacbc 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -87,7 +87,7 @@ static char *make_request_msg(void)
 {
 	char *ret, *hn = para_hostname();
 	ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
-		HTTP_GET_MSG, hn, VERSION);
+		HTTP_GET_MSG, hn, PACKAGE_VERSION);
 	free(hn);
 	return ret;
 }
diff --git a/sdl_gui.c b/sdl_gui.c
index b67b3d1e..3cfabbb5 100644
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -356,7 +356,7 @@ static void init_SDL(void)
 	SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE);
 	/* Set the window manager title bar */
 	SDL_WM_SetCaption("The Gui of death that makes you blind (paraslash "
-		VERSION ")", "SFont");
+		PACKAGE_VERSION ")", "SFont");
 }
 
 /*