Updated configure stuff

diff --git a/Makefile.am b/Makefile.am
index 62a564b6f933e54272fdc8e0c2701c81e11f5a38..ce9411151dcd46a7cff95c3e7d5cfc3ef1e2e9b5 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,16 @@
 bin_PROGRAMS = re2c
 re2c_SOURCES = code.cc dfa.cc main.cc parser.cc actions.cc scanner.re substr.cc\
        translate.cc scanner.cc
-man_MANS     = re2c.1
+include_HEADERS=basics.h dfa.h globals.h ins.h parser.h re.h scanner.h \
+       substr.h token.h version.h
+man_MANS    = re2c.1
 CXXFLAGS     = -O2 -Wall -I. -Wno-unused -Wno-parentheses -Wno-deprecated
 YFLAGS       = -d
-CLEANFILES   = y.tab.c y.tab.h parser.cc re2c.1 version.h .version makerpm
-EXTRA_DIST   = $(man_MANS) README
+RE2C         = re2c
+RE2CFLAGS    =
+CLEANFILES   = y.tab.c y.tab.h parser.cc re2c.1 version.h .version \
+DISTCLEANFILES = makerpm re2c*.spec README scanner.cc re2c
+EXTRA_DIST   = $(man_MANS) README parser.y scanner.re
 
 rpm-files:     $(bin_PROGRAMS) $(EXTRA_DIST)
 
@@ -20,7 +25,7 @@ parser.cc:    version.h parser.y
 scanner.cc: scanner.re
        -@if test -x re2c; then \
                echo "re2c -s $< >$@"; \
-               re2c -s $< >$@; \
+               ./re2c -s $< >$@; \
        else \
                echo "cp -f bootstrap/$@ $@"; \
                cp -f bootstrap/$@ $@; \
@@ -35,13 +40,3 @@ re2c.ps:
 version.h:
        echo "#define RE2C_VERSION \"$(PACKAGE_VERSION)\"" > version.h
 
-README:
-       cat README.in | sed 's/RE2C_VERSION/$(PACKAGE_VERSION)/g' > README
-
-makerpm:
-       cat makerpm.in | sed 's/RE2C_VERSION/$(PACKAGE_VERSION)/g' > makerpm
-       chmod +x makerpm
-
-re2c.1:
-       cat re2c.1.in | sed 's/RE2C_VERSION/$(PACKAGE_VERSION)/g' > re2c.1
-

diff --git a/README.in b/README.in
index c766db025ab6b46ba078c8b6088bf1b9ee680a35..20aea036cec5a21201ca8df5cc14670feaa2751a 100644 (file)
--- a/README.in
+++ b/README.in
@@ -1,4 +1,4 @@
-re2c Version RE2C_VERSION
+re2c Version @PACKAGE_VERSION@
 ------------------
 
 Originally written by Peter Bumbulis (peter@csg.uwaterloo.ca)

diff --git a/configure.in b/configure.in
index 21a3fb9c96b728c3e44bcab1f12f493c90425c38..086bab1fa4e4513c19a7cec1f0cb6e8473da5be3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([re2c], [0.9.2])
-AM_INIT_AUTOMAKE
+AC_INIT(re2c, 0.9.2)
+AM_INIT_AUTOMAKE(re2c, 0.9.2)
 AC_CONFIG_SRCDIR(actions.cc)
 AM_CONFIG_HEADER(config.h)
 
-RE2C_VERSION=0.9.2
 AC_SUBST(PACKAGE_VERSION)
+AC_SUBST(PACKAGE_NAME)
+AC_SUBST(PACKAGE_TARNAME)
 
 # Checks for programs.
 AC_PROG_YACC
@@ -41,14 +42,15 @@ AC_CHECK_TYPE([uchar], [
   AC_DEFINE([HAVE_UCHAR], [1],  [Define to 1 if you have uchar type definition])
 ])
 AC_CHECK_TYPE([ushort], [
-  AC_DEFINE([HAVE_USHORT], [1],  [Define to 1 if you have uchar type definition])
+  AC_DEFINE([HAVE_USHORT], [1],  [Define to 1 if you have ushort type definition])
 ])
 AC_CHECK_TYPE([uint], [
-  AC_DEFINE([HAVE_UINT], [1],  [Define to 1 if you have uchar type definition])
+  AC_DEFINE([HAVE_UINT], [1],  [Define to 1 if you have uint type definition])
 ])
 AC_CHECK_TYPE([ulong], [
-  AC_DEFINE([HAVE_ULONG], [1],  [Define to 1 if you have uchar type definition])
+  AC_DEFINE([HAVE_ULONG], [1],  [Define to 1 if you have ulong type definition])
 ])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile README makerpm re2c.1])
+AC_OUTPUT_COMMANDS([chmod +x makerpm])
 AC_OUTPUT

diff --git a/main.cc b/main.cc
index dc485d40fa06592c712b30d6d1ea8c4d266e3215..d6af6aae3f83fb3d0d46011ae6c09d0ce61a80a1 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -1,4 +1,8 @@
 /* $Id$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <fstream>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -73,6 +77,6 @@ usage:
     return 2;
 
 version:
-    cerr << "re2c " << RE2C_VERSION << "\n";
+    cerr << "re2c " << PACKAGE_VERSION << "\n";
     return 2;
 }

diff --git a/makerpm.in b/makerpm.in
index 93e0681d5cc3637067302644ffbc674f83df2d60..40ef3796f3e421be17c9bc0064bb6b2ec2b8aef6 100644 (file)
--- a/makerpm.in
+++ b/makerpm.in
@@ -3,8 +3,8 @@
 # $Id$
 # M.Boerger <re2c@somabo.de>
 
-PREFIX="re2c"
-VERSION=RE2C_VERSION
+PREFIX="@PACKAGE_NAME@"
+VERSION="@PACKAGE_VERSION@"
 TARDIR="`basename \`pwd\``"
 RELEASE=${1:-1}
 #VERSION=${2:-`echo $TARDIR | sed "s/$PREFIX-//g"`}

diff --git a/re2c.1.in b/re2c.1.in
index 8ae5e87fd4cdbe1420ac746d3e2a667904904e46..58058c0a701bce3b31f31d900ddf4fa3c610102e 100644 (file)
--- a/re2c.1.in
+++ b/re2c.1.in
@@ -1,12 +1,15 @@
 ./" 
 ./" $Id$
 ./"
-.TH RE2C 1 "8 April 1994" "Version RE2C_VERSION"
+.TH RE2C 1 "8 April 1994" "Version @PACKAGE_VERSION@"
 .ds re \fBre2c\fP
 .ds le \fBlex\fP
 .ds rx regular expression
 .ds lx \fIl\fP-expression
 \"$Log$
+\"Revision 1.2  2004/03/13 20:35:12  helly
+\"Updated configure stuff
+\"
 \"Revision 1.1  2004/01/31 15:44:39  nuffer
 \"Applied patch from Marcus Boerger
 \"