- fix a variety of midnight PST build problems...

 - include portalsconf into archdep to get Nikke' NALs to build.
 - move a LIBLUSTRE test to archdep for Eric

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 0315644..1703762 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -52,6 +52,7 @@ case ${host_cpu} in
        AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -Wall '
        KCPPFLAGS='-D__arch_lib__ '
+       libdir='${exec_prefix}/lib/lustre'
         MOD_LINK=elf_i386
 ;;
        um )
@@ -189,18 +190,112 @@ if test $host_cpu != "lib" ; then
   fi
 fi
 
-# ---------- SMP -------------------
-#AC_MSG_CHECKING(for SMP)
-#if egrep -e SMP=y $LINUX/.config >/dev/null 2>&1; then
-#        SMPFLAG=
-#        AC_MSG_RESULT(yes)
+# ---------- Portals flags --------------------
+
+#AC_PREFIX_DEFAULT([])
+#if test "x$prefix" = xNONE || test "x$prefix" = x; then
+#  usrprefix=/usr
 #else
-#        SMPFLAG=
-#        AC_MSG_RESULT(no)
+#  usrprefix='${prefix}'
 #fi
+#AC_SUBST(usrprefix)
+
+AC_MSG_CHECKING(if kernel has CPU affinity support)
+if test "$target_cpu" != ia64 ; then
+  enable_affinity_temp="-DCPU_AFFINITY=1"
+  AC_MSG_RESULT(yes)
+else
+  enable_affinity_temp=""
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(if kernel has zero-copy TCP support)
+ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
+if test "$ZCCD" != 0 ; then
+  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
+  AC_MSG_RESULT(yes)
+else
+  enable_zerocopy_temp=""
+  AC_MSG_RESULT(no)
+fi
+
+AC_ARG_ENABLE(zerocopy, [  --enable-zerocopy enable socknal zerocopy],enable_zerocopy="-DSOCKNAL_ZC=1", enable_zercopy=$enable_zerocopy_temp)
+
+AC_ARG_ENABLE(affinity, [  --enable-affinity enable process/irq affinity],enable_affinity="-DCPU_AFFINITY=1", enable_affinity=$enable_affinity_temp)
+#####################################
+
+AC_MSG_CHECKING(if quadrics kernel headers are present)
+if test -d $LINUX/drivers/net/qsnet ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/net/qsnet/include"
+  :
+elif test -d $LINUX/drivers/qsnet1 ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
+  :
+elif test -d $LINUX/drivers/quadrics ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
+  :
+#elif test -d /usr/include/elan3 ; then
+#  AC_MSG_RESULT(yes)
+#  QSWNAL="qswnal"
+#  with_quadrics=""
+#  :
+else
+  AC_MSG_RESULT(no)
+  QSWNAL=""
+  with_quadrics=""
+  :
+fi
+AC_SUBST(with_quadrics)
+AC_SUBST(QSWNAL)
+
+# R. Read 5/02
+GMNAL=""
+echo "checking with-gm=" ${with_gm}
+if test "${with_gm+set}" = set; then
+  if test "${with_gm}" = yes; then
+    with_gm="-I/usr/local/gm/include"
+  else
+    with_gm=-I"$with_gm/include"
+  fi
+  GMNAL="gmnal"
+else
+# default case - no GM
+  with_gm=""
+fi
+AC_SUBST(with_gm)
+AC_SUBST(GMNAL)
+
+
+def_scamac=/opt/scali/include
+AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
+AC_MSG_CHECKING(if ScaMAC headers are present)
+if test "$with_scamac" = yes; then
+  with_scamac=$def_scamac
+fi
+if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
+  AC_MSG_RESULT(yes)
+  SCIMACNAL="scimacnal"
+  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
+else
+  AC_MSG_RESULT(no)
+  SCIMACNAL=""
+  with_scamac=""
+fi
+
+AC_SUBST(with_scamac)
+AC_SUBST(SCIMACNAL)
 
 CFLAGS="$KCFLAGS"
-CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS "
+CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm $with_scamac "
 
 AC_SUBST(MOD_LINK)
-AC_SUBST(LINUX25)
\ No newline at end of file
+AC_SUBST(LINUX25)
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
+
+

diff --git a/lnet/build.m4 b/lnet/build.m4
index 4e8dbbb..025f243 100644 (file)
--- a/lnet/build.m4
+++ b/lnet/build.m4
@@ -1,5 +1,4 @@
-
-# ----------  directories ---------
+# ----------  other tests and settings ---------
 
 
 # ---------  unsigned long long sane? -------
@@ -94,15 +93,3 @@ fi
 AC_SUBST(LIBEFENCE)
 AC_SUBST(HAVE_LIBEFENCE)
 
-AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
-AC_MSG_CHECKING(if you are building lib lustre)
-if test "$host_cpu" = "lib"; then
-   AC_MSG_RESULT(yes)
-   libdir='${exec_prefix}/lib/lustre'
-else
-   AC_MSG_RESULT(no)
-fi
-
-# end -------- Kernel build environment. -----------------
-
-

diff --git a/lnet/configure.in b/lnet/configure.in
index 2ee86b2..c7119c3 100644 (file)
--- a/lnet/configure.in
+++ b/lnet/configure.in
@@ -13,7 +13,6 @@ AM_INIT_AUTOMAKE(portals, builtin([esyscmd], [sed -ne '/.*define IVERSION /{ s/.
 
 sinclude(build.m4)
 sinclude(archdep.m4)
-sinclude(portalsconf.m4)
 
 if test x$enable_inkernel = xyes ; then
 cp Kernelenv.mk Kernelenv.in

diff --git a/lnet/portalsconf.m4 b/lnet/portalsconf.m4
deleted file mode 100644 (file)
index 7bd3919..0000000
--- a/lnet/portalsconf.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-AC_PREFIX_DEFAULT([])
-if test "x$prefix" = xNONE || test "x$prefix" = x; then
-  usrprefix=/usr
-else
-  usrprefix='${prefix}'
-fi
-AC_SUBST(usrprefix)
-
-AC_ARG_ENABLE(rtscts-myrinet, [ --enable-rtscts-myrinet enable rtscts over myrinet support])
-AM_CONDITIONAL(RTSCTS_MYRINET, test "$enable_rtscts_myrinet" = yes)
-
-
-CPLANT_ARCH=${target_cpu}
-case ${CPLANT_ARCH} in
-alpha*)
-  RTSCTSLIB_CFLAGS='-O4 -mno-fp-regs'
-  RTSCTSLIB_DEFS=-Ddec_linux
-  ;;
-i*86)
-  RTSCTSLIB_CFLAGS=-O4
-  RTSCTSLIB_DEFS=-Dintel_linux
-  ;;
-#*)
-#  AC_MSG_ERROR([Unrecognized architecture '$CPLANT_ARCH' for rtscts])
-#  ;;
-esac
-AC_SUBST(CPLANT_ARCH)
-AC_SUBST(RTSCTSLIB_CFLAGS)
-AC_SUBST(RTSCTSLIB_DEFS)
-
-AC_MSG_CHECKING(if kernel has CPU affinity support)
-if test "$target_cpu" != ia64 ; then
-  enable_affinity_temp="-DCPU_AFFINITY=1"
-  AC_MSG_RESULT(yes)
-else
-  enable_affinity_temp=""
-  AC_MSG_RESULT(no)
-fi
-AC_MSG_CHECKING(if kernel has zero-copy TCP support)
-ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
-if test "$ZCCD" != 0 ; then
-  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
-  AC_MSG_RESULT(yes)
-else
-  enable_zerocopy_temp=""
-  AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(zerocopy, [  --enable-zerocopy enable socknal zerocopy],enable_zerocopy="-DSOCKNAL_ZC=1", enable_zercopy=$enable_zerocopy_temp)
-
-AC_ARG_ENABLE(affinity, [  --enable-affinity enable process/irq affinity],enable_affinity="-DCPU_AFFINITY=1", enable_affinity=$enable_affinity_temp)
-#####################################
-
-AC_MSG_CHECKING(if quadrics kernel headers are present)
-if test -d $LINUX/drivers/net/qsnet ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/net/qsnet/include"
-  :
-elif test -d $LINUX/drivers/qsnet1 ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
-  :
-elif test -d $LINUX/drivers/quadrics ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
-  :
-#elif test -d /usr/include/elan3 ; then
-#  AC_MSG_RESULT(yes)
-#  QSWNAL="qswnal"
-#  with_quadrics=""
-#  :
-else
-  AC_MSG_RESULT(no)
-  QSWNAL=""
-  with_quadrics=""
-  :
-fi
-AC_SUBST(with_quadrics)
-AC_SUBST(QSWNAL)
-
-# R. Read 5/02
-GMNAL=""
-echo "checking with-gm=" ${with_gm}
-if test "${with_gm+set}" = set; then
-  if test "${with_gm}" = yes; then
-    with_gm="-I/usr/local/gm/include"
-  else
-    with_gm=-I"$with_gm/include"
-  fi
-  GMNAL="gmnal"
-else
-# default case - no GM
-  with_gm=""
-fi
-AC_SUBST(with_gm)
-AC_SUBST(GMNAL)
-
-
-def_scamac=/opt/scali/include
-AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
-AC_MSG_CHECKING(if ScaMAC headers are present)
-if test "$with_scamac" = yes; then
-  with_scamac=$def_scamac
-fi
-if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
-  AC_MSG_RESULT(yes)
-  SCIMACNAL="scimacnal"
-  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
-else
-  AC_MSG_RESULT(no)
-  SCIMACNAL=""
-  with_scamac=""
-fi
-AC_SUBST(with_scamac)
-AC_SUBST(SCIMACNAL)

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index 0315644..1703762 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -52,6 +52,7 @@ case ${host_cpu} in
        AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -Wall '
        KCPPFLAGS='-D__arch_lib__ '
+       libdir='${exec_prefix}/lib/lustre'
         MOD_LINK=elf_i386
 ;;
        um )
