michael@34: Index: Configure
michael@34: --- Configure.orig	2008-04-15 15:24:36 +0200
michael@34: +++ Configure	2008-04-16 08:19:20 +0200
michael@34: @@ -413,7 +413,7 @@
michael@34:        fi	# }
michael@34:      fi	# }
michael@34:      LSOF_TGT="aix"
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@34:  
michael@34: @@ -567,7 +567,7 @@
michael@34:  
michael@34:  	    rm -f dialects/aix/aix5/j2/j2_snapshot.h
michael@34:  	  fi	# }
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  
michael@34: @@ -605,7 +605,7 @@
michael@34:        # This is AIX >= 5 on ia64.
michael@34:  
michael@34:  	LSOF_TSTK64=1
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  
michael@34: @@ -682,7 +682,7 @@
michael@34:  	  fi	# }
michael@34:  	  LSOF_TSTK64=1
michael@34:  	  LSOF_TMP1=1
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  	    LSOF_CFGF="$LSOF_CFGF -maix64"
michael@34: @@ -729,7 +729,7 @@
michael@34:      fi	#}
michael@34:      LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
michael@34:      LSOF_DIALECT_DIR=aix
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0 	# {
michael@34:      then
michael@34:  
michael@34: @@ -1995,7 +1995,7 @@
michael@34:  	fi	# }
michael@34:        fi	# }
michael@34:      fi	# }
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@34:        LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@34: @@ -2047,7 +2047,7 @@
michael@34:        then
michael@34:  	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
michael@34:        else
michael@34: -	echo $LSOF_CC | grep -q gcc
michael@34: +	$LSOF_CC --version | grep -q GCC
michael@34:  	if test $? -ne 0	# {
michael@34:  	then
michael@34:  	  LSOF_CFGF="$LSOF_CFGF +DD32"
michael@34: @@ -2127,7 +2127,7 @@
michael@34:  	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
michael@34:  	    echo "*                                       *"
michael@34:  	    echo "*****************************************"
michael@34: -	    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	    $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	    if test $? -eq 0	# {
michael@34:  	    then
michael@34:  
michael@34: @@ -2196,7 +2196,7 @@
michael@34:  	  else
michael@34:  	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
michael@34:  	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
michael@34: -	    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	    $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	    if test $? -ne 0	# {
michael@34:  	    then
michael@34:  	      LSOF_CFGF="$LSOF_CFGF +DAportable"
michael@34: @@ -3403,7 +3403,7 @@
michael@34:  	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@34:        fi	# }
michael@34:      fi	# }
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@34:        LSOF_CFGL="-w"
michael@34: @@ -4040,6 +4040,9 @@
michael@34:  	LSOF_TSTBIGF=" "
michael@34:  	LSOF_TSTLFLG="-lsocket -lnsl"
michael@34:  	LSOF_VERS="100000"
michael@34: + 	if [ ".`isainfo -k`" = .amd64 ]; then
michael@34: + 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
michael@34: + 	fi
michael@34:  	;;
michael@34:        *)
michael@34:  	echo Unknown Solaris version: $LSOF_VSTR
michael@34: @@ -4118,7 +4121,7 @@
michael@34:  	echo "main(){" >> ${LSOF_TMPC}.c
michael@34:  	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
michael@34:  	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
michael@34: @@ -4143,7 +4146,7 @@
michael@34:  	echo "main(){" >> ${LSOF_TMPC}.c
michael@34:  	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
michael@34:  	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@34: @@ -4173,7 +4176,7 @@
michael@34:  	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  
michael@34: @@ -4377,7 +4380,7 @@
michael@34:  
michael@34:        # Check for Solaris 10 or higher ZFS.
michael@34:  
michael@34: -      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
michael@34: +      if false	# {
michael@34:        then
michael@34:  	LSOF_TMP1="dmu.h zfs_acl.h zfs_debug.h zfs_rlock.h zil.h spa.h zfs_context.h zfs_dir.h zfs_vfsops.h zio.h txg.h zfs_ctldir.h zfs_ioctl.h zfs_znode.h zio_impl.h"
michael@34:  	LSOF_TMP2=""
michael@34: @@ -4460,7 +4463,7 @@
michael@34:        echo "main(){" >> ${LSOF_TMPC}.c
michael@34:        echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
michael@34:        echo "Testing vnode.h for VSOCK, using $LSOF_CC"
michael@34: -      echo $LSOF_CC | grep gcc > /dev/null
michael@34: +      $LSOF_CC --version | grep GCC > /dev/null
michael@34:        if test $? -eq 0	# {
michael@34:        then
michael@34:  	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@34: @@ -5139,7 +5142,7 @@
michael@34:      echo "$i" >> $LSOF_TSTCFLG
michael@34:    done	# }
michael@34:  fi	# }
michael@34: -echo $LSOF_CC | grep gcc > /dev/null 2>&1
michael@34: +$LSOF_CC --version | grep GCC > /dev/null 2>&1
michael@34:  if test $? -eq 0	# {
michael@34:  then
michael@34:    echo "-DLT_GCC" >> $LSOF_TSTCFLG
michael@34: Index: dialects/freebsd/machine.h
michael@34: --- dialects/freebsd/machine.h.orig	2006-03-28 01:29:14 +0200
michael@34: +++ dialects/freebsd/machine.h	2008-04-16 08:17:46 +0200
michael@34: @@ -436,6 +436,11 @@
michael@34:   */
michael@34:  
michael@34:  /* #define	HASSECURITY	1 */
michael@34: +#if    FREEBSDV>=6000
michael@34: +#define        HASSECURITY     1
michael@34: +#define        HAS_SI_PRIV     1
michael@34: +#endif /* FREEBSDV>=6000 */
michael@34: +
michael@34:  
michael@34:  
michael@34:  /*
michael@34: Index: dialects/sun/machine.h
michael@34: --- dialects/sun/machine.h.orig	2007-04-24 18:23:25 +0200
michael@34: +++ dialects/sun/machine.h	2008-04-16 08:17:46 +0200
michael@34: @@ -75,6 +75,7 @@
michael@34:  #include <sys/poll.h>
michael@34:  
michael@34:  # if	solaris>=80000
michael@34: +#include <sys/types32.h>
michael@34:  #include <sys/wait.h>
michael@34:  #include <sys/types32.h>
michael@34:  #define	_KERNEL	1