*** config-scripts/cups-directories.m4.orig	Tue Sep 18 09:58:06 2007
--- config-scripts/cups-directories.m4	Tue Sep 18 10:09:57 2007
***************
*** 101,115 ****
  
  dnl Fix "libdir" variable for IRIX 6.x...
  if test "$libdir" = "\${exec_prefix}/lib"; then
! 	if test "$uname" = "IRIX"; then
  		libdir="$exec_prefix/lib32"
! 	else
! 		if test "$uname" = Linux -a -d /usr/lib64; then
  			libdir="$exec_prefix/lib64"
- 		else
- 			libdir="$exec_prefix/lib"
  		fi
! 	fi
  fi
  
  dnl Setup init.d locations...
--- 101,120 ----
  
  dnl Fix "libdir" variable for IRIX 6.x...
  if test "$libdir" = "\${exec_prefix}/lib"; then
! 	case "$uname" in
! 	IRIX)
  		libdir="$exec_prefix/lib32"
! 		;;
! 	Linux)
! 		if test -d /usr/lib64; then
  			libdir="$exec_prefix/lib64"
  		fi
! 		;;
! 	HP-UX*)
! 		if test -d /usr/lib/hpux32; then
! 			libdir="$exec_prefix/lib/hpux32"
! 		;;
! 	esac
  fi
  
  dnl Setup init.d locations...
***************
*** 146,153 ****
  		HP-UX*)
  			INITDIR="/sbin"
  			RCLEVELS="2"
! 			RCSTART="620"
! 			RCSTOP="380"
  			;;
  
  		IRIX*)
--- 151,158 ----
  		HP-UX*)
  			INITDIR="/sbin"
  			RCLEVELS="2"
! 			RCSTART="380"
! 			RCSTOP="620"
  			;;
  
  		IRIX*)
*** config-scripts/cups-compiler.m4.orig	Mon Sep 17 15:38:11 2007
--- config-scripts/cups-compiler.m4	Mon Sep 17 15:39:22 2007
***************
*** 301,306 ****
--- 301,340 ----
  			if test $PICFLAG = 1; then
  				OPTIM="+z $OPTIM"
  			fi
+ 
+ 			if test "x$enable_32bit" = xyes; then
+ 				# Build 32-bit libraries, 64-bit base...
+ 				if test -z "$with_arch32flags"; then
+ 					ARCH32FLAGS="+DD32"
+ 				else
+ 					ARCH32FLAGS="$with_arch32flags"
+ 				fi
+ 
+ 				if test -z "$with_archflags"; then
+ 					if test -z "$with_arch64flags"; then
+ 						ARCHFLAGS="+DD64"
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+ 				fi
+ 			fi
+ 
+ 			if test "x$enable_64bit" = xyes; then
+ 				# Build 64-bit libraries, 32-bit base...
+ 				if test -z "$with_arch64flags"; then
+ 					ARCH64FLAGS="+DD64"
+ 				else
+ 					ARCH64FLAGS="$with_arch64flags"
+ 				fi
+ 
+ 				if test -z "$with_archflags"; then
+ 					if test -z "$with_arch32flags"; then
+ 						ARCHFLAGS="+DD32"
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+ 				fi
+ 			fi
  			;;
          	IRIX)
  			if test -z "$OPTIM"; then
