[Bug 184] Problems building HylaFax 4.1 on Digital Unix 4.0F

Applied Lee's reformat of John's patch, which should go a long way towards
cleaning up Digital Unix builds. Great work John - thanks!
-dpn

diff --git a/configure b/configure
index b4978fba2c89e5871a418e53340688a7e3435551..6ee15b482a9e8fcad43bf90a59cee7c76341e541 100755 (executable)
--- a/configure
+++ b/configure
@@ -660,6 +660,7 @@ relativize()
 {
     echo `(for i do
        case "$i" in
+       -Wl*)                   echo "$i" ;;
        /*|-l*|-l[$]{DEPTH}/*)  echo "$i" ;;
        -L|-L/*|-L[$]{DEPTH}/*) echo "$i" ;;
        -I|-I/*|-I[$]{DEPTH}/*) echo "$i" ;;
@@ -2454,6 +2455,8 @@ BuildPortDotH()
         *-hpux11*)  # this is really broken, has a defined 
                     # socklen_t but does *not* use it
                 echo "#define CONFIG_HPUX_SOCKLEN_T_BRAINDAMAGE";;
+       *-osf4.0*)  # This clears up problems on Alpha, too...
+               echo "#define CONFIG_HPUX_SOCKLEN_T_BRAINDAMAGE";;
         *sysv4.2uw2*)  CONFIG_SOCKARGLENTYPE=size_t;;
         *-univel-*)    CONFIG_SOCKARGLENTYPE=size_t;;
         *-UnixWare*)   CONFIG_SOCKARGLENTYPE=size_t;;
@@ -2819,9 +2822,10 @@ BuildPortDotH()
        if CheckForIncludeFile utmpx.h; then
            case $TARGET in
            *-hpux10.20*)       UTMP=utmp;;
-           *-hpux11*)  UTMP=utmp;;
-           *-aix4*)    UTMP=utmp;;
-        *-linux*)      UTMP=utmp;;
+           *-hpux11*)          UTMP=utmp;;
+           *-aix4*)            UTMP=utmp;;
+           *-dec-osf4.0*)      UTMP=utmp;;
+           *-linux*)           UTMP=utmp;;
            *)                  UTMP=utmpx;;
            esac
        else
@@ -3438,6 +3442,7 @@ if [ -z "$DIR_SYSVINIT" ]; then
     case $TARGET in
        *-sunos*)       DIR_SYSVINITS="$DIR_SYSVINITS $DIR_SBIN";;
        *-hpux*)        DIR_SYSVINITS="/sbin/init.d $DIR_SYSVINITS";;
+       *-dec-osf4.0*)  DIR_SYSVINITS="/sbin/init.d $DIR_SYSVINITS";;
        *)              ;;
     esac
     DIR_SYSVINIT=

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index 7cbc92d4721cd1a4b17429d78683f7fe7b5ac076..d902a14aad02f8b6681a8b9655a4ded47ce400c0 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -766,7 +766,11 @@ Class1Modem::sendPage(TIFF* tif, const Class2Params& params, u_int pageChop, fxS
        uint32* stripbytecount;
        (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbytecount);
        tstrip_t strip;
-       uint32 totdata = 0;
+       #ifdef __alpha
+           u_long totdata = 0;
+       #else
+           uint32 totdata = 0;
+       #endif
        for (strip = 0; strip < nstrips; strip++)
            totdata += stripbytecount[strip];
        /*

diff --git a/faxd/Class2Send.c++ b/faxd/Class2Send.c++
index 1e54ee3ed8e5f2cb453be1713bd96fcdeafaae41..c03531a6748e150c5ec28923a3ebb0a9e355593b 100644 (file)
--- a/faxd/Class2Send.c++
+++ b/faxd/Class2Send.c++
@@ -372,7 +372,11 @@ Class2Modem::sendPageData(TIFF* tif, u_int pageChop)
        uint32* stripbytecount;
        (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbytecount);
        tstrip_t strip;
-       uint32 totdata = 0;
+       #ifdef __alpha
+           u_long totdata = 0;
+       #else
+           uint32 totdata = 0;
+       #endif
        for (strip = 0; strip < nstrips; strip++)
            totdata += stripbytecount[strip];
        /*