summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2009-05-24 11:50:42 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2009-05-24 11:50:42 (GMT)
commitc1340f4e4f50a735cfcd3e5ac187b130d84e7056 (patch) (unidiff)
treef8573f13ced2808250f675023676253c9c9866b1
parentfa77efbc3d680dd0ae4de3ae68cd42cad1340ba3 (diff)
downloadipacct-c1340f4e4f50a735cfcd3e5ac187b130d84e7056.tar.gz
ipacct-c1340f4e4f50a735cfcd3e5ac187b130d84e7056.tar.bz2
Update autoconf machineryHEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.cvsignore4
-rw-r--r--INSTALL182
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac6
-rwxr-xr-xylwrap170
5 files changed, 4 insertions, 361 deletions
diff --git a/.cvsignore b/.cvsignore
index a29694e..a07e86a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,14 +2,10 @@ Makefile.in
2Makefile 2Makefile
3aclocal.m4 3aclocal.m4
4config.guess 4config.guess
5missing
6config.h.in 5config.h.in
7mkinstalldirs
8config.sub 6config.sub
9stamp-h.in 7stamp-h.in
10configure 8configure
11install-sh
12depcomp
13config.log 9config.log
14config.h 10config.h
15stamp-h1 11stamp-h1
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17a..0000000
--- a/INSTALL
+++ b/dev/null
@@ -1,182 +0,0 @@
1Basic Installation
2==================
3
4 These are generic installation instructions.
5
6 The `configure' shell script attempts to guess correct values for
7various system-dependent variables used during compilation. It uses
8those values to create a `Makefile' in each directory of the package.
9It may also create one or more `.h' files containing system-dependent
10definitions. Finally, it creates a shell script `config.status' that
11you can run in the future to recreate the current configuration, a file
12`config.cache' that saves the results of its tests to speed up
13reconfiguring, and a file `config.log' containing compiler output
14(useful mainly for debugging `configure').
15
16 If you need to do unusual things to compile the package, please try
17to figure out how `configure' could check whether to do them, and mail
18diffs or instructions to the address given in the `README' so they can
19be considered for the next release. If at some point `config.cache'
20contains results you don't want to keep, you may remove or edit it.
21
22 The file `configure.in' is used to create `configure' by a program
23called `autoconf'. You only need `configure.in' if you want to change
24it or regenerate `configure' using a newer version of `autoconf'.
25
26The simplest way to compile this package is:
27
28 1. `cd' to the directory containing the package's source code and type
29 `./configure' to configure the package for your system. If you're
30 using `csh' on an old version of System V, you might need to type
31 `sh ./configure' instead to prevent `csh' from trying to execute
32 `configure' itself.
33
34 Running `configure' takes awhile. While running, it prints some
35 messages telling which features it is checking for.
36
37 2. Type `make' to compile the package.
38
39 3. Optionally, type `make check' to run any self-tests that come with
40 the package.
41
42 4. Type `make install' to install the programs and any data files and
43 documentation.
44
45 5. You can remove the program binaries and object files from the
46 source code directory by typing `make clean'. To also remove the
47 files that `configure' created (so you can compile the package for
48 a different kind of computer), type `make distclean'. There is
49 also a `make maintainer-clean' target, but that is intended mainly
50 for the package's developers. If you use it, you may have to get
51 all sorts of other programs in order to regenerate files that came
52 with the distribution.
53
54Compilers and Options
55=====================
56
57 Some systems require unusual options for compilation or linking that
58the `configure' script does not know about. You can give `configure'
59initial values for variables by setting them in the environment. Using
60a Bourne-compatible shell, you can do that on the command line like
61this:
62 CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
63
64Or on systems that have the `env' program, you can do it like this:
65 env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
66
67Compiling For Multiple Architectures
68====================================
69
70 You can compile the package for more than one kind of computer at the
71same time, by placing the object files for each architecture in their
72own directory. To do this, you must use a version of `make' that
73supports the `VPATH' variable, such as GNU `make'. `cd' to the
74directory where you want the object files and executables to go and run
75the `configure' script. `configure' automatically checks for the
76source code in the directory that `configure' is in and in `..'.
77
78 If you have to use a `make' that does not supports the `VPATH'
79variable, you have to compile the package for one architecture at a time
80in the source code directory. After you have installed the package for
81one architecture, use `make distclean' before reconfiguring for another
82architecture.
83
84Installation Names
85==================
86
87 By default, `make install' will install the package's files in
88`/usr/local/bin', `/usr/local/man', etc. You can specify an
89installation prefix other than `/usr/local' by giving `configure' the
90option `--prefix=PATH'.
91
92 You can specify separate installation prefixes for
93architecture-specific files and architecture-independent files. If you
94give `configure' the option `--exec-prefix=PATH', the package will use
95PATH as the prefix for installing programs and libraries.
96Documentation and other data files will still use the regular prefix.
97
98 In addition, if you use an unusual directory layout you can give
99options like `--bindir=PATH' to specify different values for particular
100kinds of files. Run `configure --help' for a list of the directories
101you can set and what kinds of files go in them.
102
103 If the package supports it, you can cause programs to be installed
104with an extra prefix or suffix on their names by giving `configure' the
105option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
106
107Optional Features
108=================
109
110 Some packages pay attention to `--enable-FEATURE' options to
111`configure', where FEATURE indicates an optional part of the package.
112They may also pay attention to `--with-PACKAGE' options, where PACKAGE
113is something like `gnu-as' or `x' (for the X Window System). The
114`README' should mention any `--enable-' and `--with-' options that the
115package recognizes.
116
117 For packages that use the X Window System, `configure' can usually
118find the X include and library files automatically, but if it doesn't,
119you can use the `configure' options `--x-includes=DIR' and
120`--x-libraries=DIR' to specify their locations.
121
122Specifying the System Type
123==========================
124
125 There may be some features `configure' can not figure out
126automatically, but needs to determine by the type of host the package
127will run on. Usually `configure' can figure that out, but if it prints
128a message saying it can not guess the host type, give it the
129`--host=TYPE' option. TYPE can either be a short name for the system
130type, such as `sun4', or a canonical name with three fields:
131 CPU-COMPANY-SYSTEM
132
133See the file `config.sub' for the possible values of each field. If
134`config.sub' isn't included in this package, then this package doesn't
135need to know the host type.
136
137 If you are building compiler tools for cross-compiling, you can also
138use the `--target=TYPE' option to select the type of system they will
139produce code for and the `--build=TYPE' option to select the type of
140system on which you are compiling the package.
141
142Sharing Defaults
143================
144
145 If you want to set default values for `configure' scripts to share,
146you can create a site shell script called `config.site' that gives
147default values for variables like `CC', `cache_file', and `prefix'.
148`configure' looks for `PREFIX/share/config.site' if it exists, then
149`PREFIX/etc/config.site' if it exists. Or, you can set the
150`CONFIG_SITE' environment variable to the location of the site script.
151A warning: not all `configure' scripts look for a site script.
152
153Operation Controls
154==================
155
156 `configure' recognizes the following options to control how it
157operates.
158
159`--cache-file=FILE'
160 Use and save the results of the tests in FILE instead of
161 `./config.cache'. Set FILE to `/dev/null' to disable caching, for
162 debugging `configure'.
163
164`--help'
165 Print a summary of the options to `configure', and exit.
166
167`--quiet'
168`--silent'
169`-q'
170 Do not print messages saying which checks are being made. To
171 suppress all normal output, redirect it to `/dev/null' (any error
172 messages will still be shown).
173
174`--srcdir=DIR'
175 Look for the package's source code in directory DIR. Usually
176 `configure' can determine that directory automatically.
177
178`--version'
179 Print the version of Autoconf used to generate the `configure'
180 script, and exit.
181
182`configure' also accepts some other, not widely useful, options.
diff --git a/Makefile.am b/Makefile.am
index f05da89..20f5f34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of IPACCT 1# This file is part of IPACCT
2# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2008 Sergey Poznyakoff 2# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2008,2009 Sergey Poznyakoff
3# 3#
4# Ipacct is free software; you can redistribute it and/or modify 4# Ipacct is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with Ipacct. If not, see <http://www.gnu.org/licenses/>. */ 15# along with Ipacct. If not, see <http://www.gnu.org/licenses/>. */
16 16
17AUTOMAKE_OPTIONS = 1.6 readme-alpha
18ACLOCAL_AMFLAGS = -I m4 17ACLOCAL_AMFLAGS = -I m4
19 18
20SUBDIRS=lib src m4 19SUBDIRS=lib src m4
diff --git a/configure.ac b/configure.ac
index 542c54e..c2d80af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,11 +15,11 @@
15# along with Ipacct. If not, see <http://www.gnu.org/licenses/>. */ 15# along with Ipacct. If not, see <http://www.gnu.org/licenses/>. */
16 16
17AC_PREREQ(2.53) 17AC_PREREQ(2.53)
18AC_INIT(ipacct, 1.0, bug-ipacct@gnu.org.ua) 18AC_INIT([ipacct], [1.0], [bug-ipacct@gnu.org.ua])
19AC_CONFIG_SRCDIR(src/ipacct.h) 19AC_CONFIG_SRCDIR(src/ipacct.h)
20AC_CANONICAL_SYSTEM 20AC_CONFIG_AUX_DIR([build-aux])
21AM_INIT_AUTOMAKE(no-exeext)
22AM_CONFIG_HEADER(config.h) 21AM_CONFIG_HEADER(config.h)
22AM_INIT_AUTOMAKE([1.10 readme-alpha])
23 23
24dnl Checks for programs. 24dnl Checks for programs.
25AC_PROG_CC 25AC_PROG_CC
diff --git a/ylwrap b/ylwrap
deleted file mode 100755
index d8f37e6..0000000
--- a/ylwrap
+++ b/dev/null
@@ -1,170 +0,0 @@
1#! /bin/sh
2# ylwrap - wrapper for lex/yacc invocations.
3# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
4# Written by Tom Tromey <tromey@cygnus.com>.
5#
6# This program is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation; either version 2, or (at your option)
9# any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program; if not, write to the Free Software
18# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19
20# Usage:
21# ylwrap PROGRAM [ARGS] INPUT [OUTPUT DESIRED]... -- [-yy repl] [ARGS]...
22# * PROGRAM is program to run; options can follow but must start with `-'.
23# * INPUT is the input file
24# * OUTPUT is file PROG generates
25# * DESIRED is file we actually want
26# * ARGS are passed to PROG
27# * Optional -yy introduces the sequence to replace yy prefixes with.
28# Any number of OUTPUT,DESIRED pairs may be used.
29
30# The program to run.
31prog="$1"
32shift
33# Make any relative path in $prog absolute.
34case "$prog" in
35 /* | [A-Za-z]:*) ;;
36 */*) prog="`pwd`/$prog" ;;
37esac
38
39# We also have to accept options here and append them to the program.
40# Why? Suppose YACC is set to `bison -y'. Clearly nobody uses
41# ylwrap, or this would have been discovered earlier!
42while :; do
43 case "$1" in
44 -*)
45 prog="$prog $1"
46 shift
47 ;;
48 *)
49 break
50 ;;
51 esac
52done
53
54# The input.
55input="$1"
56shift
57case "$input" in
58 /* | [A-Za-z]:*)
59 # Absolute path; do nothing.
60 ;;
61 *)
62 # Relative path. Make it absolute.
63 input="`pwd`/$input"
64 ;;
65esac
66
67# The directory holding the input.
68input_dir="`echo $input | sed -e 's,/[^/]*$,,'`"
69# Quote $INPUT_DIR so we can use it in a regexp.
70# FIXME: really we should care about more than `.'.
71input_rx="`echo $input_dir | sed -e 's,\.,\\\.,g'`"
72
73echo "got $input_rx"
74
75pairlist=
76while test "$#" -ne 0; do
77 if test "$1" = "--"; then
78 shift
79 break
80 fi
81 pairlist="$pairlist $1"
82 shift
83done
84
85if [ $# -ne 0 ]; then
86 if [ "x$1" = "x-yy" ]; then
87 shift
88 if [ $# -eq 0 ]; then
89 echo "ylwrap: -yy requires an argument"
90 exit 1
91 fi
92 YYREPL=$1
93 shift
94 fi
95fi
96
97# FIXME: add hostname here for parallel makes that run commands on
98# other machines. But that might take us over the 14-char limit.
99dirname=ylwrap$$
100trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
101mkdir $dirname || exit 1
102
103cd $dirname
104
105$prog ${1+"$@"} "$input"
106status=$?
107
108if test $status -eq 0; then
109 set X $pairlist
110 shift
111 first=yes
112 # Since DOS filename conventions don't allow two dots,
113 # the DOS version of Bison writes out y_tab.c instead of y.tab.c
114 # and y_tab.h instead of y.tab.h. Test to see if this is the case.
115 y_tab_nodot="no"
116 if test -f y_tab.c || test -f y_tab.h; then
117 y_tab_nodot="yes"
118 fi
119
120 while test "$#" -ne 0; do
121 from="$1"
122 # Handle y_tab.c and y_tab.h output by DOS
123 if test $y_tab_nodot = "yes"; then
124 if test $from = "y.tab.c"; then
125 from="y_tab.c"
126 else
127 if test $from = "y.tab.h"; then
128 from="y_tab.h"
129 fi
130 fi
131 fi
132 if test -f "$from"; then
133 # If $2 is an absolute path name, then just use that,
134 # otherwise prepend `../'.
135 case "$2" in
136 /* | [A-Za-z]:*) target="$2";;
137 *) target="../$2";;
138 esac
139
140 # Edit out `#line' or `#' directives. We don't want the
141 # resulting debug information to point at an absolute srcdir;
142 # it is better for it to just mention the .y file with no
143 # path.
144 EXPR="/^#/ s,$input_rx/,,"
145 if [ ! -z "$YYREPL" ]; then
146 EXPR="$EXPR;s/yy/$YYREPL/g"
147 fi
148 sed -e "$EXPR" "$from" > "$target" || status=$?
149 else
150 # A missing file is only an error for the first file. This
151 # is a blatant hack to let us support using "yacc -d". If -d
152 # is not specified, we don't want an error when the header
153 # file is "missing".
154 if test $first = yes; then
155 status=1
156 fi
157 fi
158 shift
159 shift
160 first=no
161 done
162else
163 status=$?
164fi
165
166# Remove the directory.
167cd ..
168rm -rf $dirname
169
170exit $status

Return to:

Send suggestions and report system problems to the System administrator.