From 5dab0c4a5ab7e9956abd8ded3fd7f977831d00f0 Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 29 Apr 2003 05:51:37 +0000 Subject: [PATCH] Use autoreconf to bootstrap. --- COPYING | 8 +- INSTALL | 246 ++++++++++++++++++++++++++++++++++++++++-------------- README | 2 +- bootstrap | 7 -- configure.ac | 31 +++++++ configure.in | 31 ------- lisp/Makefile.am | 1 + 7 files changed, 219 insertions(+), 107 deletions(-) delete mode 100755 bootstrap create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/COPYING b/COPYING index a3f6b12..60549be 100644 --- a/COPYING +++ b/COPYING @@ -2,8 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -280,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -306,7 +305,8 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Also add information on how to contact you by electronic and paper mail. diff --git a/INSTALL b/INSTALL index 390d4f6..b42a17a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,64 +1,182 @@ --*- mode: text; left-margin: 2; fill-column: 70; -*- - - This program is in very early developing stage. Please use at your - own risk. - -* Requirements - - Liece works under following environment at least. - - - Emacs 20.7 - - XEmacs 21.1 or later - - This package uses following libraries. - - - APEL 10.2 or later (stands for - "A Portable Emacs Library") - ftp://ftp.m17n.org/pub/mule/apel/ - -* Quick installation - - (Install APEL, then) - % ./configure - % make - % su - Password: - # make install - - If you are not able to become super-user, you may specify local - directory to install. - - % ./configure --prefix=~/ --with-lispdir=~/elisp - -* Configuration and running - -** Setting up your ~/.emacs - - If you are using Emacs 20.7, prepare `subdirs.el' with following - contents, Emacs will find and append each substantial directory to - `load-path' automagically. - - ex: - (normal-top-level-add-subdirs-to-load-path) - - If you have never been using liece and/or its variants, - add an autoload setting into your `~/.emacs'. - - ex: - (autoload 'liece "liece" nil t) - - If you are using Emacs 20.7 and have never run Liece, run - `etc/gnu-emacs-user-config' to prepare initial settings. - -* Optional packages - - Following packages are optional. If install script of this package - found them, it would use various functionality provided by them. - - custom - http://www.dina.kvl.dk/~abraham/custom/ - - X-Face utility - ftp://ftp.jpl.org/pub/elisp/ - - bitmap-mule - ftp://ftp.jpl.org/pub/elisp/bitmap/ (for GNU Emacs only) +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, a file +`config.cache' that saves the results of its tests to speed up +reconfiguring, and a file `config.log' containing compiler output +(useful mainly for debugging `configure'). + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If at some point `config.cache' +contains results you don't want to keep, you may remove or edit it. + + The file `configure.in' is used to create `configure' by a program +called `autoconf'. You only need `configure.in' if you want to change +it or regenerate `configure' using a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. You can give `configure' +initial values for variables by setting them in the environment. Using +a Bourne-compatible shell, you can do that on the command line like +this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure + +Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile the package for one architecture at a time +in the source code directory. After you have installed the package for +one architecture, use `make distclean' before reconfiguring for another +architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' can not figure out +automatically, but needs to determine by the type of host the package +will run on. Usually `configure' can figure that out, but if it prints +a message saying it can not guess the host type, give it the +`--host=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name with three fields: + CPU-COMPANY-SYSTEM + +See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the host type. + + If you are building compiler tools for cross-compiling, you can also +use the `--target=TYPE' option to select the type of system they will +produce code for and the `--build=TYPE' option to select the type of +system on which you are compiling the package. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Operation Controls +================== + + `configure' recognizes the following options to control how it +operates. + +`--cache-file=FILE' + Use and save the results of the tests in FILE instead of + `./config.cache'. Set FILE to `/dev/null' to disable caching, for + debugging `configure'. + +`--help' + Print a summary of the options to `configure', and exit. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--version' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`configure' also accepts some other, not widely useful, options. diff --git a/README b/README index 1f7f406..1905229 100644 --- a/README +++ b/README @@ -48,4 +48,4 @@ (2) bootstrapping % cd liece - % ./bootstrap + % autoreconf -f -i diff --git a/bootstrap b/bootstrap deleted file mode 100755 index c67fa95..0000000 --- a/bootstrap +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -aclocal -automake --gnu --add-missing -autoconf - -exit 0 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..acae761 --- /dev/null +++ b/configure.ac @@ -0,0 +1,31 @@ +AC_INIT(configure.ac) +AC_PREREQ(2.50) +AM_INIT_AUTOMAKE(liece, 2.0.0) + +AC_PROG_CC +AC_ISC_POSIX +AC_PROG_INSTALL +AC_PROG_MAKE_SET +AC_PROG_RANLIB + +AC_CHECK_HEADERS(sys/select.h libgen.h) + +AC_CHECK_LIB(nsl, gethostbyname) +AC_CHECK_LIB(socket, socket) + +AC_CHECK_FUNCS(strtoul memmove getaddrinfo) +AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)]) +AC_REPLACE_FUNCS(basename) +AC_CHECK_EMACS +AC_PATH_LISPDIR +AC_PATH_ETCDIR +AC_PATH_PACKAGEDIR + +AC_OUTPUT(Makefile \ +lisp/Makefile \ +dcc/Makefile \ +dnl doc/Makefile \ +etc/Makefile \ +etc/icons/Makefile \ +etc/po/Makefile \ +etc/styles/Makefile) diff --git a/configure.in b/configure.in deleted file mode 100644 index ed3cfdd..0000000 --- a/configure.in +++ /dev/null @@ -1,31 +0,0 @@ -AC_INIT(configure.in) -AC_PREREQ(2.13) -AM_INIT_AUTOMAKE(liece, 2.0.0) - -AC_PROG_CC -AC_ISC_POSIX -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_RANLIB - -AC_CHECK_HEADERS(sys/select.h libgen.h) - -AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(socket, socket) - -AC_CHECK_FUNCS(strtoul memmove getaddrinfo) -AC_CHECK_FUNC(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") -AC_REPLACE_FUNCS(basename) -AC_CHECK_EMACS -AC_PATH_LISPDIR -AC_PATH_ETCDIR -AC_PATH_PACKAGEDIR - -AC_OUTPUT(Makefile \ -lisp/Makefile \ -dcc/Makefile \ -dnl doc/Makefile \ -etc/Makefile \ -etc/icons/Makefile \ -etc/po/Makefile \ -etc/styles/Makefile) diff --git a/lisp/Makefile.am b/lisp/Makefile.am index b4e9471..b83867b 100644 --- a/lisp/Makefile.am +++ b/lisp/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = $(wildcard *.el) Makefile.lisp liece.xpm liece.xbm DISTCLEANFILES = liece-setup.el +export EMACS XEMACS PACKAGEDIR all: elc -- 1.7.10.4