@@ -189,18 +190,112 @@ if test $host_cpu != "lib" ; then
   fi
 fi
 
-# ---------- SMP -------------------
-#AC_MSG_CHECKING(for SMP)
-#if egrep -e SMP=y $LINUX/.config >/dev/null 2>&1; then
-#        SMPFLAG=
-#        AC_MSG_RESULT(yes)
+# ---------- Portals flags --------------------
+
+#AC_PREFIX_DEFAULT([])
+#if test "x$prefix" = xNONE || test "x$prefix" = x; then
+#  usrprefix=/usr
 #else
-#        SMPFLAG=
-#        AC_MSG_RESULT(no)
+#  usrprefix='${prefix}'
 #fi
+#AC_SUBST(usrprefix)
+
+AC_MSG_CHECKING(if kernel has CPU affinity support)
+if test "$target_cpu" != ia64 ; then
+  enable_affinity_temp="-DCPU_AFFINITY=1"
+  AC_MSG_RESULT(yes)
+else
+  enable_affinity_temp=""
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(if kernel has zero-copy TCP support)
+ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
+if test "$ZCCD" != 0 ; then
+  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
+  AC_MSG_RESULT(yes)
+else
+  enable_zerocopy_temp=""
+  AC_MSG_RESULT(no)
+fi
+
+AC_ARG_ENABLE(zerocopy, [  --enable-zerocopy enable socknal zerocopy],enable_zerocopy="-DSOCKNAL_ZC=1", enable_zercopy=$enable_zerocopy_temp)
+
+AC_ARG_ENABLE(affinity, [  --enable-affinity enable process/irq affinity],enable_affinity="-DCPU_AFFINITY=1", enable_affinity=$enable_affinity_temp)
+#####################################
+
+AC_MSG_CHECKING(if quadrics kernel headers are present)
+if test -d $LINUX/drivers/net/qsnet ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/net/qsnet/include"
+  :
+elif test -d $LINUX/drivers/qsnet1 ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
+  :
+elif test -d $LINUX/drivers/quadrics ; then
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
+  :
+#elif test -d /usr/include/elan3 ; then
+#  AC_MSG_RESULT(yes)
+#  QSWNAL="qswnal"
+#  with_quadrics=""
+#  :
+else
+  AC_MSG_RESULT(no)
+  QSWNAL=""
+  with_quadrics=""
+  :
+fi
+AC_SUBST(with_quadrics)
+AC_SUBST(QSWNAL)
+
+# R. Read 5/02
+GMNAL=""
+echo "checking with-gm=" ${with_gm}
+if test "${with_gm+set}" = set; then
+  if test "${with_gm}" = yes; then
+    with_gm="-I/usr/local/gm/include"
+  else
+    with_gm=-I"$with_gm/include"
+  fi
+  GMNAL="gmnal"
+else
+# default case - no GM
+  with_gm=""
+fi
+AC_SUBST(with_gm)
+AC_SUBST(GMNAL)
+
+
+def_scamac=/opt/scali/include
+AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
+AC_MSG_CHECKING(if ScaMAC headers are present)
+if test "$with_scamac" = yes; then
+  with_scamac=$def_scamac
+fi
+if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
+  AC_MSG_RESULT(yes)
+  SCIMACNAL="scimacnal"
+  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
+else
+  AC_MSG_RESULT(no)
+  SCIMACNAL=""
+  with_scamac=""
+fi
+
+AC_SUBST(with_scamac)
+AC_SUBST(SCIMACNAL)
 
 CFLAGS="$KCFLAGS"
-CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS "
+CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm $with_scamac "
 
 AC_SUBST(MOD_LINK)
-AC_SUBST(LINUX25)
\ No newline at end of file
+AC_SUBST(LINUX25)
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
+
+

diff --git a/lustre/portals/build.m4 b/lustre/portals/build.m4
index 4e8dbbb..025f243 100644 (file)
--- a/lustre/portals/build.m4
+++ b/lustre/portals/build.m4
@@ -1,5 +1,4 @@
-
-# ----------  directories ---------
+# ----------  other tests and settings ---------
 
 
 # ---------  unsigned long long sane? -------
@@ -94,15 +93,3 @@ fi
 AC_SUBST(LIBEFENCE)
 AC_SUBST(HAVE_LIBEFENCE)
 
-AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
-AC_MSG_CHECKING(if you are building lib lustre)
-if test "$host_cpu" = "lib"; then
-   AC_MSG_RESULT(yes)
-   libdir='${exec_prefix}/lib/lustre'
-else
-   AC_MSG_RESULT(no)
-fi
-
-# end -------- Kernel build environment. -----------------
-
-

diff --git a/lustre/portals/configure.in b/lustre/portals/configure.in
index 2ee86b2..c7119c3 100644 (file)
--- a/lustre/portals/configure.in
+++ b/lustre/portals/configure.in
@@ -13,7 +13,6 @@ AM_INIT_AUTOMAKE(portals, builtin([esyscmd], [sed -ne '/.*define IVERSION /{ s/.
 
 sinclude(build.m4)
 sinclude(archdep.m4)
-sinclude(portalsconf.m4)
 
 if test x$enable_inkernel = xyes ; then
 cp Kernelenv.mk Kernelenv.in

diff --git a/lustre/portals/portalsconf.m4 b/lustre/portals/portalsconf.m4
deleted file mode 100644 (file)
index 7bd3919..0000000
--- a/lustre/portals/portalsconf.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-AC_PREFIX_DEFAULT([])
-if test "x$prefix" = xNONE || test "x$prefix" = x; then
-  usrprefix=/usr
-else
-  usrprefix='${prefix}'
-fi
-AC_SUBST(usrprefix)
-
-AC_ARG_ENABLE(rtscts-myrinet, [ --enable-rtscts-myrinet enable rtscts over myrinet support])
-AM_CONDITIONAL(RTSCTS_MYRINET, test "$enable_rtscts_myrinet" = yes)
-
-
-CPLANT_ARCH=${target_cpu}
-case ${CPLANT_ARCH} in
-alpha*)
-  RTSCTSLIB_CFLAGS='-O4 -mno-fp-regs'
-  RTSCTSLIB_DEFS=-Ddec_linux
-  ;;
-i*86)
-  RTSCTSLIB_CFLAGS=-O4
-  RTSCTSLIB_DEFS=-Dintel_linux
-  ;;
-#*)
-#  AC_MSG_ERROR([Unrecognized architecture '$CPLANT_ARCH' for rtscts])
-#  ;;
-esac
-AC_SUBST(CPLANT_ARCH)
-AC_SUBST(RTSCTSLIB_CFLAGS)
-AC_SUBST(RTSCTSLIB_DEFS)
-
-AC_MSG_CHECKING(if kernel has CPU affinity support)
-if test "$target_cpu" != ia64 ; then
-  enable_affinity_temp="-DCPU_AFFINITY=1"
-  AC_MSG_RESULT(yes)
-else
-  enable_affinity_temp=""
-  AC_MSG_RESULT(no)
-fi
-AC_MSG_CHECKING(if kernel has zero-copy TCP support)
-ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
-if test "$ZCCD" != 0 ; then
-  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
-  AC_MSG_RESULT(yes)
-else
-  enable_zerocopy_temp=""
-  AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(zerocopy, [  --enable-zerocopy enable socknal zerocopy],enable_zerocopy="-DSOCKNAL_ZC=1", enable_zercopy=$enable_zerocopy_temp)
-
-AC_ARG_ENABLE(affinity, [  --enable-affinity enable process/irq affinity],enable_affinity="-DCPU_AFFINITY=1", enable_affinity=$enable_affinity_temp)
-#####################################
-
-AC_MSG_CHECKING(if quadrics kernel headers are present)
-if test -d $LINUX/drivers/net/qsnet ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/net/qsnet/include"
-  :
-elif test -d $LINUX/drivers/qsnet1 ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
-  :
-elif test -d $LINUX/drivers/quadrics ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
-  :
-#elif test -d /usr/include/elan3 ; then
-#  AC_MSG_RESULT(yes)
-#  QSWNAL="qswnal"
-#  with_quadrics=""
-#  :
-else
-  AC_MSG_RESULT(no)
-  QSWNAL=""
-  with_quadrics=""
-  :
-fi
-AC_SUBST(with_quadrics)
-AC_SUBST(QSWNAL)
-
-# R. Read 5/02
-GMNAL=""
-echo "checking with-gm=" ${with_gm}
-if test "${with_gm+set}" = set; then
-  if test "${with_gm}" = yes; then
-    with_gm="-I/usr/local/gm/include"
-  else
-    with_gm=-I"$with_gm/include"
-  fi
-  GMNAL="gmnal"
-else
-# default case - no GM
-  with_gm=""
-fi
-AC_SUBST(with_gm)
-AC_SUBST(GMNAL)
-
-
-def_scamac=/opt/scali/include
-AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
-AC_MSG_CHECKING(if ScaMAC headers are present)
-if test "$with_scamac" = yes; then
-  with_scamac=$def_scamac
-fi
-if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
-  AC_MSG_RESULT(yes)
-  SCIMACNAL="scimacnal"
-  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
-else
-  AC_MSG_RESULT(no)
-  SCIMACNAL=""
-  with_scamac=""
-fi
-AC_SUBST(with_scamac)
-AC_SUBST(SCIMACNAL)