Bug 653: espgs sends 'gs -h' info to stderr, so add "2>&1" following 'gs -h' calls.

diff --git a/CHANGES b/CHANGES
index 475fd2542f243211bf0565dd064dc3c29654fb42..65675dab84366eb82976dea460176c1e57242564 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* fix configure and faxsetup for espgs (16 May 2005)
 * fix potential looping in Class 1 protocol flow control 
   mechanisms (11 May 2005)
 * stop sendfax from passing comments to hfaxd due to

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4272dd2785b1533c7653f2357386c444f34610be..9331774964ece7df086b55f23ef886dfad95e4a9 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -40,32 +40,33 @@ Trevor Blackwell     Siegfried Bosch      Marc Boucher
 Ross Boylan          Frank Brock          Glen Burkhardt       
 Yves Carlier         Ed Casas             Jonathon Chen        
 Robert Colquhoun     Ken Cornetet         Seth Cuaiklin        
-Albert DeKnuydt      Paul Eggert          Juergen Fischer      
-Kevin Fleming        John Florian         Patrice Fournier     
-Vyacheslav Frolov    John Gilman          Kris Henderson       
-Sascha Herrmann      Carsten Hoeger       Lee Howard           
-John Interrante      Sascha Ittner        Damiam Ivereigh      
-Bernard Jech         Nico Kadel-Garcia    Sean Kamath          
-Jonathan Kamens      Dimitry Ketov        Steffan Klipsch      
-Hannu Koivisto       Arjen de Korte       Ken Lalonde          
-Ilguiz Latypov       Rob Leadbeater       Guillaume Legoupil   
-Greg Luck            Andy MacNamara       Lionel Mamane        
-Pierluigi Mangani    Campbell McKilligan  Bodo Meissner        
-John Miller          Aldo Mini            Boris Mironov        
-Seth Mos             Darren Nickerson     Andrea Nicolini      
-Giulio Orsero        Chris Parsons        Michael Pedersen     
-John Perkins         Simon Perry          Frank Peters         
-Vu Pham              John Patrick Poet    Harald Pollack       
-Andreas Pretzsch     Bernd Proissl        Matthew Rice         
-Tim Rice             Daniel Robbins       Giuseppe Sacco       
-Michael Salzmann     Sven Schmidt         John Sellens         
-Simon <iahnl@iah.nl> Vilmos Soti          Alan Sparks          
-Andy Sparrow         Marco Steinacher     Iain Stevenson       
-Marius Strobl        Kazuhide Takahashi   Daryl Thachuk        
-Steve Tuckner        Aidan Van Dyk        Rich Walker          
-Norbert Warmuth      Phil Watkinson       James Werkowski      
-Chas Williams        John Williams        Steve Williams       
-John Wolfe           Bill Young           Bruce Young
+Albert DeKnuydt      Reeby Dobalina       Paul Eggert          
+Juergen Fischer      Kevin Fleming        John Florian         
+Patrice Fournier     Vyacheslav Frolov    John Gilman          
+Kris Henderson       Sascha Herrmann      Carsten Hoeger       
+Lee Howard           John Interrante      Sascha Ittner        
+Damiam Ivereigh      Bernard Jech         Nico Kadel-Garcia    
+Sean Kamath          Jonathan Kamens      Dimitry Ketov        
+Steffan Klipsch      Hannu Koivisto       Arjen de Korte       
+Ken Lalonde          Ilguiz Latypov       Rob Leadbeater       
+Guillaume Legoupil   Greg Luck            Andy MacNamara       
+Lionel Mamane        Pierluigi Mangani    Campbell McKilligan  
+Bodo Meissner        John Miller          Aldo Mini            
+Boris Mironov        Seth Mos             Darren Nickerson     
+Andrea Nicolini      Giulio Orsero        Chris Parsons        
+Michael Pedersen     John Perkins         Simon Perry          
+Frank Peters         Vu Pham              John Patrick Poet    
+Harald Pollack       Andreas Pretzsch     Bernd Proissl        
+Matthew Rice         Tim Rice             Daniel Robbins       
+Giuseppe Sacco       Michael Salzmann     Sven Schmidt         
+John Sellens         Simon <iahnl@iah.nl> Vilmos Soti          
+Alan Sparks          Andy Sparrow         Marco Steinacher     
+Iain Stevenson       Marius Strobl        Kazuhide Takahashi   
+Daryl Thachuk        Steve Tuckner        Aidan Van Dyk        
+Rich Walker          Norbert Warmuth      Phil Watkinson       
+James Werkowski      Chas Williams        John Williams        
+Steve Williams       John Wolfe           Bill Young           
+Bruce Young
 
 We appreciate and recognize the upstreamed contributions from these 
 distributions:

diff --git a/configure b/configure
index 47025a0be901fca9e305b8f246def72b2da4e90e..c4733c39277a86ce451621adbdc7206520b2e7d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3869,7 +3869,7 @@ PickRIP()
        "
        for i in $GSLOCS; do
            # verify Ghostscript was linked with the tiffg3 device driver
-           capture "$i -h | grep tiffg3" && { PATH_GSRIP=$i; break; }
+           capture "$i -h 2>&1 | grep tiffg3" && { PATH_GSRIP=$i; break; }
        done
     fi
     case $PS in
@@ -3883,7 +3883,7 @@ CheckRIP()
     if [ -x "$PATH_PSRIP" ]; then
        if [ $PS = gs ]; then
            # verify Ghostscript was linked with the tiffg3 device driver
-           capture "$PATH_PSRIP -h | grep tiffg3" || cat<<EOF
+           capture "$PATH_PSRIP -h 2>&1 | grep tiffg3" || cat<<EOF
 
 WARNING, no tiffg3 driver in $PATH_PSRIP.
 

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 481b6d5749a8506480c0c3c5f0722c14e6f721b1..d987fad587b73c570be1fd28ba13a5de09889245 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -1282,7 +1282,7 @@ if onServer; then
     if [ -x "$PATH_PSRIP" ]; then
        if [ $PS = gs ]; then
            # verify Ghostscript was linked with the tiffg3 device driver
-           $PATH_PSRIP -h | grep tiffg3 >/dev/null 2>&1 || {
+           $PATH_PSRIP -h 2>&1 | grep tiffg3 >/dev/null 2>&1 || {
                cat >&2 <<EOF
 
 FATAL ERROR: No tiffg3 driver in $PATH_PSRIP.