From: Eric B. <ee...@us...> - 2003-05-12 15:12:06
|
Update of /cvsroot/sandiaportals/portals/linux In directory sc8-pr-cvs1:/tmp/cvs-serv11944/linux Modified Files: Tag: b_devel Makefile.am configure.in Log Message: * Added Nikke's scimacnal Index: Makefile.am =================================================================== RCS file: /cvsroot/sandiaportals/portals/linux/Makefile.am,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -w -b -B -p -r1.19 -r1.19.2.1 --- Makefile.am 3 Mar 2003 17:23:27 -0000 1.19 +++ Makefile.am 12 May 2003 15:11:04 -0000 1.19.2.1 @@ -5,7 +5,7 @@ EXTRA_DIST = Rules.linux archdep.m4 MCP DIST_SUBDIRS = p3mod oslib socknal utils tests packaging router \ - rqswnal gmnal rtscts ptrxtx toenal + rqswnal gmnal rtscts ptrxtx toenal scimacnal SUBDIRS = oslib socknal utils tests packaging router \ p3mod ptrxtx rtscts toenal \ - @QSWNAL@ @GMNAL@ + @QSWNAL@ @GMNAL@ @SCIMACNAL@ Index: configure.in =================================================================== RCS file: /cvsroot/sandiaportals/portals/linux/configure.in,v retrieving revision 1.52.2.1 retrieving revision 1.52.2.2 diff -u -w -b -B -p -r1.52.2.1 -r1.52.2.2 --- configure.in 18 Apr 2003 18:35:00 -0000 1.52.2.1 +++ configure.in 12 May 2003 15:11:04 -0000 1.52.2.2 @@ -130,6 +130,26 @@ 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) + + AC_MSG_CHECKING(if make dep has been run in kernel source) if test -f $LINUX/include/linux/config.h ; then AC_MSG_RESULT(yes) @@ -147,7 +167,7 @@ fi AC_SUBST(MOD_LINK) KINCFLAGS='-I. -I$(LINUX)/include -I$(top_srcdir)/include -I$(top_srcdir)/../include ' -CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm " +CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm $with_scamac " CPLANTFL="-I$CPLANT/include -I$CPLANT/compute/OS/Myrinet -I$CPLANT/compute/OS/Myrinet/include -I.. -I$CPLANT/compute/OS -I$CPLANT/include/sys -I/usr/src/sandiaportals/portals/include/portals -I$CPLANT/include/portals -I$CPLANT/compute/OS/Myrinet/util -I../MCP " AC_SUBST(CPLANTFL) @@ -184,5 +204,6 @@ AC_OUTPUT([Makefile rtscts/Makefile rtsc p3mod/Makefile oslib/Makefile socknal/Makefile \ rqswnal/Makefile gmnal/Makefile tests/Makefile \ utils/Makefile router/Makefile packaging/Makefile \ - packaging/portals.spec ptrxtx/Makefile toenal/Makefile]) + packaging/portals.spec ptrxtx/Makefile toenal/Makefile \ + scimacnal/Makefile]) |