Remove osconf conditionals for linux24

[openafs.git] / src / cf / osconf.m4

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 29e1c8e..ec88048 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -182,7 +182,7 @@ case $AFS_SYSNAME in
                XCFLAGS="-O2 -pipe -fPIC"
                ;;
 
-       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
+       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd7*)
                MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
@@ -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"
@@ -292,8 +282,7 @@ case $AFS_SYSNAME in
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               REGEX_OBJ_PIC="regex_pic.o"
+               REGEX_OBJ="regex.lo"
                XCFLAGS="-no-cpp-precomp"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
@@ -310,8 +299,7 @@ case $AFS_SYSNAME in
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
-               REGEX_OBJ="regex.o"
-               REGEX_OBJ_PIC="regex_pic.o"
+               REGEX_OBJ="regex.lo"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
@@ -328,8 +316,7 @@ case $AFS_SYSNAME in
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
-               REGEX_OBJ="regex.o"
-               REGEX_OBJ_PIC="regex_pic.o"
+               REGEX_OBJ="regex.lo"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
@@ -348,7 +335,7 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                PAM_LIBS="-lpam"
-               REGEX_OBJ="regex.o"
+               REGEX_OBJ="regex.lo"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${CC} -dynamiclib"
@@ -357,7 +344,7 @@ case $AFS_SYSNAME in
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       *_darwin_100 | *_darwin_110 | *_darwin_120 )
+       *_darwin_100 | *_darwin_110 | *_darwin_120 | *_darwin_130 | *_darwin_140 )
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
                MT_CFLAGS="-D_REENTRANT"
                MT_LIBS='${XLIBS}'
@@ -368,8 +355,7 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                PAM_LIBS="-lpam"
-               REGEX_OBJ="regex.o"
-               REGEX_OBJ_PIC="regex_pic.o"
+               REGEX_OBJ="regex.lo"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
@@ -426,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'
@@ -437,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
@@ -512,24 +498,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sun4x_58|sun4x_59)
-               CC=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=v9'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
-       sun4x_510)
+       sun4x_5*)
                CC=$SOLARISCC
                LD="/usr/ccs/bin/ld"
                MT_CFLAGS='-mt'
@@ -546,54 +515,29 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-g"
                ;;
 
-       sun4x_511)
-               CC=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=v9'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
-       sunx86_58|sunx86_59)
-               CC=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               ;;
+       sunx86_5*)
+               case $AFS_SYSNAME in
+                       sunx86_58|sunx86_59)
+                               XARCHFLAGS=""
+                               ;;
+                       *)
+                               if test "x`echo "${ARCHFLAGS}" | grep m32`" != "x" ; then
+                                       CURRENTBUILDARCH=i386
+                               fi
+                               if test "x`echo "${ARCHFLAGS}" | grep m64`" != "x" ; then
+                                       CURRENTBUILDARCH=amd64
+                               fi
+                               if test "x${CURRENTBUILDARCH}" = "x" ; then
+                                       CURRENTBUILDARCH=`isainfo -k`
+                               fi
+                               if test "${CURRENTBUILDARCH}" = "amd64" ; then
+                                       XARCHFLAGS="-m64"
+                               fi
+                               ;;
+               esac
 
-       sunx86_510|sunx86_511)
-               if test "x`echo "${ARCHFLAGS}" | grep m32`" != "x" ; then
-                       CURRENTBUILDARCH=i386
-               fi
-               if test "x`echo "${ARCHFLAGS}" | grep m64`" != "x" ; then
-                       CURRENTBUILDARCH=amd64
-               fi
-               if test "x${CURRENTBUILDARCH}" = "x" ; then
-                       CURRENTBUILDARCH=`isainfo -k`
-               fi
-               if test "${CURRENTBUILDARCH}" = "amd64" ; then
-                       XARCHFLAGS="-m64"
-               fi
                CC=$SOLARISCC
-               CFLAGS="$CFLAGS $XARCHFLAGS"
+               CFLAGS="$CFLAGS ${XARCHFLAGS}"
                LD="/usr/ccs/bin/ld"
                MT_CFLAGS='-mt'
                PAM_CFLAGS="-KPIC"
@@ -609,7 +553,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} ${XCFLAGS} -G -z text"
+               SHLIB_LINKER="${CC} ${XARCHFLAGS} -G -dy -Bsymbolic -z text"
                ;;
 
 esac
@@ -767,7 +711,6 @@ AC_SUBST(PAM_DBG)
 AC_SUBST(PAM_OPTMZ)
 AC_SUBST(RANLIB)
 AC_SUBST(REGEX_OBJ)
-AC_SUBST(REGEX_OBJ_PIC)
 AC_SUBST(RM)
 AC_SUBST(RXDEBUG)
 AC_SUBST(SHLIB_CFLAGS)