| | 12 | |
| | 13 | {{{ |
| | 14 | #!diff |
| | 15 | --- configure.in.bak 2008-07-10 11:46:32.000000000 -0700 |
| | 16 | +++ rmpi-0.5-3/configure.in 2008-07-10 11:48:50.000000000 -0700 |
| | 17 | @@ -10,7 +10,7 @@ |
| | 18 | ) |
| | 19 | |
| | 20 | if test -z "$MPI_ROOT"; then |
| | 21 | - for d in /opt/lib /usr/local/lib /usr/lib; do |
| | 22 | + for d in /opt/lib /usr/local/lib /usr/lib /usr; do |
| | 23 | if test -f $d/lam/include/mpi.h && test -f $d/lam/lib/libmpi.a; then |
| | 24 | echo "I am here $d/lam" |
| | 25 | MPI_ROOT=$d/lam |
| | 26 | @@ -23,6 +23,10 @@ |
| | 27 | echo "I am here $d/mpich" |
| | 28 | MPI_ROOT=$d/mpich |
| | 29 | break |
| | 30 | + elif test -f $d/include/mpich2/mpi.h; then |
| | 31 | + echo "I am here $d/include/mpich2" |
| | 32 | + MPI_ROOT=$d |
| | 33 | + break |
| | 34 | fi |
| | 35 | done |
| | 36 | fi |
| | 37 | @@ -38,6 +42,9 @@ |
| | 38 | elif test -f /usr/local/include/mpi.h; then |
| | 39 | echo "Found in /usr/local/include" |
| | 40 | MPI_INCLUDE="-I/usr/local/include" |
| | 41 | + elif test -f /usr/include/mpich2/mpi.h; then |
| | 42 | + echo "Found in /usr/include/mpich2" |
| | 43 | + MPI_INCLUDE="-I/usr/include/mpich2" |
| | 44 | else |
| | 45 | echo "Cannot find mpi head file" |
| | 46 | echo "Please use --with-mpi=/path/to/mpi or specify the environment variable MPI_ROOT" |
| | 47 | }}} |
| | 48 | |
| | 49 | {{{ |
| | 50 | #!diff |
| | 51 | --- control.bak 2008-07-10 11:46:40.000000000 -0700 |
| | 52 | +++ rmpi-0.5-3/debian/control 2008-07-10 12:00:02.000000000 -0700 |
| | 53 | @@ -2,7 +2,7 @@ |
| | 54 | Section: math |
| | 55 | Priority: optional |
| | 56 | Maintainer: Dirk Eddelbuettel <edd@debian.org> |
| | 57 | -Build-Depends: debhelper (>> 4.1.0), cdbs, r-base-dev (>= 2.4.0), lam-runtime, lam4-dev (>= 7.1.1-3.2) |
| | 58 | +Build-Depends: debhelper (>> 4.1.0), cdbs, r-base-dev (>= 2.4.0), libmpich2-1.0-dev |
| | 59 | Standards-Version: 3.7.2 |
| | 60 | |
| | 61 | Package: r-cran-rmpi |
| | 62 | }}} |
