---- enscript-1.6.2/configure.in.orig Tue Dec 8 07:57:44 1998
-+++ enscript-1.6.2/configure.in Wed Mar 20 17:39:38 2002
-@@ -8,25 +8,9 @@
+--- enscript-1.6.4/configure.in.orig 2003-03-05 08:26:16.000000000 +0100
++++ enscript-1.6.4/configure.in 2003-05-09 07:49:01.000000000 +0200
+@@ -11,23 +11,7 @@
- AC_REVISION($Revision$)
-
--AM_PROG_INSTALL
-+AC_PROG_INSTALL
+ AC_PROG_INSTALL
-AC_ARG_WITH(cc,
-[ --with-cc(=CC) use system's native compiler (or compiler CC)],
AC_ISC_POSIX
AM_C_PROTOTYPES
-@@ -74,14 +58,6 @@
+@@ -59,14 +43,6 @@
AC_PROG_YACC
AM_PROG_LEX
dnl Define the default output media.
AC_ARG_WITH(media,
-@@ -147,10 +123,6 @@
+@@ -132,9 +108,6 @@
dnl substitutions
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
--AC_SUBST(LIBOBJS)
-
- AC_OUTPUT([Makefile \
+ AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile po/Makefile \
compat/Makefile \
afm/Makefile \
---- enscript-1.6.1/compat/Makefile.am~ Thu Dec 13 21:16:15 2001
-+++ enscript-1.6.1/compat/Makefile.am Thu Dec 13 21:16:15 2001
-@@ -28,8 +28,6 @@
-
- noinst_LIBRARIES = libcompat.a
- libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
--libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
--libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
-
- noinst_HEADERS = dummypwd.h getopt.h regex.h xalloc.h
-
---- enscript-1.6.1/lib/Makefile.am~ Thu Dec 13 21:20:28 2001
-+++ enscript-1.6.1/lib/Makefile.am Thu Dec 13 21:20:28 2001
-@@ -37,12 +37,8 @@
+--- enscript-1.6.4/lib/Makefile.am.orig 2003-03-05 08:26:29.000000000 +0100
++++ enscript-1.6.4/lib/Makefile.am 2003-05-09 07:52:40.000000000 +0200
+@@ -38,12 +38,8 @@
all-local: enscript.cfg
install-data-local: enscript.cfg
uninstall-local:
rm -f $(sysconfdir)/enscript.cfg
---- enscript-1.6.2/states/Makefile.am.orig Fri Oct 23 15:21:49 1998
-+++ enscript-1.6.2/states/Makefile.am Wed Mar 20 17:42:32 2002
-@@ -26,19 +26,17 @@
-
- SUBDIRS = hl tests
-
--AUTOMAKE_OPTIONS =
--
- bin_PROGRAMS = states
- states_SOURCES = main.c utils.c prims.c process.c gram.y lex.l
-
--LDADD = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a @LEXLIB@
--states_DEPENDENCIES = @INTLLIBS@ ../compat/libcompat.a
-+LDADD = ../afmlib/libafm.a $(INTLLIBS) ../compat/libcompat.a $(LEXLIB)
-+states_DEPENDENCIES = $(INTLLIBS) ../compat/libcompat.a
-
- noinst_HEADERS = defs.h gram.h
-
- EXTRA_DIST = TODO over.in enscript.el
-
--localedir = $(prefix)/@DATADIRNAME@/locale
-+localedir = $(datadir)/locale
-
- bin_SCRIPTS = over
-
---- enscript-1.6.2/afm/Makefile.am~ Wed Mar 20 17:48:08 2002
-+++ enscript-1.6.2/afm/Makefile.am Wed Mar 20 17:48:08 2002
-@@ -34,11 +34,11 @@
- EXTRA_DIST = font.map $(default_afm)
+--- enscript-1.6.4/afm/Makefile.am.orig 2003-03-05 08:26:16.000000000 +0100
++++ enscript-1.6.4/afm/Makefile.am 2003-05-09 07:53:56.000000000 +0200
+@@ -36,10 +36,10 @@
+ EXTRA_DIST = font.map $(default_afm) $(public_fonts)
install-data-local:
- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
done
uninstall-local:
-- rm -rf $(datadir)/enscript/afm
-+ rm -rf $(DESTDIR)$(datadir)/enscript/afm
---- enscript-1.6.2/states/hl/Makefile.am~ Wed Mar 20 17:53:09 2002
-+++ enscript-1.6.2/states/hl/Makefile.am Wed Mar 20 17:53:09 2002
-@@ -44,11 +44,11 @@
+--- enscript-1.6.4/states/hl/Makefile.am.orig 2003-03-05 08:26:33.000000000 +0100
++++ enscript-1.6.4/states/hl/Makefile.am 2003-05-09 07:54:20.000000000 +0200
+@@ -45,10 +45,10 @@
EXTRA_DIST = $(states)
install-data-local:
done
uninstall-local:
-- rm -rf $(datadir)/enscript/hl
-+ rm -rf $(DESTDIR)$(datadir)/enscript/hl
double val;
for (i = 0; (i < sizeof (buf) - 1
-@@ -2696,31 +2696,15 @@
- static void
- divert ()
- {
-- char *cp;
--
- assert (divertfp == NULL);
-
- /* Open divert file. */
-
-- cp = tempnam (NULL, "ens");
-- if (cp == NULL)
-- FATAL ((stderr, _("couldn't create divert file name: %s"),
-- strerror (errno)));
--
-- strcpy (divertfname, cp);
--
-- divertfp = fopen (divertfname, "w+b");
-+ divertfp = tmpfile ();
- if (divertfp == NULL)
- FATAL ((stderr, _("couldn't create divert file \"%s\": %s"), divertfname,
- strerror (errno)));
-
-- if (remove (divertfname) == 0)
-- /* Remove successfull, no need to remove file in undivert(). */
-- divertfname[0] = '\0';
--
-- /* Free the buffer allocated by tempnam(). */
-- free (cp);
--
- cofp = divertfp;
- }
-
-@@ -2774,10 +2758,6 @@
-
- fclose (divertfp);
- divertfp = NULL;
--
-- /* Do we have to remove the divert file? */
-- if (divertfname[0])
-- (void) remove (divertfname);
-
- cofp = ofp;
- }
---- enscript-1.6.2.orig/tests/Makefile.in
-+++ enscript-1.6.2/tests/Makefile.in
-@@ -131,7 +131,7 @@
- EXTRA_DIST = defs $(TESTS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_FILES = testout.ps
- DIST_COMMON = ChangeLog Makefile.am Makefile.in
-
-
---- enscript-1.6.2.orig/docs/Makefile.in
-+++ enscript-1.6.2/docs/Makefile.in
-@@ -280,7 +280,7 @@
- enscript.fns enscript.ky enscript.kys enscript.ps \
- enscript.log enscript.pg enscript.toc enscript.tp \
- enscript.tps enscript.vr enscript.vrs enscript.op enscript.tr \
-- enscript.cv enscript.cn
-+ enscript.cv enscript.cn enscript.1 states.1
-
- clean-aminfo:
-
{
strcat (spooler_options, no_job_header_switch);
@@ -1797,7 +1803,7 @@
- const char *cp;
+ int i;
c = getopt_long (argc, argv,
-- "#:12a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
-+ "#:12a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
+- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
++ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
long_options, &option_index);
if (c == -1)