Bug 628: add configurable support for tiff2pdf from libtiff

diff --git a/CHANGES b/CHANGES
index 571fdd30264d1b873209325553c307c107914723..e89d01cfbe1757816dbcc8134d45ce54ddd6910f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* add configurable support for tiff2pdf from libtiff (2 Mar 2005)
 * change the 2 s TCF timeout to use Class1TCFRecvTimeout (2 Mar 2005)
 * handle PPS after 4th PPR (2 Mar 2005)
 * fix potential error in counting of PPR signals (2 Mar 2005)

diff --git a/configure b/configure
index acc5c2888ce3a8b425702b2632f2a6bdd709464a..47025a0be901fca9e305b8f246def72b2da4e90e 100755 (executable)
--- a/configure
+++ b/configure
@@ -249,6 +249,7 @@ SYSVINITSTARTNAME   NAME_SYSVINITSTART
 SYSVINITSTOPDIR        DIR_SYSVINITSTOP
 SYSVINITSTOPNAME       NAME_SYSVINITSTOP
 TARGET
+TIFF2PDF
 TIFFBIN
 TIFFINC
 TTYCMD
@@ -3489,6 +3490,7 @@ test "$PWDCMD"    || PWDCMD=`findAppDef pwd $PATH pwd`
 test "$RMCMD"  || RMCMD=`findAppDef rm $PATH rm`
 test "$SORT"   || SORT=`findAppDef sort $PATH sort`
 test "$STRIP"  || STRIP=`findAppDef strip $PATH strip`
+test "$TIFF2PDF" || TIFF2PDF=`findAppDef tiff2pdf $PATH bin/tiff2pdf`
 test "$TTYCMD" || TTYCMD=`findAppDef tty $PATH tty`
 test "$UUENCODE" || UUENCODE=`findAppDef uuencode $PATH uuencode`
 

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 51040592aa446c5c119d12ac62ffe423c10cc18c..481b6d5749a8506480c0c3c5f0722c14e6f721b1 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -66,6 +66,7 @@ MV=@MV@                               # move file for use below
 RMCMD=@RM@                     # remove file for use below
 SCRIPT_SH=@SCRIPT_SH@          # shell for use below
 SED=@SED@                      # sed for use below
+TIFF2PDF=@TIFF2PDF@            # tiff-to-pdf conversion tool
 TTYCMD=@TTYCMD@                        # tty for error output
 UUENCODE=@UUENCODE@            # uuencode command to dump in setup.cache
 
@@ -162,6 +163,7 @@ SED
 SENDMAIL       PATH_SENDMAIL
 SPOOL          DIR_SPOOL
 SYSVINIT
+TIFF2PDF
 TIFFBIN
 TARGET
 TTYCMD
@@ -776,6 +778,12 @@ fi
 #
 # Double-check these settings...
 #
+if [ ! -x "$TIFF2PDF" ] || [ "$TIFF2PDF" = "bin/tiff2pdf" ]; then
+    TIFF2PDF=`findAppDef tiff2pdf $PATH bin/tiff2pdf`
+    if [ "$TIFF2PDF" != "bin/tiff2pdf" ]; then
+       test -x "$TIFF2PDF" && Note "Found converter: $TIFF2PDF"
+    fi
+fi
 test -x "$MIMENCODE" || {
     MIMENCODE=`findAppDef mimencode $PATH mimencode`
     test -x $MIMENCODE || {

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index c5e005b6de6b3cb43ee8351812a20c6f9a3cba0c..ceca5e5503996e55a1438ed0ac483e11dc15c4cf 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -55,6 +55,7 @@ EOF
 # backward compatibility.
 ENCODING=base64
 MIMENCODE=mimencode
+TIFF2PDF=bin/tiff2pdf
 TTYCMD=tty
 
 . etc/setup.cache
@@ -62,7 +63,6 @@ TTYCMD=tty
 INFO=$SBIN/faxinfo
 FAX2PS=$TIFFBIN/fax2ps
 TIFF2PS=tiff2ps
-TIFF2PDF=bin/tiff2pdf
 TOADDR=FaxMaster
 FROMADDR=fax
 TIFFINFO=tiffinfo

diff --git a/util/notify.sh.in b/util/notify.sh.in
index 1b6c10f807032d5dc2624f4c5667e39a8fe00a52..56d7866ba11a6ccc1209b36c60a6076faf151622 100644 (file)
--- a/util/notify.sh.in
+++ b/util/notify.sh.in
@@ -68,6 +68,7 @@ NEXT=${4:-'??:??'}
 # backward compatibility.
 ENCODING=base64
 MIMENCODE=mimencode
+TIFF2PDF=bin/tiff2pdf
 TTYCMD=tty
 
 . etc/setup.cache
@@ -90,7 +91,6 @@ INFO=$SBIN/faxinfo
 TIFFINFO=tiffinfo
 FAX2PS=$TIFFBIN/fax2ps
 TIFF2PS=tiff2ps
-TIFF2PDF=bin/tiff2pdf
 PS2PDF=ps2pdf
 PDF2PS=pdf2ps
 PS2FAX=bin/ps2fax

diff --git a/util/pollrcvd.sh.in b/util/pollrcvd.sh.in
index e71b92b230aa8a2c19df68c3e10e00aa58e667ac..3ac5c3bc6f2e8ace0695743fb28f242d035f8f95 100644 (file)
--- a/util/pollrcvd.sh.in
+++ b/util/pollrcvd.sh.in
@@ -56,6 +56,7 @@ EOF
 # backward compatibility.
 ENCODING=base64
 MIMENCODE=mimencode
+TIFF2PDF=bin/tiff2pdf
 TTYCMD=tty
 
 . etc/setup.cache
@@ -63,7 +64,6 @@ TTYCMD=tty
 INFO=$SBIN/faxinfo
 FAX2PS=$TIFFBIN/fax2ps
 TIFF2PS=tiff2ps
-TIFF2PDF=bin/tiff2pdf
 TOADDR=FaxMaster
 TIFFINFO=tiffinfo