From 034919825ed82bba354848dba48c775210e81224 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 27 Aug 1998 18:28:22 +0000 Subject: [PATCH] VERSION is now defined in configure.in (as in all "right" programs including GNOME). Definition in Make.common.in is removed. File "VERSION" is still needed for the PC port. acconfig.h doesn't include "VERSION" anymore config.h.in is rebuild using autoheader --- Make.common.in | 2 +- acconfig.h | 3 +-- config.h.in | 3 +-- configure.in | 6 ++++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Make.common.in b/Make.common.in index d14886009..e5c834444 100644 --- a/Make.common.in +++ b/Make.common.in @@ -1,4 +1,4 @@ -VERSION=pre.1.5 +VERSION = @VERSION@ SHELL = /bin/sh diff --git a/acconfig.h b/acconfig.h index 001917550..caec2c0ab 100644 --- a/acconfig.h +++ b/acconfig.h @@ -20,11 +20,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - @TOP@ +#undef VERSION #undef PACKAGE /* Always defined */ diff --git a/config.h.in b/config.h.in index 1c5e449af..0ec3aeb0f 100644 --- a/config.h.in +++ b/config.h.in @@ -21,8 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - /* Define if on AIX 3. @@ -118,6 +116,7 @@ /* Define if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +#undef VERSION #undef PACKAGE /* Always defined */ diff --git a/configure.in b/configure.in index 1f6228546..ef26b20cb 100644 --- a/configure.in +++ b/configure.in @@ -5,9 +5,10 @@ AC_INIT(create_vcs) AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=dummy +VERSION=4.1.35 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "dummy") +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_SUBST(VERSION) dnl This is path where we're looking for headers in addition to /usr/include dnl and whatever cpp defaults to. @@ -1412,6 +1413,7 @@ dnl AC_OUTPUT([ Make.common Makefile +VERSION doc/Makefile vfs/Makefile:vfs/Make-mc.in lib/Makefile