(tim) [configure config.site] change default spool dir to hylafax.

	Break up VAR2 to help out sed on HP (thanks to Alan O'Keefe
	<aokeefe@primus.com.au> for testing)
	[faxd/ModemServer.c++] add additional reset to ModemServer::setupModem
	sugested by Bernd Proissl <lists@proissl.de>

diff --git a/CHANGES b/CHANGES
index 868219b84064cc46bfd326028fce8b2186ca6c28..de67fde27ced3a32d04c38e53c7e7cdb5341debd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+May 29, 2001
+  (tim) [configure config.site] change default spool dir to hylafax.
+       Break up VAR2 to help out sed on HP (thanks to Alan O'Keefe
+       <aokeefe@primus.com.au> for testing)
+       [faxd/ModemServer.c++] add additional reset to ModemServer::setupModem
+       sugested by Bernd Proissl <lists@proissl.de>
+
 May 27, 2001
  (tim) [pkg/Makefile.in make.links make_proto.sh.in cproto.stub.in
        sproto.stub.in] "make package" fixes

diff --git a/config.site b/config.site
index adfe37db5e2706b13b7fd9b21dfa2dd916599b0a..b3163f6dfbc7de54790c89d859dc2c6ebf0a1cb8 100644 (file)
--- a/config.site
+++ b/config.site
@@ -60,7 +60,7 @@
 #DIR_LIBDATA="/usr/lib/fax"            # directory for client data
 #DIR_LIBEXEC="/usr/lib/fax"            # directory for libraries&hidden apps
 #DIR_MAN="/usr/local/man"              # directory for manual pages
-#DIR_SPOOL="/var/spool/fax"            # directory for spooling area
+#DIR_SPOOL="/var/spool/hylafax"                # directory for spooling area
 #DIR_SBIN="/var/spool/fax/bin"         # directory for system apps
 #DIR_LOCKS="/usr/spool/locks"          # directory for UUCP lock files
 #FONTMAP="/usr/share/ghostscript/3.33" # directorys containing Fontmap files

diff --git a/configure b/configure
index eb9a3fe22ec7f4ea6095f2b8951044c596b8e1d3..d27c271f7fce1409b4defbe10d6ef161cab8560e 100755 (executable)
--- a/configure
+++ b/configure
@@ -41,7 +41,7 @@ DIR_BIN=/usr/local/bin
 DIR_SBIN=/usr/local/sbin
 DIR_LIBDATA=/usr/local/lib/fax
 DIR_LIBEXEC=$DIR_SBIN
-DIR_SPOOL=/var/spool/fax
+DIR_SPOOL=/var/spool/hylafax
 DIR_HTML=/var/httpd/htdocs/hylafax
 DIR_CGI=/var/httpd/cgi-bin
 PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
@@ -177,8 +177,9 @@ LIBZ
 LIBDB
 LLDOPTS
 LN
-LN_S
-MACHDEPLIBS
+LN_S"
+
+VAR3="MACHDEPLIBS
 MAKEDSOINCLUDE
 MAN
 MANDIR DIR_MAN
@@ -244,7 +245,7 @@ dumpvars()
 }
 dumpvals()
 {
-    (echo "$VAR1"; echo "$VAR2") |
+    (echo "$VAR1"; echo "$VAR2" ; echo "$VAR3") |
        while read a b; do eval c=\$${b:-$a}; echo "${b:-$a}='$c'"; done
 }
 
@@ -668,6 +669,7 @@ JUNK="
     conffifo
     confsed1
     confsed2
+    confsed3
     conftestmmap
     confx confy
     confMakefile
@@ -1337,7 +1339,8 @@ makeDefs()
     WARNING="Warning, this file was automatically created by the HylaFAX configure script"
     dumpvars "$VAR1" CCOMPILER CXXCOMPILER | sort>confsed1
     dumpvars "$VAR2" CCOMPILER CXXCOMPILER | sort>confsed2
-    $RM xdefs; sed -f confsed1 $SRCDIR/defs.in | sed -f confsed2 >$1
+    dumpvars "$VAR3" CCOMPILER CXXCOMPILER | sort>confsed3
+    $RM xdefs; sed -f confsed1 $SRCDIR/defs.in | sed -f confsed2 | sed -f confsed3 >$1
 }
 
 # NB: save original values for use in checks below
@@ -4465,7 +4468,7 @@ SedConfigFiles()
            # the comparison (this assumes dates are used in lines
            # of the form DATE: @DATE@).
            #
-           $RM $F.new; $SED -f confsed1 $SRCDIR/$F.in | $SED -f confsed2 > $F.new
+           $RM $F.new; $SED -f confsed1 $SRCDIR/$F.in | $SED -f confsed2 | $SED -f confsed3 > $F.new
            $RM confx; $SED '/DATE:/d' $F.new >confx
            $RM confy; $SED '/DATE:/d' $F >confy 2>/dev/null
            if cmp -s confx confy >/dev/null 2>&1; then
@@ -4476,14 +4479,14 @@ SedConfigFiles()
            fi
        else
            Note "Creating $F from $SRCDIR/$F.in"
-           if $SED -f confsed1 $SRCDIR/$F.in  | $SED -f confsed2 >$F.new; then
+           if $SED -f confsed1 $SRCDIR/$F.in | $SED -f confsed2 | $SED -f confsed3 >$F.new; then
                $RM $F; $MV $F.new $F; $CHMOD 444 $F
            else
                cat 1>&2 <<EOF
 Help, there was a problem crafting $F from $F.in.
 The command:
 
-    $SED -f confsed1 $SRCDIR/$F.in | $SED -f confsed2 >$F.new
+    $SED -f confsed1 $SRCDIR/$F.in | $SED -f confsed2 | $SED -f confsed3 >$F.new
 
 failed.  Aborting without cleaning up files so you can take a look...
 EOF

diff --git a/faxd/ModemServer.c++ b/faxd/ModemServer.c++
index 4b1c6ec8fa51584cebc93543cf5a6bdc2bd5c8fb..298d7cf71ddd2563fbe1ea01468d1a39c8f3eccc 100644 (file)
--- a/faxd/ModemServer.c++
+++ b/faxd/ModemServer.c++
@@ -471,7 +471,7 @@ ModemServer::setupModem()
         * Reset the modem in case some other program
         * went in and messed with the configuration.
         */
-        if( !modem->reset() )
+        if( !(modem->reset() || modem->reset()) )      // try twice
             return (false);
     /*
      * Most modem-related parameters are dealt with