Auto-generate etc2ps.sh.

diff --git a/configure.in b/configure.in
index a40e958aff987e4604f5c7d2c74452c3ba4ab9cc..c51e3cbe771a0c368af5ad2e6273fcb2c9f410ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.181 2003-06-06 18:28:10 srittau Exp $
+dnl $Id: configure.in,v 1.182 2003-06-07 12:01:03 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -21,6 +21,8 @@ AM_PROG_LIBTOOL
 AC_PROG_PERL
 AC_PROG_GREP
 AC_PROG_PS
+AC_PROG_DVIPS
+AC_PROG_TROFF2PS
 
 dnl *********************************************************************
 dnl FIXME! FIXME! These should be selectable properly, and should produce
@@ -722,6 +724,7 @@ AC_OUTPUT([Makefile
        etc/uams/uams_krb4/Makefile
        etc/papd/Makefile
        etc/psf/Makefile
+       etc/psf/etc2ps.sh
        include/Makefile
        include/atalk/Makefile
        libatalk/Makefile

diff --git a/etc/psf/.cvsignore b/etc/psf/.cvsignore
index 0ac9be4496141b668d2297ff93c7dce5bb510df0..5cd8387315e2140ec045fdb5115e27177173934f 100644 (file)
--- a/etc/psf/.cvsignore
+++ b/etc/psf/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
+etc2ps.sh
 psf
 psa
 .deps

diff --git a/etc/psf/etc2ps.sh b/etc/psf/etc2ps.sh
deleted file mode 100644 (file)
index 5c3c60d..0000000
--- a/etc/psf/etc2ps.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# This filter is called by psf to convert "other" formats to PostScript.
-# psf handles text and PostScript native.  "Other" formats, e.g. DVI, C/A/T,
-# need to be converted before the page reverser and the printer can use
-# them.
-#
-# $0 begins with the filter name, e.g. df, tf.  Each format is a separate
-# tag in the case.
-#
-
-DVIPSPATH=/usr/local/tex/bin
-DVIPS=/usr/local/tex/bin/dvips
-DVIPSARGS="-f -q"
-
-TROFF2PS=/usr/local/psroff/troff2/troff2ps
-TROFF2PSARGS="-Z -O-.10"
-
-PATH=/usr/bin:$DVIPSPATH; export PATH
-
-case $1 in
-
-#
-# Use "dvips" by Radical Eye Software to convert TeX DVI files to PostScript.
-# Note that you *must* have METAFONT, etc, in your path.
-#
-df*)
-    if [ -x "$DVIPS" ]; then
-       cat > /tmp/psfilter.$$
-       $DVIPS $DVIPSARGS < /tmp/psfilter.$$
-       rm -f /tmp/psfilter.$$
-    else
-       echo "$0: filter dvips uninstalled" 1>&2
-       exit 2
-    fi
-    ;;
-
-#
-# troff2ps is from psroff by Chris Lewis.
-#
-tf*)
-    if [ -x "$TROFF2PS" ]; then
-       exec $TROFF2PS $TROFF2PSARGS
-    else
-       echo "$0: filter troff2ps uninstalled" 1>&2
-       exit 2
-    fi
-    ;;
-
-*)
-    echo "$0: filter $1 unavailable" 1>&2
-    exit 2
-    ;;
-esac
-
-exit 0

diff --git a/etc/psf/etc2ps.sh.in b/etc/psf/etc2ps.sh.in
new file mode 100644 (file)
index 0000000..cdfa385
--- /dev/null
+++ b/etc/psf/etc2ps.sh.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# This filter is called by psf to convert "other" formats to PostScript.
+# psf handles text and PostScript native.  "Other" formats, e.g. DVI, C/A/T,
+# need to be converted before the page reverser and the printer can use
+# them.
+#
+# $0 begins with the filter name, e.g. df, tf.  Each format is a separate
+# tag in the case.
+#
+
+DVIPS=@DVIPS@
+DVIPSARGS="-f -q"
+
+TROFF2PS=@TROFF2PS@
+TROFF2PSARGS="-Z -O-.10"
+
+case $1 in
+
+#
+# Use "dvips" by Radical Eye Software to convert TeX DVI files to PostScript.
+# Note that you *must* have METAFONT, etc, in your path.
+#
+df*)
+    if [ -x "$DVIPS" ]; then
+       cat > /tmp/psfilter.$$
+       $DVIPS $DVIPSARGS < /tmp/psfilter.$$
+       rm -f /tmp/psfilter.$$
+    else
+       echo "$0: filter dvips uninstalled" 1>&2
+       exit 2
+    fi
+    ;;
+
+#
+# troff2ps is from psroff by Chris Lewis.
+#
+tf*)
+    if [ -x "$TROFF2PS" ]; then
+       exec $TROFF2PS $TROFF2PSARGS
+    else
+       echo "$0: filter troff2ps uninstalled" 1>&2
+       exit 2
+    fi
+    ;;
+
+*)
+    echo "$0: filter $1 unavailable" 1>&2
+    exit 2
+    ;;
+esac
+
+exit 0

diff --git a/macros/tex-check.m4 b/macros/tex-check.m4
new file mode 100644 (file)
index 0000000..1010825
--- /dev/null
+++ b/macros/tex-check.m4
@@ -0,0 +1,20 @@
+# M4 macros to check for the existence of dvips and troff2ps
+# $Id: tex-check.m4,v 1.1 2003-06-07 12:01:04 srittau Exp $
+
+AC_DEFUN([AC_PROG_DVIPS], [
+       AC_ARG_WITH(dvips, [  --with-dvips     path to the dvips command], [
+               DVIPS="$withval"
+       ], [
+               AC_PATH_PROG(DVIPS, dvips)
+       ])
+       AC_SUBST(DVIPS)
+])
+
+AC_DEFUN([AC_PROG_TROFF2PS], [
+       AC_ARG_WITH(troff2ps, [  --with-troff2ps    path to the troff2ps command], [
+               TROFF2PS="$withval"
+       ], [
+               AC_PATH_PROG(TROFF2PS, troff2ps)
+       ])
+       AC_SUBST(TROFF2PS)
+])