diff options
| author | James Clark <jjc@jclark.com> | 1999-09-08 09:55:58 -0500 |
|---|---|---|
| committer | James Clark <jjc@jclark.com> | 1999-09-08 09:55:58 -0500 |
| commit | 50f26cb05949bc62fa7115a63bad8e0184fd5bfd (patch) | |
| tree | 8f9771fd9815964eb6249bdd5aed09a6d22bd187 | |
| parent | 16782604a861d173a5bf8abbb8a8b298a2641550 (diff) | |
groff before CVS: release 1.11.11.11.1
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | config.cache | 48 | ||||
| -rw-r--r-- | config.log | 173 | ||||
| -rwxr-xr-x | configure | 1359 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~1~ | 73 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~2~ | 159 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~2~~ | 159 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~3~ | 162 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~3~~ | 162 | ||||
| -rw-r--r-- | devlj4/generate/Makefile.~4~ | 163 | ||||
| -rw-r--r-- | devlj4/generate/special.map.~1~ | 176 | ||||
| -rw-r--r-- | devlj4/generate/special.map.~2~ | 177 | ||||
| -rw-r--r-- | devlj4/generate/text.map.~1~ | 340 | ||||
| -rw-r--r-- | doc/Makefile | 14 | ||||
| -rw-r--r-- | doc/pic.ms | 2 | ||||
| -rw-r--r-- | mm/Makefile.sub | 2 | ||||
| -rw-r--r-- | mm/groff_mm.man | 2 | ||||
| -rw-r--r-- | mm/groff_mmse.man | 2 | ||||
| -rw-r--r-- | mm/mm/0.MT | 2 | ||||
| -rw-r--r-- | mm/mm/4.MT | 2 | ||||
| -rw-r--r-- | mm/mm/5.MT | 2 | ||||
| -rw-r--r-- | mm/mm/ms.cov | 2 | ||||
| -rw-r--r-- | mm/mm/se_ms.cov | 2 | ||||
| -rw-r--r-- | mm/tmac.m | 4 | ||||
| -rw-r--r-- | mm/tmac.mse | 2 | ||||
| -rw-r--r-- | tmac/Makefile.sub | 6 | ||||
| -rw-r--r-- | xditview/ChangeLog | 4 | ||||
| -rw-r--r-- | xditview/xtotroff.c | 2 |
30 files changed, 1293 insertions, 1930 deletions
@@ -1,3 +1,19 @@ +1999-08-31 Werner LEMBERG <wl@gnu.org> + + * VERSION: Updated to 1.11.1 + +1999-05-27 Werner LEMBERG <wl@gnu.org> + + * doc/Makefile: changed `.PS' postfix to `.ps' for consistency. + + * tmac/Makefile.sub (install_data, stamp-wrap, uninstall_sub): + added quotations around $(tmac_wrap) to avoid syntax error if + variable is empty. + + * configure: Newly generated using autoconf 2.13. + + * Makefile.in (LDFLAGS): Set variable to @LDFLAGS@. + Fri Aug 15 08:51:47 1997 Eric S. Raymond <esr@snark.thyrsus.com> * README, PROJECTS, NEWS, INSTALL, VERSION, diff --git a/Makefile.in b/Makefile.in index 58da8bc8f..6bb477e67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,7 +187,7 @@ CDEFINES=$(DEFINES) CCFLAGS=@CXXFLAGS@ CFLAGS=@CFLAGS@ -LDFLAGS= +LDFLAGS=@LDFLAGS@ YACC=@YACC@ YACCFLAGS=-v @@ -269,7 +269,7 @@ $(TARGETS): dot: FORCE @$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ -f $(srcdir)/Makefile.comm -f $(srcdir)/Makefile.sub $(do) - + $(LIBDIRS): FORCE @if test $(srcdir) = .; \ then srcdir=.; \ @@ -1 +1 @@ -1.11 +1.11.1 diff --git a/config.cache b/config.cache new file mode 100644 index 000000000..ff3d112b9 --- /dev/null +++ b/config.cache @@ -0,0 +1,48 @@ +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +ac_cv_decl_sys_siglist=${ac_cv_decl_sys_siglist=yes} +ac_cv_func_fmod=${ac_cv_func_fmod=yes} +ac_cv_func_getcwd=${ac_cv_func_getcwd=yes} +ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes} +ac_cv_func_mkstemp=${ac_cv_func_mkstemp=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} +ac_cv_func_putenv=${ac_cv_func_putenv=yes} +ac_cv_func_rename=${ac_cv_func_rename=yes} +ac_cv_func_strerror=${ac_cv_func_strerror=yes} +ac_cv_func_strtol=${ac_cv_func_strtol=yes} +ac_cv_header_dirent_h=${ac_cv_header_dirent_h=yes} +ac_cv_header_limits_h=${ac_cv_header_limits_h=yes} +ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h=yes} +ac_cv_header_sys_dir_h=${ac_cv_header_sys_dir_h=yes} +ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes} +ac_cv_path_GROPS=${ac_cv_path_GROPS=/usr/bin/grops} +ac_cv_path_PERLPATH=${ac_cv_path_PERLPATH=/bin/perl} +ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'} +ac_cv_prog_CC=${ac_cv_prog_CC=gcc} +ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'} +ac_cv_prog_CXX=${ac_cv_prog_CXX=c++} +ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'} +ac_cv_prog_LPR=${ac_cv_prog_LPR=lpr} +ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib} +ac_cv_prog_YACC=${ac_cv_prog_YACC='bison -y'} +ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no} +ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes} +ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes} +ac_cv_prog_cxx_cross=${ac_cv_prog_cxx_cross=no} +ac_cv_prog_cxx_g=${ac_cv_prog_cxx_g=yes} +ac_cv_prog_cxx_works=${ac_cv_prog_cxx_works=yes} +ac_cv_prog_gcc=${ac_cv_prog_gcc=yes} +ac_cv_prog_gxx=${ac_cv_prog_gxx=yes} +ac_cv_type_signal=${ac_cv_type_signal=void} diff --git a/config.log b/config.log new file mode 100644 index 000000000..633108cd0 --- /dev/null +++ b/config.log @@ -0,0 +1,173 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +configure:530: checking for grops +configure:570: checking for gcc +configure:683: checking whether the C compiler (gcc ) works +configure:699: gcc -o conftest conftest.c 1>&5 +configure:725: checking whether the C compiler (gcc ) is a cross-compiler +configure:730: checking whether we are using GNU C +configure:739: gcc -E conftest.c +configure:758: checking whether gcc accepts -g +configure:794: checking for c++ +configure:826: checking whether the C++ compiler (c++ ) works +configure:842: c++ -o conftest conftest.C 1>&5 +configure:868: checking whether the C++ compiler (c++ ) is a cross-compiler +configure:873: checking whether we are using GNU C++ +configure:882: c++ -E conftest.C +configure:901: checking whether c++ accepts -g +configure:945: checking that C++ compiler can compile simple program +configure:958: c++ -o conftest -g -O2 conftest.C 1>&5 +configure:973: checking that C++ static constructors and destructors are called +configure:998: c++ -o conftest -g -O2 conftest.C 1>&5 +configure:1012: checking that header files support C++ +configure:1021: c++ -o conftest -g -O2 conftest.C 1>&5 +configure:1047: checking for lpr +configure:1081: checking for lp +configure:1161: checking for command to use for printing PostScript files +configure:1165: checking for command to use for printing dvi files +configure:1180: checking for perl +configure:1218: checking for byacc +configure:1218: checking for bison +configure:1251: checking for ranlib +configure:1312: checking for a BSD compatible install +configure:1365: checking whether ln -s works +configure:1386: checking for csh hash hack +configure:1404: checking how to run the C preprocessor +configure:1425: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1487: checking for unistd.h +configure:1497: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1487: checking for dirent.h +configure:1497: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1487: checking for limits.h +configure:1497: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1487: checking for sys/dir.h +configure:1497: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1487: checking for stdlib.h +configure:1497: gcc -E conftest.c >/dev/null 2>conftest.out +configure:1524: checking for ISC 3.x or 4.x +configure:1536: checking whether -D_POSIX_SOURCE is necessary +configure:1554: c++ -c -g -O2 conftest.C 1>&5 +configure:1548: declaration of C function `void fileno(int)' conflicts with +/usr/include/stdio.h:203: previous declaration `int fileno(struct _IO_FILE *)' here +configure: failed program was: +#line 1546 "configure" +#include "confdefs.h" +#include <stdio.h> +extern "C" { void fileno(int); } +int main() { + +; return 0; } +configure:1583: checking declaration of getopt in stdlib.h +configure:1593: c++ -c -g -O2 conftest.C 1>&5 +configure:1607: checking declaration of getopt in unistd.h +configure:1618: c++ -c -g -O2 conftest.C 1>&5 +configure:1612: declaration of C function `void getopt(int)' conflicts with +/usr/include/unistd.h:530: previous declaration `int getopt(int, char *const *, const char *)' here +configure: failed program was: +#line 1609 "configure" +#include "confdefs.h" +#include <sys/types.h> +#include <unistd.h> +extern "C" { void getopt(int); } +int main() { + +; return 0; } +configure:1647: checking declaration of putenv +configure:1657: c++ -c -g -O2 conftest.C 1>&5 +configure:1651: declaration of C function `void putenv(int)' conflicts with +/usr/include/stdlib.h:270: previous declaration `int putenv(const char *)' here +configure: failed program was: +#line 1649 "configure" +#include "confdefs.h" +#include <stdlib.h> +extern "C" { void putenv(int); } +int main() { + +; return 0; } +configure:1687: checking declaration of popen +configure:1697: c++ -c -g -O2 conftest.C 1>&5 +configure:1691: declaration of C function `void popen(int)' conflicts with +/usr/include/stdio.h:204: previous declaration `struct _IO_FILE * popen(const char *, const char *)' here +configure: failed program was: +#line 1689 "configure" +#include "confdefs.h" +#include <stdio.h> +extern "C" { void popen(int); } +int main() { + +; return 0; } +configure:1726: checking declaration of pclose +configure:1736: c++ -c -g -O2 conftest.C 1>&5 +configure:1730: declaration of C function `void pclose(int)' conflicts with +/usr/include/stdio.h:205: previous declaration `int pclose(struct _IO_FILE *)' here +configure: failed program was: +#line 1728 "configure" +#include "confdefs.h" +#include <stdio.h> +extern "C" { void pclose(int); } +int main() { + +; return 0; } +configure:1765: checking C++ <osfcn.h> +configure:1774: c++ -c -g -O2 conftest.C 1>&5 +configure:1803: checking C++ <limits.h> +configure:1812: c++ -c -g -O2 conftest.C 1>&5 +configure:1841: checking for declaration of time_t +configure:1850: c++ -c -g -O2 conftest.C 1>&5 +configure:1871: checking return type of signal handlers +configure:1893: gcc -c -g -O2 conftest.c 1>&5 +configure:1912: checking struct exception +configure:1921: gcc -c -g -O2 conftest.c 1>&5 +configure: In function `main': +configure:1917: storage size of `e' isn't known +configure: failed program was: +#line 1914 "configure" +#include "confdefs.h" +#include <math.h> +int main() { +struct exception e; +; return 0; } +configure:1938: checking for unistd.h +configure:1977: checking for getpagesize +configure:2005: gcc -o conftest -g -O2 conftest.c 1>&5 +configure:2030: checking for working mmap +configure:2178: gcc -o conftest -g -O2 conftest.c 1>&5 +configure:2205: checking for fmod +configure:2233: gcc -o conftest -g -O2 conftest.c -lm 1>&5 +configure:2205: checking for strtol +configure:2233: gcc -o conftest -g -O2 conftest.c -lm 1>&5 +configure:2205: checking for getcwd +configure:2233: gcc -o conftest -g -O2 conftest.c -lm 1>&5 +configure:2205: checking for strerror +configure:2233: gcc -o conftest -g -O2 conftest.c -lm 1>&5 +configure:2205: checking for putenv +configure:2233: gcc -o conftest -g -O2 conftest.c -lm 1>&5 +configure:2263: checking for rename +configure:2291: gcc -o conftest -g -O2 conftest.c 1>&5 +configure:2263: checking for mkstemp +configure:2291: gcc -o conftest -g -O2 conftest.c 1>&5 +configure:2316: checking for sys_siglist declaration in signal.h or unistd.h +configure:2333: gcc -c -g -O2 conftest.c 1>&5 +configure: In function `main': +configure:2329: warning: initialization discards `const' from pointer target type +configure:2362: checking whether ANSI array delete syntax supported +configure:2371: c++ -c -g -O2 conftest.C 1>&5 +configure:2400: checking traditional preprocessor +configure:2409: c++ -c -g -O2 conftest.C 1>&5 +configure: In function `int main()': +configure:2405: parse error before `;' +configure: failed program was: +#line 2402 "configure" +#include "confdefs.h" +#define name2(a,b) a/**/b +int main() { +int name2(foo,bar); +; return 0; } +configure:2430: checking w_coredump +configure:2452: gcc -o conftest -g -O2 conftest.c 1>&5 +configure:2468: checking default value for grops -b option +configure:2473: checking default paper size +configure:2517: checking for existing troff installation +configure:2531: checking for prefix of system macro packages +configure:2555: checking which system macro packages should be made available @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.4 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -33,9 +33,25 @@ target=NONE verbose= x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option @@ -57,9 +73,14 @@ do case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -69,6 +90,12 @@ do | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. @@ -119,12 +146,29 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -136,8 +180,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -145,6 +191,44 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; @@ -157,6 +241,15 @@ EOF | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) @@ -197,6 +290,23 @@ EOF | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) @@ -207,6 +317,13 @@ EOF -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) srcdir="$ac_optarg" ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) @@ -216,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -262,7 +379,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -318,11 +435,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h @@ -382,9 +502,12 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -399,10 +522,11 @@ fi if test "x$prefix" = xNONE; then -echo $ac_n "checking for prefix by ""... $ac_c" 1>&6 +echo $ac_n "checking for prefix by $ac_c" 1>&6 # Extract the first word of "grops", so it can be a program name with args. set dummy grops; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GROPS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -410,9 +534,13 @@ else /*) ac_cv_path_GROPS="$GROPS" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GROPS="$GROPS" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GROPS="$ac_dir/$ac_word" @@ -438,14 +566,16 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:570: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -453,7 +583,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" fi fi CC="$ac_cv_prog_CC" @@ -463,8 +592,141 @@ else echo "$ac_t""no" 1>&6 fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:600: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:651: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:683: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 694 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:730: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -473,54 +735,71 @@ else yes; #endif EOF -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no fi fi + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + if test $ac_cv_prog_gcc = yes; then GCC=yes - if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:758: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes + ac_cv_prog_cc_g=yes else - ac_cv_prog_gcc_g=no + ac_cv_prog_cc_g=no fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi -for ac_prog in $CCC c++ g++ gcc CC cxx +for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:794: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CXX="$ac_prog" @@ -542,7 +821,55 @@ done test -n "$CXX" || CXX="gcc" +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:826: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext << EOF + +#line 837 "configure" +#include "confdefs.h" + +int main(){return(0);} +EOF +if { (eval echo configure:842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +if test $ac_cv_prog_cxx_works = no; then + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:868: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 +cross_compiling=$ac_cv_prog_cxx_cross + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +echo "configure:873: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -551,65 +878,56 @@ else yes; #endif EOF -if ${CXX-g++} -E conftest.C 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no fi fi + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + if test $ac_cv_prog_gxx = yes; then GXX=yes - if test "${CXXFLAGS+set}" != set; then - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then +else + GXX= +fi + +ac_test_CXXFLAGS="${CXXFLAGS+set}" +ac_save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS= +echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +echo "configure:901: checking whether ${CXX-g++} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.cc if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then - ac_cv_prog_gxx_g=yes + ac_cv_prog_cxx_g=yes else - ac_cv_prog_gxx_g=no + ac_cv_prog_cxx_g=no fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6 - if test $ac_cv_prog_gxx_g = yes; then - CXXFLAGS="-g -O" - else - CXXFLAGS="-O" - fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" fi else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi fi -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes -else -cat > conftest.$ac_ext <<EOF -#line 599 "configure" -#include "confdefs.h" -main(){return(0);} -EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_cross=no -else - ac_cv_c_cross=yes -fi -fi -rm -fr conftest* -fi -cross_compiling=$ac_cv_c_cross -echo "$ac_t""$ac_cv_c_cross" 1>&6 @@ -617,40 +935,47 @@ echo "$ac_t""$ac_cv_c_cross" 1>&6 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross if test "$cross_compiling" = no; then echo $ac_n "checking that C++ compiler can compile simple program""... $ac_c" 1>&6 +echo "configure:945: checking that C++ compiler can compile simple program" >&5 fi if test "$cross_compiling" = yes; then : else -cat > conftest.$ac_ext <<EOF -#line 631 "configure" + cat > conftest.$ac_ext <<EOF +#line 951 "configure" #include "confdefs.h" #ifdef __cplusplus extern "C" void exit(int); #endif int main() { return 0; } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "$ac_t""yes" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* echo "$ac_t""no" 1>&6 { echo "configure: error: a working C++ compiler is required" 1>&2; exit 1; } fi -fi rm -fr conftest* +fi + if test "$cross_compiling" = no; then echo $ac_n "checking that C++ static constructors and destructors are called""... $ac_c" 1>&6 +echo "configure:973: checking that C++ static constructors and destructors are called" >&5 fi if test "$cross_compiling" = yes; then : else -cat > conftest.$ac_ext <<EOF -#line 654 "configure" + cat > conftest.$ac_ext <<EOF +#line 979 "configure" #include "confdefs.h" #ifdef __cplusplus extern "C" void exit(int); @@ -669,40 +994,46 @@ A a; int main() { return 1; } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "$ac_t""yes" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* echo "$ac_t""no" 1>&6 { echo "configure: error: a working C++ compiler is required" 1>&2; exit 1; } fi -fi rm -fr conftest* +fi + echo $ac_n "checking that header files support C++""... $ac_c" 1>&6 +echo "configure:1012: checking that header files support C++" >&5 cat > conftest.$ac_ext <<EOF -#line 684 "configure" +#line 1014 "configure" #include "confdefs.h" #include <stdio.h> -int main() { return 0; } -int t() { +int main() { fopen(0, 0); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 { echo "configure: error: header files do not support C++ (if you are using a version of gcc/g++ earlier than 2.5, you should install libg++)" 1>&2; exit 1; } fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross if test -z "$PSPRINT" @@ -712,14 +1043,16 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1047: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LPR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LPR"; then ac_cv_prog_LPR="$LPR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_LPR="$ac_prog" @@ -744,14 +1077,16 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1081: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LP"; then ac_cv_prog_LP="$LP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_LP="$ac_prog" @@ -781,14 +1116,16 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1120: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LPQ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LPQ"; then ac_cv_prog_LPQ="$LPQ" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_LPQ="$ac_prog" @@ -820,9 +1157,11 @@ done fi echo $ac_n "checking for command to use for printing PostScript files""... $ac_c" 1>&6 +echo "configure:1161: checking for command to use for printing PostScript files" >&5 echo "$ac_t""$PSPRINT" 1>&6 # Figure out DVIPRINT from PSPRINT. echo $ac_n "checking for command to use for printing dvi files""... $ac_c" 1>&6 +echo "configure:1165: checking for command to use for printing dvi files" >&5 if test -n "$PSPRINT" && test -z "$DVIPRINT" then if test "X$PSPRINT" = "Xlpr" @@ -837,6 +1176,7 @@ echo "$ac_t""$DVIPRINT" 1>&6 # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1180: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERLPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -844,9 +1184,13 @@ else /*) ac_cv_path_PERLPATH="$PERLPATH" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_PERLPATH="$PERLPATH" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_PERLPATH="$ac_dir/$ac_word" @@ -870,14 +1214,16 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" @@ -901,14 +1247,16 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1251: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -955,27 +1303,30 @@ ac_install_sh="$ac_dir/install-sh -c" # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:1312: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -986,11 +1337,18 @@ else ;; esac done - IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + IFS="$ac_save_IFS" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -998,9 +1356,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:1365: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1021,6 +1382,7 @@ else fi echo $ac_n "checking for csh hash hack""... $ac_c" 1>&6 +echo "configure:1386: checking for csh hash hack" >&5 cat <<EOF >conftest.sh #!/bin/sh true || exit 0 @@ -1038,6 +1400,7 @@ rm -f conftest.sh echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:1404: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1052,37 +1415,62 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1056 "configure" +#line 1419 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1070 "configure" +#line 1436 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 1453 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP=/lib/cpp fi rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -1093,23 +1481,27 @@ echo "$ac_t""$CPP" 1>&6 for ac_hdr in unistd.h dirent.h limits.h sys/dir.h stdlib.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1487: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1103 "configure" +#line 1492 "configure" #include "confdefs.h" #include <$ac_hdr> EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1117,7 +1509,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF @@ -1128,6 +1520,7 @@ fi done echo $ac_n "checking for ISC 3.x or 4.x""... $ac_c" 1>&6 +echo "configure:1524: checking for ISC 3.x or 4.x" >&5 if grep '[34]\.' /usr/options/cb.name >/dev/null 2>&1 then echo "$ac_t""yes" 1>&6 @@ -1139,63 +1532,69 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking whether -D_POSIX_SOURCE is necessary""... $ac_c" 1>&6 +echo "configure:1536: checking whether -D_POSIX_SOURCE is necessary" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 1151 "configure" +#line 1546 "configure" #include "confdefs.h" #include <stdio.h> extern "C" { void fileno(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking declaration of getopt in stdlib.h""... $ac_c" 1>&6 +echo "configure:1583: checking declaration of getopt in stdlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1187 "configure" +#line 1585 "configure" #include "confdefs.h" #include <stdlib.h> extern "C" { void getopt(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define STDLIB_H_DECLARES_GETOPT 1 @@ -1203,23 +1602,24 @@ EOF fi rm -f conftest* - echo $ac_n "checking declaration of getopt in unistd.h""... $ac_c" 1>&6 +echo "configure:1607: checking declaration of getopt in unistd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1210 "configure" +#line 1609 "configure" #include "confdefs.h" #include <sys/types.h> #include <unistd.h> extern "C" { void getopt(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define UNISTD_H_DECLARES_GETOPT 1 @@ -1227,35 +1627,38 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking declaration of putenv""... $ac_c" 1>&6 +echo "configure:1647: checking declaration of putenv" >&5 cat > conftest.$ac_ext <<EOF -#line 1247 "configure" +#line 1649 "configure" #include "confdefs.h" #include <stdlib.h> extern "C" { void putenv(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1264,35 +1667,38 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking declaration of popen""... $ac_c" 1>&6 +echo "configure:1687: checking declaration of popen" >&5 cat > conftest.$ac_ext <<EOF -#line 1284 "configure" +#line 1689 "configure" #include "confdefs.h" #include <stdio.h> extern "C" { void popen(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define STDIO_H_DECLARES_POPEN 1 @@ -1300,35 +1706,38 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking declaration of pclose""... $ac_c" 1>&6 +echo "configure:1726: checking declaration of pclose" >&5 cat > conftest.$ac_ext <<EOF -#line 1320 "configure" +#line 1728 "configure" #include "confdefs.h" #include <stdio.h> extern "C" { void pclose(int); } -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define STDIO_H_DECLARES_PCLOSE 1 @@ -1336,104 +1745,113 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking C++ <osfcn.h>""... $ac_c" 1>&6 +echo "configure:1765: checking C++ <osfcn.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 1356 "configure" +#line 1767 "configure" #include "confdefs.h" #include <osfcn.h> -int main() { return 0; } -int t() { +int main() { read(0, 0, 0); open(0, 0); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_OSFCN_H 1 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking C++ <limits.h>""... $ac_c" 1>&6 +echo "configure:1803: checking C++ <limits.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 1391 "configure" +#line 1805 "configure" #include "confdefs.h" #include <limits.h> -int main() { return 0; } -int t() { +int main() { int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_LIMITS_H 1 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for declaration of time_t""... $ac_c" 1>&6 +echo "configure:1841: checking for declaration of time_t" >&5 cat > conftest.$ac_ext <<EOF -#line 1426 "configure" +#line 1843 "configure" #include "confdefs.h" #include <time.h> -int main() { return 0; } -int t() { +int main() { time_t t = time(0); struct tm *p = localtime(&t); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6;cat >> confdefs.h <<\EOF #define LONG_FOR_TIME_T 1 @@ -1441,19 +1859,20 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +echo "configure:1871: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1457 "configure" +#line 1876 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1461,24 +1880,27 @@ else #undef signal #endif #ifdef __cplusplus -extern "C" -#endif +extern "C" void (*signal (int, void (*)(int)))(int); +#else void (*signal ()) (); -int main() { return 0; } -int t() { +#endif + +int main() { int i; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_type_signal=int fi rm -f conftest* - fi + echo "$ac_t""$ac_cv_type_signal" 1>&6 cat >> confdefs.h <<EOF #define RETSIGTYPE $ac_cv_type_signal @@ -1486,121 +1908,288 @@ EOF echo $ac_n "checking struct exception""... $ac_c" 1>&6 +echo "configure:1912: checking struct exception" >&5 cat > conftest.$ac_ext <<EOF -#line 1491 "configure" +#line 1914 "configure" #include "confdefs.h" #include <math.h> -int main() { return 0; } -int t() { +int main() { struct exception e; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_STRUCT_EXCEPTION 1 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 fi rm -f conftest* +for ac_hdr in unistd.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1938: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1943 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_func in getpagesize +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1977: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1982 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then +echo "configure:2030: checking for working mmap" >&5 +if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then - ac_cv_func_mmap=no + ac_cv_func_mmap_fixed_mapped=no else -cat > conftest.$ac_ext <<EOF -#line 1519 "configure" + cat > conftest.$ac_ext <<EOF +#line 2038 "configure" #include "confdefs.h" -/* Thanks to Mike Haertel and Jim Avera for this test. */ +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the filesystem buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propogated back to all the places they're supposed to be. + + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ #include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> -#ifdef BSD -# ifndef BSD4_1 -# define HAVE_GETPAGESIZE +/* This mess was copied from the GNU getpagesize.h. */ +#ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include <unistd.h> # endif -#endif -#ifndef HAVE_GETPAGESIZE -# include <sys/param.h> -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif -# else -# ifdef NBPC -# define getpagesize() NBPC -# else -# define getpagesize() PAGESIZE /* SVR4 */ -# endif -# endif +/* Assume that all systems that can run configure have sys/param.h. */ +# ifndef HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 # endif -#endif -#ifdef __osf__ -# define valloc malloc -#endif +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ + +#endif /* no HAVE_GETPAGESIZE */ #ifdef __cplusplus -extern "C" { void *valloc(unsigned), *malloc(unsigned); } +extern "C" { void *malloc(unsigned); } #else -char *valloc(), *malloc(); +char *malloc(); #endif int main() { - char *buf1, *buf2, *buf3; - int i = getpagesize(), j; - int i2 = getpagesize()*2; - int fd; - - buf1 = (char *)valloc(i2); - buf2 = (char *)valloc(i); - buf3 = (char *)malloc(i2); - for (j = 0; j < i2; ++j) - *(buf1 + j) = rand(); - fd = open("conftestmmap", O_CREAT | O_RDWR, 0666); - write(fd, buf1, i2); - mmap(buf2, i, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, fd, 0); - for (j = 0; j < i; ++j) - if (*(buf1 + j) != *(buf2 + j)) - exit(1); - lseek(fd, (long)i, 0); - read(fd, buf2, i); /* read into mapped memory -- file should not change */ - /* (it does in i386 SVR4.0 - Jim Avera, jima@netcom.com) */ - lseek(fd, (long)0, 0); - read(fd, buf3, i2); - for (j = 0; j < i2; ++j) - if (*(buf1 + j) != *(buf3 + j)) - exit(1); - exit(0); + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize(); + + /* + * First, make a file with some known garbage in it. + */ + data = malloc(pagesize); + if (!data) + exit(1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand(); + umask(0); + fd = creat("conftestmmap", 0600); + if (fd < 0) + exit(1); + if (write(fd, data, pagesize) != pagesize) + exit(1); + close(fd); + + /* + * Next, try to mmap the file at a fixed address which + * already has something else allocated at it. If we can, + * also make sure that we see the same garbage. + */ + fd = open("conftestmmap", O_RDWR); + if (fd < 0) + exit(1); + data2 = malloc(2 * pagesize); + if (!data2) + exit(1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit(1); + + /* + * Finally, make sure that changes to the mapped area + * do not percolate back to the file as seen by read(). + * (This is a bug on some variants of i386 svr4.0.) + */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = malloc(pagesize); + if (!data3) + exit(1); + if (read(fd, data3, pagesize) != pagesize) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit(1); + close(fd); + unlink("conftestmmap"); + exit(0); } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_func_mmap=yes +if { (eval echo configure:2178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_func_mmap_fixed_mapped=yes else - ac_cv_func_mmap=no -fi + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_mmap_fixed_mapped=no fi rm -fr conftest* fi -echo "$ac_t""$ac_cv_func_mmap" 1>&6 -if test $ac_cv_func_mmap = yes; then + +fi + +echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 +if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >> confdefs.h <<\EOF #define HAVE_MMAP 1 EOF @@ -1612,20 +2201,22 @@ LIBS="$LIBS -lm" for ac_func in fmod strtol getcwd strerror putenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2205: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1620 "configure" +#line 2210 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); -int main() { return 0; } -int t() { +int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named @@ -1638,44 +2229,52 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + else echo "$ac_t""no" 1>&6 -LIBOBJS="$LIBOBJS ${ac_func}.o" +LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" fi - done + LIBS="$saved_libs" for ac_func in rename mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2263: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1670 "configure" +#line 2268 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); -int main() { return 0; } -int t() { +int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named @@ -1688,19 +2287,21 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF @@ -1711,11 +2312,12 @@ fi done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 +echo "configure:2316: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1719 "configure" +#line 2321 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1723,21 +2325,22 @@ else #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -int main() { return 0; } -int t() { +int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:2333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_decl_sys_siglist=no fi rm -f conftest* - fi + echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6 if test $ac_cv_decl_sys_siglist = yes; then cat >> confdefs.h <<\EOF @@ -1750,23 +2353,26 @@ fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether ANSI array delete syntax supported""... $ac_c" 1>&6 +echo "configure:2362: checking whether ANSI array delete syntax supported" >&5 cat > conftest.$ac_ext <<EOF -#line 1759 "configure" +#line 2364 "configure" #include "confdefs.h" -int main() { return 0; } -int t() { +int main() { char *p = new char[5]; delete [] p; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:2371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6;cat >> confdefs.h <<\EOF #define ARRAY_DELETE_NEEDS_SIZE 1 @@ -1774,54 +2380,58 @@ EOF fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking traditional preprocessor""... $ac_c" 1>&6 +echo "configure:2400: checking traditional preprocessor" >&5 cat > conftest.$ac_ext <<EOF -#line 1794 "configure" +#line 2402 "configure" #include "confdefs.h" #define name2(a,b) a/**/b -int main() { return 0; } -int t() { +int main() { int name2(foo,bar); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define TRADITIONAL_CPP 1 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 fi rm -f conftest* - ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking w_coredump""... $ac_c" 1>&6 +echo "configure:2430: checking w_coredump" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else -cat > conftest.$ac_ext <<EOF -#line 1825 "configure" + cat > conftest.$ac_ext <<EOF +#line 2435 "configure" #include "confdefs.h" #include <sys/types.h> @@ -1838,22 +2448,28 @@ main() } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define WCOREFLAG 0200 EOF else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* echo "$ac_t""no" 1>&6 fi -fi rm -fr conftest* +fi + echo $ac_n "checking default value for grops -b option""... $ac_c" 1>&6 +echo "configure:2468: checking default value for grops -b option" >&5 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7 echo "$ac_t""$BROKEN_SPOOLER_FLAGS" 1>&6 echo $ac_n "checking default paper size""... $ac_c" 1>&6 +echo "configure:2473: checking default paper size" >&5 if test -z "$PAGE" then descfile= @@ -1897,6 +2513,7 @@ test -n "$PAGE" || PAGE=letter echo "$ac_t""$PAGE" 1>&6 echo $ac_n "checking for existing troff installation""... $ac_c" 1>&6 +echo "configure:2517: checking for existing troff installation" >&5 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" \ = x0 then @@ -1910,6 +2527,7 @@ fi echo $ac_n "checking for prefix of system macro packages""... $ac_c" 1>&6 +echo "configure:2531: checking for prefix of system macro packages" >&5 sys_tmac_prefix= sys_tmac_file_prefix= for d in /usr/share/lib/tmac /usr/lib/tmac @@ -1933,6 +2551,7 @@ echo "$ac_t""$sys_tmac_prefix" 1>&6 tmac_wrap= echo $ac_n "checking which system macro packages should be made available""... $ac_c" 1>&6 +echo "configure:2555: checking which system macro packages should be made available" >&5 if test "x$sys_tmac_file_prefix" = "xtmac." then for f in $sys_tmac_prefix* @@ -1993,11 +2612,25 @@ cat > confcache <<\EOF # --recheck option to rerun configure. # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ - >> confcache + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : else @@ -2029,7 +2662,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -2064,7 +2697,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.4" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -2076,21 +2709,37 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <<EOF -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@GROPS@%$GROPS%g s%@CC@%$CC%g s%@CXX@%$CXX%g @@ -2103,6 +2752,7 @@ s%@PERLPATH@%$PERLPATH%g s%@YACC@%$YACC%g s%@RANLIB@%$RANLIB%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LN_S@%$LN_S%g s%@SH_SCRIPT_SED_CMD@%$SH_SCRIPT_SED_CMD%g @@ -2116,20 +2766,56 @@ s%@tmac_wrap@%$tmac_wrap%g CEOF EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + cat >> $CONFIG_STATUS <<EOF CONFIG_FILES=\${CONFIG_FILES-"Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac - # Adjust relative srcdir, etc. for subdirectories. + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` @@ -2157,6 +2843,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac + echo creating "$ac_file" rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." @@ -2165,16 +2852,22 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # $configure_input" ;; *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f conftest.subs +rm -f conftest.s* +EOF +cat >> $CONFIG_STATUS <<EOF +EOF +cat >> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/devlj4/generate/Makefile.~1~ b/devlj4/generate/Makefile.~1~ deleted file mode 100644 index 26ed7dba7..000000000 --- a/devlj4/generate/Makefile.~1~ +++ /dev/null @@ -1,73 +0,0 @@ -groff-src=/u/jjc/groff -groff-build=/u/jjc/groff-build -DEV=lj4 -#DEVDIR=$(groff-src)/dev$(DEV) -DEVDIR=./dev$(DEV) -AUTOFONT=/u/jjc/autofont -INCLUDES=-I$(groff-src)/include -XLIBS=$(groff-build)/libgroff/libgroff.a - -CXX=cygnus-gcc -CXXFLAGS=-g -Wall -LIBS=-lm -PROG=autodit -OBJS=autodit.o -IFLAG=-i 436 -SFLAG=-s -TEXTMAP=text.map -SPECIALMAP=special.map - -.SUFFIXES: .cc - -.cc.o: - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -all: $(PROG) - -$(PROG): $(OBJS) $(XLIBS) - $(CXX) $(CXXFLAGS) -o $(PROG) $(OBJS) $(XLIBS) -lm - -# TFM files are available as -# ftp-boi.external.hp.com:/pub/printers/laserjet/win.dos/tfmlj4p.exe -# This is a self-extracting MS-DOS archive. - -fonts: FORCE $(PROG) $(TEXTMAP) $(SPECIALMAP) - test -d $(DEVDIR) || mkdir $(DEVDIR) - ./$(PROG) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $(DEVDIR)/TR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $(DEVDIR)/TI - ./$(PROG) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $(DEVDIR)/TB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $(DEVDIR)/TBI - ./$(PROG) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $(DEVDIR)/CR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $(DEVDIR)/CI - ./$(PROG) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $(DEVDIR)/CB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $(DEVDIR)/CBI - ./$(PROG) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $(DEVDIR)/GR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $(DEVDIR)/GI - ./$(PROG) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $(DEVDIR)/GB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $(DEVDIR)/GBI - ./$(PROG) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $(DEVDIR)/OR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $(DEVDIR)/OI - ./$(PROG) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $(DEVDIR)/OB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $(DEVDIR)/OBI - ./$(PROG) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $(DEVDIR)/UR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $(DEVDIR)/UI - ./$(PROG) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $(DEVDIR)/UB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $(DEVDIR)/UBI - ./$(PROG) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $(DEVDIR)/UCR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $(DEVDIR)/UCI - ./$(PROG) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $(DEVDIR)/UCB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $(DEVDIR)/UCBI - ./$(PROG) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $(DEVDIR)/ALBR - ./$(PROG) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $(DEVDIR)/ALBB - ./$(PROG) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $(DEVDIR)/LGR - ./$(PROG) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $(DEVDIR)/LGB - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $(DEVDIR)/LGI - ./$(PROG) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $(DEVDIR)/AOR - ./$(PROG) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $(DEVDIR)/AOI - ./$(PROG) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $(DEVDIR)/AOB - ./$(PROG) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $(DEVDIR)/MARIGOLD - ./$(PROG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $(DEVDIR)/CORONET - ./$(PROG) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $(DEVDIR)/CLARENDON - ./$(PROG) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $(DEVDIR)/S - -FORCE: diff --git a/devlj4/generate/Makefile.~2~ b/devlj4/generate/Makefile.~2~ deleted file mode 100644 index 752215886..000000000 --- a/devlj4/generate/Makefile.~2~ +++ /dev/null @@ -1,159 +0,0 @@ -#Copyright (C) 1994 Free Software Foundation, Inc. -# Written by James Clark (jjc@jclark.com) -# -#This file is part of groff. -# -#groff is free software; you can redistribute it and/or modify it under -#the terms of the GNU General Public License as published by the Free -#Software Foundation; either version 2, or (at your option) any later -#version. -# -#groff is distributed in the hope that it will be useful, but WITHOUT ANY -#WARRANTY; without even the implied warranty of MERCHANTABILITY or -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -#for more details. -# -#You should have received a copy of the GNU General Public License along -#with groff; see the file COPYING. If not, write to the Free Software -#Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Directory containing Autofont TFM files. -HPFTODIT=hpftodit -AUTOFONT=/u/jjc/autofont -IFLAG=-i 436 -SFLAG=-s -srcdir=. -TEXTMAP=$(srcdir)/text.map -SPECIALMAP=$(srcdir)/special.map - -FONTS=\ - ALBB ALBR \ - AOB AOI AOR \ - CB CBI CI CR \ - GB GBI GI GR \ - LGB LGI LGR \ - OB OBI OI OR \ - TB TBI TI TR \ - UB UBI UI UR \ - UCB UCBI UCI UCR \ - CLARENDON CORONET MARIGOLD S - -all: $(FONTS) - -TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ - -TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ - -TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ - -TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ - -CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ - -CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ - -CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ - -CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ - -GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ - -GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ - -GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ - -GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ - -OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ - -OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ - -OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ - -OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ - -UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ - -UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ - -UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ - -UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ - -UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ - -UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ - -UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ - -UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ - -ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ - -ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ - -LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ - -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - -LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ - -AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ - -AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ - -MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ - -CORONET: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ - -S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ - -clean: - -realclean: - -rm -f $(FONTS) - -extraclean: realclean - -rm -f core *~ \#* - -.PHONY: clean realclean extraclean all diff --git a/devlj4/generate/Makefile.~2~~ b/devlj4/generate/Makefile.~2~~ deleted file mode 100644 index 88bc47f5c..000000000 --- a/devlj4/generate/Makefile.~2~~ +++ /dev/null @@ -1,159 +0,0 @@ -#Copyright (C) 1994 Free Software Foundation, Inc. -# Written by James Clark (jjc@jclark.com) -# -#This file is part of groff. -# -#groff is free software; you can redistribute it and/or modify it under -#the terms of the GNU General Public License as published by the Free -#Software Foundation; either version 2, or (at your option) any later -#version. -# -#groff is distributed in the hope that it will be useful, but WITHOUT ANY -#WARRANTY; without even the implied warranty of MERCHANTABILITY or -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -#for more details. -# -#You should have received a copy of the GNU General Public License along -#with groff; see the file COPYING. If not, write to the Free Software -#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -# Directory containing Autofont TFM files. -HPFTODIT=hpftodit -AUTOFONT=/u/jjc/autofont -IFLAG=-i 436 -SFLAG=-s -srcdir=. -TEXTMAP=$(srcdir)/text.map -SPECIALMAP=$(srcdir)/special.map - -FONTS=\ - ALBB ALBR \ - AOB AOI AOR \ - CB CBI CI CR \ - GB GBI GI GR \ - LGB LGI LGR \ - OB OBI OI OR \ - TB TBI TI TR \ - UB UBI UI UR \ - UCB UCBI UCI UCR \ - CLARENDON CORONET MARIGOLD S - -all: $(FONTS) - -TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ - -TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ - -TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ - -TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ - -CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ - -CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ - -CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ - -CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ - -GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ - -GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ - -GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ - -GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ - -OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ - -OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ - -OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ - -OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ - -UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ - -UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ - -UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ - -UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ - -UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ - -UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ - -UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ - -UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ - -ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ - -ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ - -LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ - -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - -LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ - -AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ - -AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ - -MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ - -CORONET: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ - -S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ - -clean: - -realclean: - -rm -f $(FONTS) - -extraclean: realclean - -rm -f core *~ \#* - -.PHONY: clean realclean extraclean all diff --git a/devlj4/generate/Makefile.~3~ b/devlj4/generate/Makefile.~3~ deleted file mode 100644 index 99d704022..000000000 --- a/devlj4/generate/Makefile.~3~ +++ /dev/null @@ -1,162 +0,0 @@ -#Copyright (C) 1994 Free Software Foundation, Inc. -# Written by James Clark (jjc@jclark.com) -# -#This file is part of groff. -# -#groff is free software; you can redistribute it and/or modify it under -#the terms of the GNU General Public License as published by the Free -#Software Foundation; either version 2, or (at your option) any later -#version. -# -#groff is distributed in the hope that it will be useful, but WITHOUT ANY -#WARRANTY; without even the implied warranty of MERCHANTABILITY or -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -#for more details. -# -#You should have received a copy of the GNU General Public License along -#with groff; see the file COPYING. If not, write to the Free Software -#Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Directory containing Autofont TFM files. -# The TFM files I used are available for ftp as -# ftp-boi.external.hp.com:/pub/printers/laserjet/win.dos/tfmlj4p.exe -# This is a self-extracting MS-DOS archive. -AUTOFONT=/u/jjc/autofont -HPFTODIT=hpftodit -IFLAG=-i 436 -SFLAG=-s -srcdir=. -TEXTMAP=$(srcdir)/text.map -SPECIALMAP=$(srcdir)/special.map - -FONTS=\ - ALBB ALBR \ - AOB AOI AOR \ - CB CBI CI CR \ - GB GBI GI GR \ - LGB LGI LGR \ - OB OBI OI OR \ - TB TBI TI TR \ - UB UBI UI UR \ - UCB UCBI UCI UCR \ - CLARENDON CORONET MARIGOLD S - -all: $(FONTS) - -TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ - -TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ - -TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ - -TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ - -CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ - -CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ - -CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ - -CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ - -GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ - -GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ - -GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ - -GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ - -OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ - -OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ - -OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ - -OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ - -UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ - -UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ - -UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ - -UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ - -UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ - -UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ - -UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ - -UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ - -ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ - -ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ - -LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ - -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - -LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ - -AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ - -AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ - -MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ - -CORONET: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ - -S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ - -clean: - -realclean: - -rm -f $(FONTS) - -extraclean: realclean - -rm -f core *~ \#* - -.PHONY: clean realclean extraclean all diff --git a/devlj4/generate/Makefile.~3~~ b/devlj4/generate/Makefile.~3~~ deleted file mode 100644 index 1b9b750a3..000000000 --- a/devlj4/generate/Makefile.~3~~ +++ /dev/null @@ -1,162 +0,0 @@ -#Copyright (C) 1994 Free Software Foundation, Inc. -# Written by James Clark (jjc@jclark.com) -# -#This file is part of groff. -# -#groff is free software; you can redistribute it and/or modify it under -#the terms of the GNU General Public License as published by the Free -#Software Foundation; either version 2, or (at your option) any later -#version. -# -#groff is distributed in the hope that it will be useful, but WITHOUT ANY -#WARRANTY; without even the implied warranty of MERCHANTABILITY or -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -#for more details. -# -#You should have received a copy of the GNU General Public License along -#with groff; see the file COPYING. If not, write to the Free Software -#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -# Directory containing Autofont TFM files. -# The TFM files I used are available for ftp as -# ftp-boi.external.hp.com:/pub/printers/laserjet/win.dos/tfmlj4p.exe -# This is a self-extracting MS-DOS archive. -AUTOFONT=/u/jjc/autofont -HPFTODIT=hpftodit -IFLAG=-i 436 -SFLAG=-s -srcdir=. -TEXTMAP=$(srcdir)/text.map -SPECIALMAP=$(srcdir)/special.map - -FONTS=\ - ALBB ALBR \ - AOB AOI AOR \ - CB CBI CI CR \ - GB GBI GI GR \ - LGB LGI LGR \ - OB OBI OI OR \ - TB TBI TI TR \ - UB UBI UI UR \ - UCB UCBI UCI UCR \ - CLARENDON CORONET MARIGOLD S - -all: $(FONTS) - -TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ - -TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ - -TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ - -TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ - -CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ - -CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ - -CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ - -CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ - -GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ - -GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ - -GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ - -GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ - -OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ - -OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ - -OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ - -OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ - -UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ - -UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ - -UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ - -UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ - -UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ - -UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ - -UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ - -UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ - -ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ - -ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ - -LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ - -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - -LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ - -AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ - -AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ - -MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ - -CORONET: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ - -S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ - -clean: - -realclean: - -rm -f $(FONTS) - -extraclean: realclean - -rm -f core *~ \#* - -.PHONY: clean realclean extraclean all diff --git a/devlj4/generate/Makefile.~4~ b/devlj4/generate/Makefile.~4~ deleted file mode 100644 index 723a66957..000000000 --- a/devlj4/generate/Makefile.~4~ +++ /dev/null @@ -1,163 +0,0 @@ -#Copyright (C) 1994 Free Software Foundation, Inc. -# Written by James Clark (jjc@jclark.com) -# -#This file is part of groff. -# -#groff is free software; you can redistribute it and/or modify it under -#the terms of the GNU General Public License as published by the Free -#Software Foundation; either version 2, or (at your option) any later -#version. -# -#groff is distributed in the hope that it will be useful, but WITHOUT ANY -#WARRANTY; without even the implied warranty of MERCHANTABILITY or -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -#for more details. -# -#You should have received a copy of the GNU General Public License along -#with groff; see the file COPYING. If not, write to the Free Software -#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -# Directory containing Autofont TFM files. -# The TFM files I used are available for ftp as -# ftp-boi.external.hp.com:/pub/printers/laserjet/win.dos/tfmlj4p.exe -# This is a self-extracting MS-DOS archive. -AUTOFONT=/u/jjc/autofont -HPFTODIT=hpftodit -# .05 em -IFLAG=-i 439 -SFLAG=-s -srcdir=. -TEXTMAP=$(srcdir)/text.map -SPECIALMAP=$(srcdir)/special.map - -FONTS=\ - ALBB ALBR \ - AOB AOI AOR \ - CB CBI CI CR \ - GB GBI GI GR \ - LGB LGI LGR \ - OB OBI OI OR \ - TB TBI TI TR \ - UB UBI UI UR \ - UCB UCBI UCI UCR \ - CLARENDON CORONET MARIGOLD S - -all: $(FONTS) - -TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ - -TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ - -TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ - -TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ - -CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ - -CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ - -CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ - -CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ - -GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ - -GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ - -GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ - -GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ - -OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ - -OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ - -OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ - -OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ - -UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ - -UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ - -UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ - -UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ - -UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ - -UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ - -UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ - -UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ - -ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ - -ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ - -LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ - -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - -LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ - -AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) - $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ - -AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ - -MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ - -CORONET: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ - -CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ - -S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ - -clean: - -realclean: - -rm -f $(FONTS) - -extraclean: realclean - -rm -f core *~ \#* - -.PHONY: clean realclean extraclean all diff --git a/devlj4/generate/special.map.~1~ b/devlj4/generate/special.map.~1~ deleted file mode 100644 index 980e90378..000000000 --- a/devlj4/generate/special.map.~1~ +++ /dev/null @@ -1,176 +0,0 @@ -12 pl -30 eq -34 *A -35 *B -38 *E -41 *Y -42 *I -44 *K -46 *M -47 *N -48 *O -49 *R -53 *T -57 *X -59 *Z -94 or -96 ap -183 mi -191 +- -194 no -201 mu -202 di -206 DI -207 CL -205 HE -208 SP -220 va -224 ua -225 da -226 -> -227 <- -229 <> -292 if -295 ca -296 == -297 >= -298 <= -301 ~~ -302 md -500 sr -501 pt -503 +e -504 3d -504 tf -505 *G -506 *D -507 *H -508 *L -509 *C -510 *P -511 *S -512 *U -513 *F -514 *Q -515 *W -516 gr -517 pd -518 ts -519 != -522 *a -523 *b -524 *g -525 *d -526 *e -527 *z -528 *y -529 *h -530 *i -531 *k -532 *l -533 *m -534 *n -535 *c -536 *o -537 *p -538 *r -539 *s -540 *t -541 *u -542 *f -543 *x -544 *q -545 *w -546 +h -547 +f -548 +p -549 ~= -550 ne -551 arrowverttp -551 uA -552 rA -552 rh -553 arrowvertbt -553 dA -554 lA -554 lh -555 vA -556 hA -560 radicalex -561 fa -562 te -564 pp -565 cu -566 mo -568 nm -569 sb -570 sp -572 nc -573 ib -574 ip -575 c+ -577 c* -580 AN -581 OR -584 ci -587 is -589 /_ -590 es -591 Ah -595 Im -596 Re -598 bracketlefttp -598 lc -599 bracketleftbt -599 lf -600 bracelefttp -600 parenlefttp -600 lt -601 braceleftmid -601 lk -602 braceleftbt -602 parenleftbt -602 lb -605 arrowvertex -608 bracketrighttp -608 rc -609 bracketrightbt -609 rf -610 bracerighttp -610 parenrighttp -610 rt -611 bracerightmid -611 rk -612 bracerightbt -612 parenrightbt -612 rb -613 braceleftex -613 bracerightex -613 bv -614 barex -614 bracketleftex -614 bracketrightex -614 parenleftex -614 parenrightex -620 -+ -621 la -622 ra -624 =~ -633 << -634 >> -638 -h -641 wp -654 lz -663 st -664 ** -665 an -680 AN -1099 CR - -#637 digamma -#655 parenrighttp -#656 parenrightbt -#642 sum -#644 bardblex -#646 parenlefttp -#647 parenleftbt diff --git a/devlj4/generate/special.map.~2~ b/devlj4/generate/special.map.~2~ deleted file mode 100644 index 74c8d8847..000000000 --- a/devlj4/generate/special.map.~2~ +++ /dev/null @@ -1,177 +0,0 @@ -# Map MSL numbers to troff names for a special font. -12 pl -30 eq -34 *A -35 *B -38 *E -41 *Y -42 *I -44 *K -46 *M -47 *N -48 *O -49 *R -53 *T -57 *X -59 *Z -94 or -96 ap -183 mi -191 +- -194 no -201 mu -202 di -206 DI -207 CL -205 HE -208 SP -220 va -224 ua -225 da -226 -> -227 <- -229 <> -292 if -295 ca -296 == -297 >= -298 <= -301 ~~ -302 md -500 sr -501 pt -503 +e -504 3d -504 tf -505 *G -506 *D -507 *H -508 *L -509 *C -510 *P -511 *S -512 *U -513 *F -514 *Q -515 *W -516 gr -517 pd -518 ts -519 != -522 *a -523 *b -524 *g -525 *d -526 *e -527 *z -528 *y -529 *h -530 *i -531 *k -532 *l -533 *m -534 *n -535 *c -536 *o -537 *p -538 *r -539 *s -540 *t -541 *u -542 *f -543 *x -544 *q -545 *w -546 +h -547 +f -548 +p -549 ~= -550 ne -551 arrowverttp -551 uA -552 rA -552 rh -553 arrowvertbt -553 dA -554 lA -554 lh -555 vA -556 hA -560 radicalex -561 fa -562 te -564 pp -565 cu -566 mo -568 nm -569 sb -570 sp -572 nc -573 ib -574 ip -575 c+ -577 c* -580 AN -581 OR -584 ci -587 is -589 /_ -590 es -591 Ah -595 Im -596 Re -598 bracketlefttp -598 lc -599 bracketleftbt -599 lf -600 bracelefttp -600 parenlefttp -600 lt -601 braceleftmid -601 lk -602 braceleftbt -602 parenleftbt -602 lb -605 arrowvertex -608 bracketrighttp -608 rc -609 bracketrightbt -609 rf -610 bracerighttp -610 parenrighttp -610 rt -611 bracerightmid -611 rk -612 bracerightbt -612 parenrightbt -612 rb -613 braceleftex -613 bracerightex -613 bv -614 barex -614 bracketleftex -614 bracketrightex -614 parenleftex -614 parenrightex -620 -+ -621 la -622 ra -624 =~ -633 << -634 >> -638 -h -641 wp -654 lz -663 st -664 ** -665 an -680 AN -1099 CR - -#637 digamma -#655 parenrighttp -#656 parenrightbt -#642 sum -#644 bardblex -#646 parenlefttp -#647 parenleftbt diff --git a/devlj4/generate/text.map.~1~ b/devlj4/generate/text.map.~1~ deleted file mode 100644 index 600745675..000000000 --- a/devlj4/generate/text.map.~1~ +++ /dev/null @@ -1,340 +0,0 @@ -1 ! -2 " -3 # -3 sh -4 $ -4 Do -5 % -6 & -8 ' -9 ( -10 ) -11 * -12 + -13 , -14 - -14 hy -14 char173 -15 . -16 / -16 sl -17 0 -18 1 -19 2 -20 3 -21 4 -22 5 -23 6 -24 7 -25 8 -26 9 -27 : -28 ; -29 < -30 = -31 > -32 ? -33 @ -33 at -34 A -35 B -36 C -37 D -38 E -39 F -40 G -41 H -42 I -43 J -44 K -45 L -46 M -47 N -48 O -49 P -50 Q -51 R -52 S -53 T -54 U -55 V -56 W -57 X -58 Y -59 Z -60 [ -60 lB -61 \ -61 rs -62 ] -62 rB -63 ha -64 _ -66 ` -66 oq -67 a -68 b -69 c -70 d -71 e -72 f -73 g -74 h -75 i -76 j -77 k -78 l -79 m -80 n -81 o -82 p -83 q -84 r -85 s -86 t -87 u -88 v -89 w -90 x -91 y -92 z -93 { -93 lC -94 | -94 ba -95 } -95 rC -96 ti -99 `A -99 char192 -100 ^A -100 char194 -101 `E -101 char200 -102 ^E -102 char202 -103 :E -103 char203 -104 ^I -104 char206 -105 :I -105 char207 -106 aa -106 char180 -107 ga -108 ^ -108 a^ -109 ad -109 char168 -110 ~ -110 a~ -111 `U -111 char217 -112 ^U -112 char219 -114 'Y -114 char221 -115 'y -115 char253 -116 de -116 char176 -117 ,C -117 char199 -118 ,c -118 char231 -119 ~N -119 char209 -120 ~n -120 char241 -121 r! -121 char161 -122 r? -122 char191 -123 Cs -123 char164 -124 Po -124 char163 -125 Ye -125 char165 -126 sc -126 char167 -127 Fn -128 ct -128 char162 -129 ^a -129 char226 -130 ^e -130 char234 -131 ^o -131 char244 -132 ^u -132 char251 -133 'a -133 char225 -134 'e -134 char233 -135 'o -135 char243 -136 'u -136 char250 -137 `a -137 char224 -138 `e -138 char232 -139 `o -139 char242 -140 `u -140 char249 -141 :a -141 char228 -142 :e -142 char235 -143 :o -143 char246 -144 :u -144 char252 -145 oA -145 char197 -146 ^i -146 char238 -147 /O -147 char216 -148 AE -148 char198 -149 oa -149 char229 -150 'i -150 char237 -151 /o -151 char248 -152 ae -152 char230 -153 :A -153 char196 -154 `i -154 char236 -155 :O -155 char214 -156 :U -156 char220 -157 'E -157 char201 -158 :i -158 char239 -159 ss -159 char223 -160 ^O -160 char212 -161 'A -161 char193 -162 ~A -162 char195 -163 ~a -163 char227 -164 -D -164 char208 -165 Sd -165 char240 -166 'I -166 char205 -167 `I -167 char204 -168 'O -168 char211 -169 `O -169 char210 -170 ~O -170 char213 -171 ~o -171 char245 -172 vS -173 vs -174 'U -174 char218 -175 :Y -176 :y -176 char255 -177 TP -177 char222 -178 Tp -178 char254 -180 char181 -181 ps -181 char182 -182 34 -182 char190 -183 \- -184 14 -184 char188 -185 12 -185 char189 -186 Of -186 char170 -187 Om -187 char186 -188 Fo -188 char171 -190 Fc -190 char187 -191 char177 -192 bb -192 char166 -193 co -193 char169 -194 no -194 char172 -196 rg -196 char174 -197 S2 -197 char178 -198 S3 -198 char179 -199 ac -199 char184 -200 S1 -200 char185 -201 char215 -202 char247 -302 char183 -310 fm -311 sd -312 dg -313 tm -315 ah -316 ao -324 f/ -325 em -326 en -327 dd -328 .i -329 aq -331 bu -406 'C -407 'c -1017 lq -1018 rq -1019 Bq -1031 vz -1040 fi -1041 fl -1042 ff -1043 Fi -1044 Fl -1047 ij -1067 bq -1068 %0 -1084 a- -1084 char175 -1086 ab -1088 a. -1090 oe -1091 OE -1092 fo -1093 fc -1094 sq -1095 /L -1096 /l -1097 a" -1098 ho -1106 vZ -1107 IJ diff --git a/doc/Makefile b/doc/Makefile index 4c56aa382..e55b84552 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -20,15 +20,15 @@ FFLAG=-F.. TROFF=../troff/troff -M../tmac $(FFLAG) GROPS=../grops/grops $(FFLAG) -DOCS=meref.PS meintro.PS pic.PS +DOCS=meref.ps meintro.ps pic.ps MEMACROS=../macros/tmac.e SOELIM=../soelim/soelim all: $(DOCS) -.SUFFIXES: .tr .me .ms .PS .dit +.SUFFIXES: .tr .me .ms .ps .dit -.dit.PS: +.dit.ps: $(GROPS) $< >$@ .me.dit: @@ -39,18 +39,18 @@ all: $(DOCS) .tr.dit: $(TROFF) -Tps $< >$@ -meref.PS: meref.dit -meintro.PS: meintro.dit +meref.ps: meref.dit +meintro.ps: meintro.dit # This production must use -p -e -t so pic/eqn processing is done -pic.PS: pic.ms +pic.ps: pic.ms sed $< -e "s;@VERSION@;`cat ../VERSION`;" \ | ../groff/groff -p -e -t -Tps $(FFLAG) -ms >$@ install: clean: - -rm -f *.PS *.dit core + -rm -f *.ps *.dit core distclean: clean diff --git a/doc/pic.ms b/doc/pic.ms index 59dcc08cf..e052ec5fc 100644 --- a/doc/pic.ms +++ b/doc/pic.ms @@ -10,7 +10,7 @@ .\" This document was written for free use and redistribution by .\" Eric S. Raymond <esr@thyrsus.com> in August 1995. .\" -.\" $Id: pic.ms,v 1.27 1997/07/03 17:35:39 esr Exp $ +.\" $Id: pic.ms,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" .\" Set a proper TeX .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X diff --git a/mm/Makefile.sub b/mm/Makefile.sub index 60307cd1b..f60175554 100644 --- a/mm/Makefile.sub +++ b/mm/Makefile.sub @@ -1,5 +1,5 @@ # -# $Id: Makefile.sub,v 1.27 1995/04/24 05:37:46 jh Exp $ +# $Id: Makefile.sub,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ # MAN7=groff_mm.n groff_mmse.n FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov diff --git a/mm/groff_mm.man b/mm/groff_mm.man index a2ae4af55..7a734a51e 100644 --- a/mm/groff_mm.man +++ b/mm/groff_mm.man @@ -16,7 +16,7 @@ versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. .. -.\" $Id: groff_mm.man,v 1.27 1995/04/24 05:37:46 jh Exp $ +.\" $Id: groff_mm.man,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" .de T2 .ne 2v diff --git a/mm/groff_mmse.man b/mm/groff_mmse.man index 5d5469b57..984789600 100644 --- a/mm/groff_mmse.man +++ b/mm/groff_mmse.man @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" $Id: groff_mmse.man,v 1.27 1995/04/24 05:37:46 jh Exp $ +.\" $Id: groff_mmse.man,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" Skrivet av Jörgen Hägg, Lund, Sverige .\" .TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" diff --git a/mm/mm/0.MT b/mm/mm/0.MT index 5f1fa7770..346dde06a 100644 --- a/mm/mm/0.MT +++ b/mm/mm/0.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 0.MT,v 1.27 1995/04/24 05:37:50 jh Exp $ +.\" $Id: 0.MT,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" Cover sheet. Memorandum type 0-3 and "string". .\"------------ .if !r Au .nr Au 1 diff --git a/mm/mm/4.MT b/mm/mm/4.MT index 90f3a6895..259e7ae34 100644 --- a/mm/mm/4.MT +++ b/mm/mm/4.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 4.MT,v 1.27 1995/04/24 05:37:50 jh Exp $ +.\" $Id: 4.MT,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" Cover sheet. Memorandum type 4 .\"------------ .de cov@print-title diff --git a/mm/mm/5.MT b/mm/mm/5.MT index d803c8b9d..cbf6eb447 100644 --- a/mm/mm/5.MT +++ b/mm/mm/5.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 5.MT,v 1.27 1995/04/24 05:37:50 jh Exp $ +.\" $Id: 5.MT,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" Cover sheet. Memorandum type 5 .\"------------ .nr cov*mt0-ind 1.1c diff --git a/mm/mm/ms.cov b/mm/mm/ms.cov index 6de13faff..cec5313a0 100644 --- a/mm/mm/ms.cov +++ b/mm/mm/ms.cov @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: ms.cov,v 1.27 1995/04/24 05:37:50 jh Exp $ +.\" $Id: ms.cov,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" Cover sheet. Mostly like ms cover. .\"------------ .de cov@print-title diff --git a/mm/mm/se_ms.cov b/mm/mm/se_ms.cov index 351b05aa4..2059bbbdd 100644 --- a/mm/mm/se_ms.cov +++ b/mm/mm/se_ms.cov @@ -1,3 +1,3 @@ -.\" $Id: se_ms.cov,v 1.27 1995/04/24 05:37:50 jh Exp $ +.\" $Id: se_ms.cov,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .mso mm/ms.cov .nr cur*abstract-ll 11c @@ -3,8 +3,8 @@ .ds RE \\$2 .. .\" -.\" $Id: tmac.m,v 1.27 1995/04/24 05:37:46 jh Exp $ -.@revision $Revision: 1.27 $ +.\" $Id: tmac.m,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ +.@revision $Revision: 1.1.1.1 $ .ig Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. diff --git a/mm/tmac.mse b/mm/tmac.mse index b9daec026..14373b987 100644 --- a/mm/tmac.mse +++ b/mm/tmac.mse @@ -1,4 +1,4 @@ -.\" $Id: tmac.mse,v 1.27 1995/04/24 05:37:46 jh Exp $ +.\" $Id: tmac.mse,v 1.1.1.1 1999/05/21 04:50:47 wlemb Exp $ .\" .\" swedish version of mm .\" See tmac.m for version-information. diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index b07cee70f..6515e3d7b 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -19,7 +19,7 @@ all: stamp-strip stamp-wrap install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local -test -d $(tmacdir) || mkdir $(tmacdir) if test -n "$(tmac_wrap)"; then \ - for m in $(tmac_wrap); do \ + for m in "$(tmac_wrap)"; do \ $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \ done; \ fi @@ -53,7 +53,7 @@ stamp-strip: $(STRIPFILES) $(MDOCFILES) stamp-wrap: if test -n "$(tmac_wrap)"; then \ - for m in $(tmac_wrap); do \ + for m in "$(tmac_wrap)"; do \ rm -f $$m-wrap; \ echo .cp 1 >$$m-wrap; \ echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \ @@ -63,7 +63,7 @@ stamp-wrap: uninstall_sub: -if test -n "$(tmac_wrap)"; then \ - for m in $(tmac_wrap); do rm -f $(tmacdir)/tmac.$$m; done; \ + for m in "$(tmac_wrap)"; do rm -f $(tmacdir)/tmac.$$m; done; \ fi -for f in $(NORMALFILES) $(STRIPFILES); do rm -f $(tmacdir)/$$f; done -rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s diff --git a/xditview/ChangeLog b/xditview/ChangeLog index 35a6924aa..c462c00df 100644 --- a/xditview/ChangeLog +++ b/xditview/ChangeLog @@ -1,3 +1,7 @@ +1999-05-27 Werner LEMBERG <wl@gnu.org> + + * xtotroff.c (usage): Fixed typo. + Mon Sep 11 10:40:33 1995 James Clark <jjc@jclark.com> * device.c (INT_MIN, INT_MAX): Don't define if already defined. diff --git a/xditview/xtotroff.c b/xditview/xtotroff.c index 16e8c263e..3e4e78bc2 100644 --- a/xditview/xtotroff.c +++ b/xditview/xtotroff.c @@ -207,7 +207,7 @@ static usage(prog) char *prog; { fprintf (stderr, - "usage: %s [-g] [-r resolution] [-s pointsize FontMap\n", + "usage: %s [-g] [-r resolution] [-s pointsize] FontMap\n", prog); exit (1); } |