bug corrected : VERSION used to be set uncorrectly

diff --git a/config.h.in b/config.h.in
index c8e0b2438d6b9603aa9f2b9967b1f4d11135d36d..f7a2392f9a2a6675398fa979f992b5c43523e4e8 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: config.h.in,v 1.18 2000-09-13 15:39:08 thib Exp $ */
+ /* $Id: config.h.in,v 1.19 2000-09-15 20:18:13 thib Exp $ */
 
 
 /* *********************************************************** */
@@ -121,7 +121,7 @@
 /* ****************************************************************** */
 /* *** options which are set by configure script ******************** */
 
-#undef VERSION
+#undef VERSION_QUOTED
 
 /* *** paths *** */
 #undef ETC

diff --git a/configure.in b/configure.in
index e9ffaaf113e69cd4be7f725782cc64925ceea197..a0e5394684cd8ea9f9b50819cd8a9da3fdd9249a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,9 @@ AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.7)
 
 vers="0.9.2"
-AC_DEFINE_UNQUOTED(VERSION, $version)
+vers_quoted="\"$vers\""
+AC_DEFINE_UNQUOTED(VERSION, $vers)
+AC_DEFINE_UNQUOTED(VERSION_QUOTED, $vers_quoted)
 VERSION="$vers"
 AC_SUBST(VERSION)
 

diff --git a/fcron.c b/fcron.c
index 19d1007b732a1e6a42a3b1c5756b12b60b7b4841..9c07a81f73fed4eb0821e22fca714939e0d37652 100644 (file)
--- a/fcron.c
+++ b/fcron.c
@@ -21,11 +21,11 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: fcron.c,v 1.28 2000-09-13 15:45:14 thib Exp $ */
+ /* $Id: fcron.c,v 1.29 2000-09-15 20:17:07 thib Exp $ */
 
 #include "fcron.h"
 
-char rcs_info[] = "$Id: fcron.c,v 1.28 2000-09-13 15:45:14 thib Exp $";
+char rcs_info[] = "$Id: fcron.c,v 1.29 2000-09-15 20:17:07 thib Exp $";
 
 void main_loop(void);
 void check_signal(void);
@@ -90,7 +90,7 @@ info(void)
      * version, license */
 {
     fprintf(stderr,
-           "fcron " VERSION " - periodic command scheduler\n"
+           "fcron " VERSION_QUOTED " - periodic command scheduler\n"
            "Copyright 2000 Thibault Godouet <fcron@free.fr>\n"
            "This program is free software distributed WITHOUT ANY WARRANTY.\n"
             "See the GNU General Public License for more details.\n"
@@ -105,7 +105,7 @@ void
 usage()
   /*  print a help message about command line options and exit */
 {
-    fprintf(stderr, "\nfcron " VERSION "\n\n"
+    fprintf(stderr, "\nfcron " VERSION_QUOTED "\n\n"
            "fcron [-d] [-f] [-b]\n"
            "fcron -h\n"
            "  -d     --debug          Set Debug mode.\n"
@@ -388,7 +388,7 @@ main(int argc, char **argv)
            break;
        default:
            /* parent */
-           printf("\n%s[%d] " VERSION " : started.\n\n",
+           printf("\n%s[%d] " VERSION_QUOTED " : started.\n\n",
                   prog_name, pid);
 
            exit(0);
@@ -413,7 +413,7 @@ main(int argc, char **argv)
      * is running, otherwise update value of pid in lock file */
     get_lock();
     
-    explain("%s[%d] " VERSION " started", prog_name, daemon_pid);
+    explain("%s[%d] " VERSION_QUOTED " started", prog_name, daemon_pid);
 
     signal(SIGTERM, sigterm_handler);
     signal(SIGHUP, sighup_handler);

diff --git a/fcrontab.c b/fcrontab.c
index fb05713364b41e1bf2c39447b05c751d67072893..c2ac9e9eb795cadd9e134658b6e2e4a16fb56e86 100644 (file)
--- a/fcrontab.c
+++ b/fcrontab.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: fcrontab.c,v 1.15 2000-09-15 19:49:24 thib Exp $ */
+ /* $Id: fcrontab.c,v 1.16 2000-09-15 20:17:12 thib Exp $ */
 
 /* 
  * The goal of this program is simple : giving a user interface to fcron
@@ -42,7 +42,7 @@
 
 #include "fcrontab.h"
 
-char rcs_info[] = "$Id: fcrontab.c,v 1.15 2000-09-15 19:49:24 thib Exp $";
+char rcs_info[] = "$Id: fcrontab.c,v 1.16 2000-09-15 20:17:12 thib Exp $";
 
 void info(void);
 void usage(void);
@@ -87,7 +87,7 @@ info(void)
      * version, license */
 {
     fprintf(stderr,
-           "fcrontab " VERSION " - user interface to daemon fcron\n"
+           "fcrontab " VERSION_QUOTED " - user interface to daemon fcron\n"
            "Copyright 2000 Thibault Godouet <fcron@free.fr>\n"
            "This program is free software distributed WITHOUT ANY WARRANTY.\n"
             "See the GNU General Public License for more details.\n"