From 20d9017ac7580f0ecd39bceee66bd5dccfa8cf3c Mon Sep 17 00:00:00 2001
From: braam <braam>
Date: Mon, 21 Oct 2002 07:03:25 +0000
Subject: [PATCH] - fix to deal with other versions of automake.... :(

---
 lustre/Makefile.am     |  5 -----
 lustre/archdep.m4      |  8 +++++++-
 lustre/mds/Makefile.am | 12 +++---------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 59411e7762..ffaf6c4551 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,11 +5,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-if LINUX25
-DIRS24 = mds
-else
-DIRS24 = extN mds
-endif
 
 # NOTE: keep extN before mds
 SUBDIRS = lov utils obdclass ldlm ptlrpc lib obdecho mdc osc ost llite 
diff --git a/lustre/archdep.m4 b/lustre/archdep.m4
index 3a031ed072..0ae4905646 100644
--- a/lustre/archdep.m4
+++ b/lustre/archdep.m4
@@ -1,12 +1,18 @@
 AC_MSG_CHECKING(if you are running linux 2.5...)
 if test -e $LINUX/include/linux/namei.h ; then
 	linux25=yes
+        DIRS24="mds"
+        FSMOD="mds_ext3"
 	AC_MSG_RESULT(yes)
 else
 	linux25=no
+        DIRS24="mds extN"
+        FSMOD="mds_extN"
 	AC_MSG_RESULT(no)
 fi
-AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
+AC_SUBST(DIRS24)
+AC_SUBST(FSMOD)
+## AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
 
 AC_MSG_CHECKING(if you are running user mode linux for $host_alias..)
 if test -e $LINUX/include/asm-um ; then
diff --git a/lustre/mds/Makefile.am b/lustre/mds/Makefile.am
index 24fdd571c3..33d3ecee00 100644
--- a/lustre/mds/Makefile.am
+++ b/lustre/mds/Makefile.am
@@ -5,17 +5,11 @@
 
 DEFS= 
 
-if LINUX25
-FSMOD = mds_ext3
-else
-FSMOD = mds_extN
-endif
-
-
+MODS=@FSMOD@
 
 MODULE = mds
-modulefs_DATA = mds.o $(FSMOD).o
-EXTRA_PROGRAMS = mds $(FSMOD)
+modulefs_DATA = mds.o $(MODS).o
+EXTRA_PROGRAMS = mds $(MODS)
 
 LINX= mds_updates.c simple.c ll_pack.c lov_pack.c target.c
 
-- 
GitLab