RCS file: ./mf/RCS/Makefile.in,v retrieving revision 1.1 diff -c -r1.1 ./mf/Makefile.in *** /tmp/,RCSt1SFkDiQ Tue Nov 15 01:45:34 1994 --- ./mf/Makefile.in Thu May 19 08:25:43 1994 *************** *** 49,55 **** --- 49,60 ---- LN = @LN_S@ RANLIB = @RANLIB@ + # This is a script that automates trip/trap to some degree. + # If you want the old verbose spewage, use -diff. + DIFF = ../triptrapdiff.pl + DIFFFLAGS = + # The bases we know how to make. bases = plain.base cmmf.base *************** *** 56,65 **** # Name of the file that defines the local devices. localmodes = modes.mf # And how to make them. ! inimf = MFPOOL=. ./inimf - # What to pass to submakes. # makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' \ --- 61,73 ---- # Name of the file that defines the local devices. localmodes = modes.mf + TMPLIB = ../../lib/mf + # And how to make them. ! inimf = MFPOOL=. MFINPUTS=$(TMPLIB)/macros ./inimf ! # setting MFINPUTS is neccesary to make sure we find the right sources ! # and override the /usr/athena/lib/mf from the previous release --bert 94/05/13 # What to pass to submakes. # makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' \ *************** *** 92,106 **** -$(LN) $(trapdir)/trap.mf . -$(SHELL) -c '. ./trapenv; \ ./trapmf < $(trapdir)/trap1.in > /dev/null 2>&1' ! -diff $(trapdir)/trapin.log trap.log -$(SHELL) -c '. ./trapenv; ./trapmf < $(trapdir)/trap2.in > trap.fot' ! -diff $(trapdir)/trap.log trap.log ! -diff $(trapdir)/trap.fot trap.fot ../fontutil/tftopl ./trap.tfm trap.pl ! -diff $(trapdir)/trap.pl trap.pl $(SHELL) -c '. ./trapenv; \ ../fontutil/gftype -m -i ./trap.72270gf > trap.typ' ! -diff $(trapdir)/trap.typ trap.typ # Make base files automatically. --- 100,114 ---- -$(LN) $(trapdir)/trap.mf . -$(SHELL) -c '. ./trapenv; \ ./trapmf < $(trapdir)/trap1.in > /dev/null 2>&1' ! $(DIFF) $(DIFFFLAGS) $(trapdir)/trapin.log trap.log -$(SHELL) -c '. ./trapenv; ./trapmf < $(trapdir)/trap2.in > trap.fot' ! $(DIFF) $(DIFFFLAGS) $(trapdir)/trap.log trap.log ! $(DIFF) $(DIFFFLAGS) $(trapdir)/trap.fot trap.fot ../fontutil/tftopl ./trap.tfm trap.pl ! $(DIFF) $(DIFFFLAGS) $(trapdir)/trap.pl trap.pl $(SHELL) -c '. ./trapenv; \ ../fontutil/gftype -m -i ./trap.72270gf > trap.typ' ! $(DIFF) $(DIFFFLAGS) $(trapdir)/trap.typ trap.typ # Make base files automatically. =================================================================== RCS file: ./tex/RCS/Makefile.in,v retrieving revision 1.1 diff -c -r1.1 ./tex/Makefile.in *** /tmp/,RCSt1SFkFBT Tue Nov 15 01:45:34 1994 --- ./tex/Makefile.in Thu May 19 08:25:21 1994 *************** *** 46,55 **** LN = @LN_S@ ! # spiff -r5e-8 gives cleaner results than just `diff', but because it ! # also produces backspaces and other verbiage, I haven't taught ! # configure about it. ! DIFF = diff DIFFFLAGS = # The formats we know how to make. --- 46,54 ---- LN = @LN_S@ ! # This is a script that automates trip/trap to some degree. ! # If you want the old verbose spewage, use -diff. ! DIFF = ../triptrapdiff.pl DIFFFLAGS = # The formats we know how to make. *************** *** 56,65 **** formats=amslatex.fmt amstex.fmt etex.fmt inrstex.fmt latex.fmt picplus.fmt \ slitex.fmt tex.fmt texinfo.fmt # And how to make them. ! initex = TEXPOOL=. ./initex - # What to pass to submakes. makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' CCLD='$(CCLD)' \ LDFLAGS='$(LDFLAGS)' LIBS='$(libs)' LN='$(LN)' --- 55,72 ---- formats=amslatex.fmt amstex.fmt etex.fmt inrstex.fmt latex.fmt picplus.fmt \ slitex.fmt tex.fmt texinfo.fmt + TMPLIB = ../../lib/tex + OLDLFONTS = $(TMPLIB)/macros/latex/lfonts.old + NEWLFONTS = $(TMPLIB)/macros/amslatex/fontsel/lfonts.new + FONTSEL = $(TMPLIB)/macros/amslatex/fontsel + AMSINP = $(TMPLIB)/macros/amslatex/inputs + # And how to make them. ! initex = TEXPOOL=. TEXINPUTS=.:$(TMPLIB)/macros// TEXFONTS=$(TMPLIB)/fonts// \ ! ./initex ! # setting TEXINPUTS+TEXFONTS is neccesary to find the right sources ! # and override the /usr/athena/lib/tex from the previous release # What to pass to submakes. makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' CCLD='$(CCLD)' \ LDFLAGS='$(LDFLAGS)' LIBS='$(libs)' LN='$(LN)' *************** *** 92,112 **** -$(LN) $(tripdir)/trip.tex . ../fontutil/pltotf $(tripdir)/trip.pl trip.tfm ../fontutil/tftopl ./trip.tfm trip.pl ! -diff $(tripdir)/trip.pl trip.pl -$(SHELL) -c '. ./tripenv; \ ./triptex < $(tripdir)/trip1.in >/dev/null 2>&1' ! -diff $(tripdir)/tripin.log trip.log -$(SHELL) -c '. ./tripenv; ./triptex < $(tripdir)/trip2.in > trip.fot' ! # ! # We use $(DIFF) instead of `diff' only for those files where there ! # might actually be legitimate numerical differences. ! -$(DIFF) $(DIFFFLAGS) $(tripdir)/trip.log trip.log ! -diff $(tripdir)/trip.fot trip.fot $(SHELL) -c '. ./tripenv; \ ../dviutil/dvitype trip.dvi < $(tripdir)/dvitype.in > trip.typ' ! -$(DIFF) $(DIFFFLAGS) $(tripdir)/trip.typ trip.typ - # Make format files automatically. formats: $(formats) --- 99,115 ---- -$(LN) $(tripdir)/trip.tex . ../fontutil/pltotf $(tripdir)/trip.pl trip.tfm ../fontutil/tftopl ./trip.tfm trip.pl ! $(DIFF) $(DIFFFLAGS) $(tripdir)/trip.pl trip.pl -$(SHELL) -c '. ./tripenv; \ ./triptex < $(tripdir)/trip1.in >/dev/null 2>&1' ! $(DIFF) $(DIFFFLAGS) $(tripdir)/tripin.log trip.log -$(SHELL) -c '. ./tripenv; ./triptex < $(tripdir)/trip2.in > trip.fot' ! $(DIFF) $(DIFFFLAGS) $(tripdir)/trip.log trip.log ! $(DIFF) $(DIFFFLAGS) $(tripdir)/trip.fot trip.fot $(SHELL) -c '. ./tripenv; \ ../dviutil/dvitype trip.dvi < $(tripdir)/dvitype.in > trip.typ' ! $(DIFF) $(DIFFFLAGS) $(tripdir)/trip.typ trip.typ # Make format files automatically. formats: $(formats) *************** *** 118,125 **** # 4) a ``preload'' file, (I use preload.ori), # 5) and a ``basefont'' file. (I use basefont). # How automatic, huh? I can hardly wait for LaTeX 3. amslatex.fmt: initex ! $(initex) lplain \\dump mv lplain.fmt amslatex.fmt mv lplain.log amslatex.log --- 121,137 ---- # 4) a ``preload'' file, (I use preload.ori), # 5) and a ``basefont'' file. (I use basefont). # How automatic, huh? I can hardly wait for LaTeX 3. + + # We certainly don't want to go through the above for Athena release. + # So we copy the files to . at dump time. Sigh. --bert 94/05/13 amslatex.fmt: initex ! rm -f lfonts.tex fontdef.tex preload.tex xxxlfont.sty ! cp $(NEWLFONTS) lfonts.tex ! cp $(AMSINP)/fontdef.ams fontdef.tex ! cp $(FONTSEL)/preload.ori preload.tex ! cp $(FONTSEL)/basefont.tex xxxlfont.sty ! $(initex) lplain \\input athena.tex \\dump ! rm -f lfonts.tex fontdef.tex preload.tex xxxlfont.sty mv lplain.fmt amslatex.fmt mv lplain.log amslatex.log *************** *** 126,164 **** # As of AMSTeX 2.1, the initialization file is named `amstex.ini'. # Because it explicitly reads plain.tex, we cannot use &./tex; that # produces the `Too late for \patterns' error. - amstex.fmt: initex - $(initex) amstex.ini etex.fmt: tex.fmt touch eplain.aux # Makes cross-reference warnings work right. ! $(initex) \&./tex eplain \\dump mv eplain.fmt etex.fmt mv eplain.log etex.log inrstex.fmt: initex ! $(initex) inrstex \\dump latex.fmt: initex ! $(initex) lplain \\dump mv lplain.fmt latex.fmt mv lplain.log latex.log picplus.fmt: tex.fmt ! $(initex) \&./tex picplus \\dump slitex.fmt: initex ! $(initex) splain \\dump mv splain.fmt slitex.fmt mv splain.log slitex.log tex.fmt: initex ! $(initex) plain \\dump mv plain.fmt tex.fmt mv plain.log tex.log # Texinfo changes the escape character from `\' to `@'. texinfo.fmt: tex.fmt ! $(initex) \&./tex texinfo @dump # We change texd.h instead of the change file, to avoid retangling. --- 138,182 ---- # As of AMSTeX 2.1, the initialization file is named `amstex.ini'. # Because it explicitly reads plain.tex, we cannot use &./tex; that # produces the `Too late for \patterns' error. + # However, we can use amstex.tex and get the Athena banner... =) --bert + amstex.fmt: tex.fmt + $(initex) \&./tex amstex \\input athena.tex \\dump + etex.fmt: tex.fmt touch eplain.aux # Makes cross-reference warnings work right. ! $(initex) \&./tex eplain \\input athena.tex \\dump mv eplain.fmt etex.fmt mv eplain.log etex.log inrstex.fmt: initex ! $(initex) inrstex \\input athena.tex \\dump + # We need to get the appropriate lfonts.tex (see above) --bert 94/05/13 latex.fmt: initex ! rm -f lfonts.tex fontdef.tex preload.tex xxxlfont.sty ! cp $(OLDLFONTS) lfonts.tex ! $(initex) lplain \\input athena.tex \\dump ! rm -f lfonts.tex fontdef.tex preload.tex xxxlfont.sty mv lplain.fmt latex.fmt mv lplain.log latex.log picplus.fmt: tex.fmt ! $(initex) \&./tex picplus \\input athena.tex \\dump slitex.fmt: initex ! $(initex) splain \\input athena.tex \\dump mv splain.fmt slitex.fmt mv splain.log slitex.log tex.fmt: initex ! $(initex) plain \\input athena.tex \\dump mv plain.fmt tex.fmt mv plain.log tex.log # Texinfo changes the escape character from `\' to `@'. texinfo.fmt: tex.fmt ! $(initex) \&./tex texinfo @input athena.tex @dump # We change texd.h instead of the change file, to avoid retangling. =================================================================== RCS file: ./lib/RCS/c-auto.h.in,v retrieving revision 1.1 diff -c -r1.1 ./lib/c-auto.h.in *** /tmp/,RCSt1SFkL0l Tue Nov 15 01:45:35 1994 --- ./lib/c-auto.h.in Mon Jan 3 14:58:58 1994 *************** *** 64,70 **** define this. If you don't have such scripts, the downside is an extra fork/exec on nonexistent files. */ #ifndef NO_MAKETEX ! #undef NO_MAKETEX #endif /* Default editor command string: `%d' expands to the line number where --- 64,70 ---- define this. If you don't have such scripts, the downside is an extra fork/exec on nonexistent files. */ #ifndef NO_MAKETEX ! #define NO_MAKETEX /* bert 01/03/93 */ #endif /* Default editor command string: `%d' expands to the line number where *************** *** 71,77 **** TeX or Metafont found an error and `%s' expands to the name of the file. The environment variables TEXEDIT and MFEDIT override this. */ #ifndef EDITOR ! #define EDITOR "vi +%d %s" #endif /* If you don't want to be able to potentially share format/base files --- 71,77 ---- TeX or Metafont found an error and `%s' expands to the name of the file. The environment variables TEXEDIT and MFEDIT override this. */ #ifndef EDITOR ! #define EDITOR "emacs +%d %s" /* bert 01/03/93 */ #endif /* If you don't want to be able to potentially share format/base files =================================================================== RCS file: ./lib/RCS/getopt.c,v retrieving revision 1.1 diff -c -r1.1 ./lib/getopt.c *** /tmp/,RCSt1SFkMn% Tue Nov 15 01:45:35 1994 --- ./lib/getopt.c Wed May 11 03:06:34 1994 *************** *** 30,35 **** --- 30,39 ---- #include "config.h" #endif + /* we don't want config.h (pascal.h is a work of the devil). we *do* want + c-auto.h to deal with getting rid of consts's when needed. --bert 01/05/94*/ + #include "c-auto.h" + #ifdef __GNUC__ #define alloca __builtin_alloca #else /* not __GNUC__ */ =================================================================== RCS file: ./lib/RCS/getopt1.c,v retrieving revision 1.1 diff -c -r1.1 ./lib/getopt1.c *** /tmp/,RCSt1SFkSoH Tue Nov 15 01:45:36 1994 --- ./lib/getopt1.c Wed May 11 03:07:00 1994 *************** *** 19,24 **** --- 19,28 ---- #include "config.h" #endif + /* we don't want config.h (pascal.h is a work of the devil). we *do* want + c-auto.h to deal with getting rid of consts's when needed. --bert 01/05/94*/ + #include "c-auto.h" + #include "getopt.h" #if !__STDC__ && !defined(const) && IN_GCC =================================================================== RCS file: ./RCS/Makefile.in,v retrieving revision 1.1 diff -c -r1.1 ./Makefile.in *** /tmp/,RCSt1SFkX1G Tue Nov 15 01:45:37 1994 --- ./Makefile.in Thu May 19 07:59:11 1994 *************** *** 9,15 **** # directory names; some of them are used in `make install'. They should # match the system directories in the paths. # ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datadir = $(prefix)/lib --- 9,15 ---- # directory names; some of them are used in `make install'. They should # match the system directories in the paths. # ! prefix = /usr/athena exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datadir = $(prefix)/lib *************** *** 25,31 **** mfinputdir = $(mfdatadir)/macros basedir = $(mfdatadir)/bases ! typesources = $(prefix)/src/TeX+MF/typefaces cmsources = $(typesources)/cm # Search paths. --- 25,31 ---- mfinputdir = $(mfdatadir)/macros basedir = $(mfdatadir)/bases ! typesources = $(mfdatadir)/typefaces cmsources = $(typesources)/cm # Search paths. *************** *** 74,80 **** # description of each of these formats. # bases = mf.base cmmf.base ! formats = tex.fmt latex.fmt # slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt inrstex.fmt # picplus.fmt --- 74,80 ---- # description of each of these formats. # bases = mf.base cmmf.base ! formats = tex.fmt latex.fmt slitex.fmt amstex.fmt amslatex.fmt # slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt inrstex.fmt # picplus.fmt *************** *** 84,90 **** # definitions for all fonts. It's available from ftp.cs.umb.edu as # pub/tex/modes.mf, among other places. # ! localmodes = modes # Start of system configuration section. --- 84,90 ---- # definitions for all fonts. It's available from ftp.cs.umb.edu as # pub/tex/modes.mf, among other places. # ! localmodes = athena # Start of system configuration section. *************** *** 92,98 **** # Compiling. CC = @CC@ ! CFLAGS = -g # Command to link an executable. CCLD = $(CC) --- 92,98 ---- # Compiling. CC = @CC@ ! CFLAGS = @CFLAGS@ # Command to link an executable. CCLD = $(CC) *************** *** 148,159 **** installargs=$(makeargs) \ INSTALL_DATA='$(INSTALL_DATA)' \ INSTALL_PROGRAM='$(INSTALL_PROGRAM)' \ ! bindir='$(bindir)' \ ! texfontdir='$(texfontdir)' \ ! texpooldir='$(texpooldir)' \ ! mfpooldir='$(mfpooldir)' - # The triptrap targets make the test versions of TeX and Metafont. triptrap: trip trap .PHONY: triptrap --- 148,159 ---- installargs=$(makeargs) \ INSTALL_DATA='$(INSTALL_DATA)' \ INSTALL_PROGRAM='$(INSTALL_PROGRAM)' \ ! bindir='$(DESTDIR)$(bindir)' \ ! texfontdir='$(DESTDIR)$(texfontdir)' \ ! texpooldir='$(DESTDIR)$(texpooldir)' \ ! mfpooldir='$(DESTDIR)$(mfpooldir)' \ ! DESTDIR='$(DESTDIR)' # The triptrap targets make the test versions of TeX and Metafont. triptrap: trip trap .PHONY: triptrap *************** *** 282,288 **** install: install-exec install-data .PHONY: install install-data: install-formats install-bases install-manpages ! -mkdir $(prefix) >/dev/null 2>&1 for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-data); \ done --- 282,288 ---- install: install-exec install-data .PHONY: install install-data: install-formats install-bases install-manpages ! -mkdir $(DESTDIR)$(prefix) >/dev/null 2>&1 for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-data); \ done *************** *** 289,327 **** .PHONY: install-data install-exec: programs ! -mkdir $(exec_prefix) $(bindir) >/dev/null 2>&1 for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-exec); \ done for f in $(formats); do \ ! rm -f $(bindir)/`basename $$f .fmt`; \ ! $(LN) $(bindir)/virtex $(bindir)/`basename $$f .fmt`; \ done for f in $(bases); do \ ! rm -f $(bindir)/`basename $$f .base`; \ ! $(LN) $(bindir)/virmf $(bindir)/`basename $$f .base`; \ done .PHONY: install-exec install-formats: formats ! -mkdir $(prefix) $(texdatadir) $(formatdir) >/dev/null 2>&1 for f in $(formats); do \ ! $(INSTALL_DATA) tex/$$f $(formatdir)/$$f; \ done ! cd $(formatdir); rm -f plain.fmt; $(LN) tex.fmt plain.fmt .PHONY: install-formats install-bases: bases ! -mkdir $(prefix) $(mfdatadir) $(basedir) >/dev/null 2>&1 for f in $(bases); do \ ! $(INSTALL_DATA) mf/$$f $(basedir)/$$f; \ done ! cd $(basedir); rm -f plain.base; $(LN) mf.base plain.base .PHONY: install-bases install-manpages: manpages ! cd man; $(MAKE) $(installargs) \ ! srcdir=$(srcdir) mandir=$(mandir) manext=$(manext) install .PHONY: install-manpages --- 289,327 ---- .PHONY: install-data install-exec: programs ! -mkdir $(DESTDIR)$(exec_prefix) $(DESTDIR)$(bindir) >/dev/null 2>&1 for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-exec); \ done for f in $(formats); do \ ! rm -f $(DESTDIR)$(bindir)/`basename $$f .fmt`; \ ! $(LN) $(DESTDIR)$(bindir)/virtex $(DESTDIR)$(bindir)/`basename $$f .fmt`;\ done for f in $(bases); do \ ! rm -f $(DESTDIR)$(bindir)/`basename $$f .base`; \ ! $(LN) $(DESTDIR)$(bindir)/virmf $(DESTDIR)$(bindir)/`basename $$f .base`;\ done .PHONY: install-exec install-formats: formats ! -mkdir $(DESTDIR)$(prefix) $(DESTDIR)$(texdatadir) $(DESTDIR)$(formatdir) >/dev/null 2>&1 for f in $(formats); do \ ! $(INSTALL_DATA) tex/$$f $(DESTDIR)$(formatdir)/$$f; \ done ! cd $(DESTDIR)$(formatdir); rm -f plain.fmt; $(LN) tex.fmt plain.fmt .PHONY: install-formats install-bases: bases ! -mkdir $(DESTDIR)$(prefix) $(DESTDIR)$(mfdatadir) $(DESTDIR)$(basedir) >/dev/null 2>&1 for f in $(bases); do \ ! $(INSTALL_DATA) mf/$$f $(DESTDIR)$(basedir)/$$f; \ done ! cd $(DESTDIR)$(basedir); rm -f plain.base; $(LN) mf.base plain.base .PHONY: install-bases install-manpages: manpages ! cd man; $(MAKE) $(installargs) srcdir=$(srcdir) \ ! mandir=$(DESTDIR)$(mandir) manext=$(manext) install .PHONY: install-manpages *************** *** 427,430 **** --- 427,431 ---- # # Local variables: # page-delimiter: "^# \f" + # mode: makefile # End: =================================================================== RCS file: ./RCS/configure,v retrieving revision 1.1 diff -c -r1.1 ./configure *** /tmp/,RCSt1SFkZUK Tue Nov 15 01:45:38 1994 --- ./configure Thu May 19 13:36:51 1994 *************** *** 1,6 **** --- 1,7 ---- #!/bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf. + # ...then hand-hacked some for Athena. # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 78,84 **** trap 'rm -f conftest* core; exit 1' 1 3 15 rm -f conftest* ! compile='${CC-cc} $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1' # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. --- 79,85 ---- trap 'rm -f conftest* core; exit 1' 1 3 15 rm -f conftest* ! compile='${CC-cc} $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1' # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. *************** *** 152,158 **** yes #endif EOF ! ${CC-cc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. fi --- 153,159 ---- yes #endif EOF ! ${CC-cc} $CFLAGS -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. fi *************** *** 204,209 **** --- 205,218 ---- test -n "$need_trad" && CC="$CC -traditional" fi + # use flags from $CFLAGS if defined -- bert 1/4/93 + if test -n "$CFLAGS"; then + echo using specified C flags + else + echo using default C flags + CFLAGS=-g + fi + # Make sure to not get the incompatible SysV /etc/install and # /usr/sbin/install, which might be in PATH before a BSD-like install, # or the SunOS /usr/etc/install directory, or the AIX /bin/install, *************** *** 221,227 **** : # AIX else INSTALL="$dir/install -c" ! INSTALL_PROGRAM='$(INSTALL)' INSTALL_DATA='$(INSTALL) -m 644' break fi --- 230,236 ---- : # AIX else INSTALL="$dir/install -c" ! INSTALL_PROGRAM='$(INSTALL) -s' INSTALL_DATA='$(INSTALL) -m 644' break fi *************** *** 797,819 **** rm -f conftest* - echo checking how to declare yytext - # Figure out what yytext is by creating a minimal parser and - # examining the (preprocessed, in case macros are used) output. - if test -z "$DECLARE_YYTEXT" - then - echo "%%" | $LEX - DECLARE_YYTEXT=`eval $CPP lex.yy.c | - sed -n '/extern.*yytext/s/^.*extern/extern/p'` - rm -f lex.yy.c - fi - DEFS="$DEFS -D'DECLARE_YYTEXT="$DECLARE_YYTEXT"'" - SEDDEFS="${SEDDEFS}\${SEDdA}DECLARE_YYTEXT\${SEDdB}DECLARE_YYTEXT\${SEDdC}"$DECLARE_YYTEXT"\${SEDdD} - \${SEDuA}DECLARE_YYTEXT\${SEDuB}DECLARE_YYTEXT\${SEDuC}"$DECLARE_YYTEXT"\${SEDuD} - \${SEDeA}DECLARE_YYTEXT\${SEDeB}DECLARE_YYTEXT\${SEDeC}"$DECLARE_YYTEXT"\${SEDeD} - " - - echo checking for window system libraries cat > conftest.c < cbibtex.ch) fi + echo finally, checking how to declare yytext + # Figure out what yytext is by creating a minimal parser and + # examining the (preprocessed, in case macros are used) output. + if test -z "$DECLARE_YYTEXT" + then + echo "%%" | $LEX + DECLARE_YYTEXT=`eval $CPP lex.yy.c | + sed -n '/extern.*yytext/s/^.*extern/extern/p'` + rm -f lex.yy.c + fi + DEFS="$DEFS '-DDECLARE_YYTEXT=\"$DECLARE_YYTEXT\"'" + SEDDEFS="${SEDDEFS}\${SEDdA}DECLARE_YYTEXT\${SEDdB}DECLARE_YYTEXT\${SEDdC}"$DECLARE_YYTEXT"\${SEDdD} + \${SEDuA}DECLARE_YYTEXT\${SEDuB}DECLARE_YYTEXT\${SEDuC}"$DECLARE_YYTEXT"\${SEDuD} + \${SEDeA}DECLARE_YYTEXT\${SEDeB}DECLARE_YYTEXT\${SEDeC}"$DECLARE_YYTEXT"\${SEDeD} + " + + if test -n "$prefix"; then test -z "$exec_prefix" && exec_prefix='${prefix}' prsub="s%^prefix\\([ ]*\\)=\\([ ]*\\).*$%prefix\\1=\\2$prefix%" *************** *** 1108,1113 **** --- 1140,1146 ---- lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ tex/Makefile web/Makefile web2c/Makefile lib/c-auto.h conftest*; exit 1' 1 3 15 CC='$CC' + CFLAGS='$CFLAGS' INSTALL='$INSTALL' INSTALL_PROGRAM='$INSTALL_PROGRAM' INSTALL_DATA='$INSTALL_DATA' *************** *** 1144,1149 **** --- 1177,1183 ---- sed -e " $prsub s%@CC@%$CC%g + s%@CFLAGS@%$CFLAGS%g s%@INSTALL@%$INSTALL%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g