From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 17 Mar 2004 07:21:43 +0000 (+0000)
Subject: aix64-dont-build-on-aix4-20040317
X-Git-Tag: openafs-devel-1_3_60~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b0601bd700b74a76adaf8daa865cc47b4eead312;p=packages%2Fo%2Fopenafs.git

aix64-dont-build-on-aix4-20040317


don't build the 64 bit stuff on aix 4
---

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 56d509ec2..7feca7920 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -427,6 +427,7 @@ case $AFS_SYSNAME in
 		XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} -ldl"
 		SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+		AIX64="#"
 		;;
 
 	rs_aix51)
@@ -441,6 +442,7 @@ case $AFS_SYSNAME in
 		XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} -ldl"
 		SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+		AIX64=""
 		;;
 
 	s390_linux22)
@@ -790,6 +792,7 @@ fi
 AC_SUBST(CCXPG2)
 AC_SUBST(AFSD_LIBS)
 AC_SUBST(AFSD_LDFLAGS)
+AC_SUBST(AIX64)
 AC_SUBST(AR)
 AC_SUBST(AS)
 AC_SUBST(CP)
diff --git a/src/export/Makefile.in b/src/export/Makefile.in
index 1a3f41fb6..0412e1ea6 100644
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@@ -108,14 +108,14 @@ clean:
 ${DEST}/root.client/usr/vice/etc/dkload/export.ext: export.ext
 	${INSTALL} $? $@
 
-${DEST}/root.client/usr/vice/etc/dkload/export64.ext: export64.ext
-	${INSTALL} $? $@
+${DEST}/root.client/usr/vice/etc/dkload/export64.ext: @AIX64@export64.ext
+@AIX64@	${INSTALL} $? $@
 
 ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs: export.ext.nonfs
 	${INSTALL} $? $@
 
-${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs: export64.ext.nonfs
-	${INSTALL} $? $@
+${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs: @AIX64@export64.ext.nonfs
+@AIX64@	${INSTALL} $? $@
 
 ${DEST}/lib/afs/export.exp: export.exp
 	${INSTALL} $? $@
@@ -149,23 +149,23 @@ ${TOP_LIBDIR}/extras.exp: ${srcdir}/extras.exp
 ${DEST}/root.client/usr/vice/etc/dkload/cfgexport: cfgexport
 	${INSTALL} $? $@
 
-${DEST}/root.client/usr/vice/etc/dkload/cfgexport64: cfgexport64
-	${INSTALL} $? $@
+${DEST}/root.client/usr/vice/etc/dkload/cfgexport64: @AIX64@cfgexport64
+@AIX64@	${INSTALL} $? $@
 
-${DEST}/root.client/usr/vice/etc/dkload/cfgafs: cfgafs
-	${INSTALL} $? $@
+${DEST}/root.client/usr/vice/etc/dkload/cfgafs: @AIX64@cfgafs
+@AIX64@	${INSTALL} $? $@
 
-${DEST}/root.client/usr/vice/etc/dkload/cfgafs64: cfgafs64
-	${INSTALL} $? $@
+${DEST}/root.client/usr/vice/etc/dkload/cfgafs64: @AIX64@cfgafs64
+@AIX64@	${INSTALL} $? $@
 
 dest:    ${DEST}/root.client/usr/vice/etc/dkload/export.ext \
-	${DEST}/root.client/usr/vice/etc/dkload/export64.ext \
 	${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs \
 	${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs \
 	${DEST}/lib/afs/export.exp \
 	${DEST}/lib/afs/export64.exp \
 	${DEST}/lib/afs/extras.exp \
 	${DEST}/root.client/usr/vice/etc/dkload/cfgexport \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgexport64 \
 	${DEST}/root.client/usr/vice/etc/dkload/cfgafs \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgafs64
+	${DEST}/root.client/usr/vice/etc/dkload/export64.ext \
+	${DEST}/root.client/usr/vice/etc/dkload/cfgexport64 \
+	${DEST}/root.client/usr/vice/etc/dkload/cfgafs64