changeset 5:287a6905a63c

Moved config.h to src/ and switched version strings to use autotools version
author lost
date Sat, 04 Oct 2008 03:20:36 +0000
parents 34568fab6058
children e91b8529b920 05d4115b4860
files TODO configure.ac src/main.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/TODO	Sat Oct 04 03:14:20 2008 +0000
+++ b/TODO	Sat Oct 04 03:20:36 2008 +0000
@@ -1,3 +1,1 @@
-* Switch internal version string to use the value from autotools
-
 * add support for an object file format
--- a/configure.ac	Sat Oct 04 03:14:20 2008 +0000
+++ b/configure.ac	Sat Oct 04 03:20:36 2008 +0000
@@ -1,7 +1,7 @@
-AC_INIT([lwasm], [1.0], [lost@l-w.ca])
+AC_INIT([LWASM], [1.0], [lost@l-w.ca])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
--- a/src/main.c	Sat Oct 04 03:14:20 2008 +0000
+++ b/src/main.c	Sat Oct 04 03:20:36 2008 +0000
@@ -22,6 +22,8 @@
 
 */
 
+#include "config.h"
+
 #include <argp.h>
 #include <errno.h>
 #include <stdio.h>
@@ -37,8 +39,8 @@
 
 
 // command line option handling
-const char *argp_program_version = "LWASM Version 0.0";
-const char *argp_program_bug_address = "lost@l-w.ca";
+const char *argp_program_version = PACKAGE_STRING;
+const char *argp_program_bug_address = PACKAGE_BUGREPORT;
 
 static error_t parse_opts(int key, char *arg, struct argp_state *state)
 {