diff --git a/.gitignore b/.gitignore index ee6b3a75..3831d3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ tests/test.out .gitignore *~ src/rem2ps +src/version.h diff --git a/configure b/configure index f5d459e4..a8f871aa 100755 --- a/configure +++ b/configure @@ -666,6 +666,7 @@ SET_MAKE CPP GREP EGREP +VERSION LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -5281,7 +5282,9 @@ _ACEOF fi done -ac_config_files="$ac_config_files src/Makefile www/Makefile" +VERSION=03.01.04 + +ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5839,6 +5842,7 @@ do "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "www/Makefile") CONFIG_FILES="$CONFIG_FILES www/Makefile" ;; + "src/version.h") CONFIG_FILES="$CONFIG_FILES src/version.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -5952,11 +5956,12 @@ SET_MAKE!$SET_MAKE$ac_delim CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim +VERSION!$VERSION$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index cbef7cbe..172dc5d2 100644 --- a/configure.in +++ b/configure.in @@ -45,4 +45,6 @@ if test "$GCC" = yes; then fi AC_CHECK_FUNCS(setenv unsetenv) -AC_OUTPUT(src/Makefile www/Makefile) +VERSION=03.01.04 +AC_SUBST(VERSION) +AC_OUTPUT(src/Makefile www/Makefile src/version.h) diff --git a/src/Makefile.in b/src/Makefile.in index 4f55ef7e..5d07c357 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,6 @@ # Makefile.in for REMIND # -VERSION=03.01.03 SHELL= /bin/sh BETA = 1 srcdir=@srcdir@ @@ -12,6 +11,7 @@ bindir=@bindir@ datadir=@datadir@ datarootdir=@datarootdir@ VPATH=$(srcdir) +VERSION=@VERSION@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -92,3 +92,4 @@ beta-tgz: #---------------- Stuff after this added by "make depend" ----------------- + diff --git a/src/config.h.in b/src/config.h.in index 43bf74cd..5276fe3f 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,5 +1,3 @@ -/* src/config.h.in. Generated automatically from configure.in by autoheader. */ - /* Define if utime(file, NULL) sets file's timestamp to the present. */ #undef HAVE_UTIME_NULL diff --git a/src/funcs.c b/src/funcs.c index 309081db..c74435b8 100644 --- a/src/funcs.c +++ b/src/funcs.c @@ -11,6 +11,7 @@ /* */ /***************************************************************/ +#include "version.h" #include "config.h" #include @@ -47,7 +48,6 @@ #include "protos.h" #include "err.h" #include "expr.h" -#include "version.h" /* Function prototypes */ static int FCurrent (void); diff --git a/src/init.c b/src/init.c index be935980..899c3a9f 100644 --- a/src/init.c +++ b/src/init.c @@ -12,6 +12,7 @@ /* */ /***************************************************************/ +#include "version.h" #include "config.h" #define L_IN_INIT 1 @@ -28,7 +29,6 @@ #include "protos.h" #include "expr.h" #include "err.h" -#include "version.h" #include "globals.h" /*************************************************************** diff --git a/src/rem2ps.c b/src/rem2ps.c index 562ed101..148f58bd 100644 --- a/src/rem2ps.c +++ b/src/rem2ps.c @@ -10,6 +10,7 @@ /* */ /***************************************************************/ +#include "version.h" #include "config.h" #include "dynbuf.h" @@ -20,7 +21,6 @@ #include #include #include "rem2ps.h" -#include "version.h" #define NEW(type) ((type *) malloc(sizeof(type))) diff --git a/src/version.h b/src/version.h deleted file mode 100644 index 2f3a9dcd..00000000 --- a/src/version.h +++ /dev/null @@ -1,13 +0,0 @@ -/***************************************************************/ -/* */ -/* VERSION.H */ -/* */ -/* What version of remind do we have? */ -/* */ -/* This file is part of REMIND. */ -/* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999-2007 by Roaring Penguin Software Inc. */ -/* */ -/***************************************************************/ - -#define VERSION "03.01.04" diff --git a/src/version.h.in b/src/version.h.in new file mode 100644 index 00000000..a44b1226 --- /dev/null +++ b/src/version.h.in @@ -0,0 +1 @@ +#define VERSION "@VERSION@"