From: Benjamin Kaduk <kaduk@mit.edu>
Date: Wed, 18 Mar 2015 17:17:59 +0000 (-0400)
Subject: Remove osconf conditionals for linux24
X-Git-Tag: upstream/1.8.0_pre1^2~337
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7a998206127e03e48837380063566a464321604b;p=packages%2Fo%2Fopenafs.git

Remove osconf conditionals for linux24

They are no longer triggerable now that linux 2.4 is desupported,
so make the code easier to read.

Change-Id: I77b48d30db66b635cfdc06e977f9884dd2825713
Reviewed-on: http://gerrit.openafs.org/11800
Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
Reviewed-by: Chas Williams <3chas3@gmail.com>
Reviewed-by: Daria Brashear <shadow@your-file-system.com>
Tested-by: Daria Brashear <shadow@your-file-system.com>
---

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 9c81263ee..ec8804816 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -201,7 +201,7 @@ case $AFS_SYSNAME in
 		XCFLAGS="-pipe"
 		;;
 
-	ia64_linux24|ia64_linux26)
+	ia64_linux26)
 		KERN_OPTMZ=-O2
 		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
@@ -223,7 +223,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} -shared"
 		;;
 
-	ppc64_linux24 | ppc64_linux26)
+	ppc64_linux26)
 		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
@@ -249,7 +249,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} -shared"
 		;;
 
-	i386_umlinux22 | i386_umlinux24 | i386_umlinux26)
+	i386_umlinux26)
 		MT_CFLAGS='-pthread -D_REENTRANT'
 		DBG=-g
 		LWP_DBG=-g
@@ -275,16 +275,6 @@ case $AFS_SYSNAME in
 		XCFLAGS=
 		;;
 
-	parisc_linux24)
-		KERN_OPTMZ=-O2
-		MT_CFLAGS='-pthread -D_REENTRANT'
-		PAM_OPTMZ=-O2
-		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-		SHLIB_CFLAGS="-fPIC"
-		SHLIB_LDFLAGS="-shared -Xlinker -x"
-		SHLIB_LINKER="${CC} -shared"
-		;;
-
 	ppc_darwin_70)
 		CC="cc"
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
@@ -422,7 +412,7 @@ case $AFS_SYSNAME in
 		AIX64="yes"
 		;;
 
-	s390_linux22|s390_linux24|s390_linux26)
+	s390_linux26)
 		LD="ld"
 		KERN_OPTMZ=-O2
 		MT_CFLAGS='-pthread -D_REENTRANT'
@@ -433,7 +423,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} -shared"
 		;;
 
-	s390x_linux24|s390x_linux26)
+	s390x_linux26)
 		CCOBJ="\$(CC) -fPIC"
 		LD="ld"
 		KERN_OPTMZ=-O2