From 656e27f5e0f756865719c94a63f1dad120fd823c Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 14 Dec 2014 16:44:52 +0000
Subject: [PATCH] mpi support

---
 configure                   | 8 ++++----
 docs/doxfull.rc             | 2 +-
 library/lammpi/configure.in | 4 ++--
 library/mpi/Makefile.in     | 2 +-
 packages/clib               | 2 +-
 packages/raptor             | 2 +-
 packages/real               | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 03d662ddb..2d9e4f792 100755
--- a/configure
+++ b/configure
@@ -16700,7 +16700,7 @@ else
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
+as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib64/openmpi/bin:/usr/lib/openmpi/bin"
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
@@ -16715,7 +16715,7 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
+  test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC=""$CC""
   ;;
 esac
 fi
@@ -16743,7 +16743,7 @@ else
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
+as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib/openmpi/bin:/usr/lib/openmpi/bin"
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
@@ -16758,7 +16758,7 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
+  test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC=""$CC""
   ;;
 esac
 fi
diff --git a/docs/doxfull.rc b/docs/doxfull.rc
index fd9aab017..3ba9684bb 100644
--- a/docs/doxfull.rc
+++ b/docs/doxfull.rc
@@ -58,7 +58,7 @@ PROJECT_LOGO = misc/icons/yap_96x96x32.png
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY = /Users/vsc/Yap/doxout
+OUTPUT_DIRECTORY = /home/vsc/Yap/doxout
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
diff --git a/library/lammpi/configure.in b/library/lammpi/configure.in
index b38fd8121..af4e208b1 100644
--- a/library/lammpi/configure.in
+++ b/library/lammpi/configure.in
@@ -36,9 +36,9 @@ dnl LAM/MPI interface
 
 if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
     if test "$yap_cv_mpi" != "yes"; then
-      AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
+      AC_PATH_PROG(MPI_CC,mpicc,"$CC",$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib64/openmpi/bin:/usr/lib/openmpi/bin)
     else
-      AC_PATH_PROG(MPI_CC,mpicc,true,$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
+      AC_PATH_PROG(MPI_CC,mpicc,"$CC",$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib/openmpi/bin:/usr/lib/openmpi/bin)
     fi
     MPILDF=`"$MPI_CC" --showme:link`
     MPICF=`"$MPI_CC" --showme:compile`
diff --git a/library/mpi/Makefile.in b/library/mpi/Makefile.in
index 21864a64c..857d1ea87 100644
--- a/library/mpi/Makefile.in
+++ b/library/mpi/Makefile.in
@@ -104,7 +104,7 @@ mpi.o: $(srcdir)/mpi.c
 mpe.o: $(srcdir)/mpe.c
 	$(CC) -c $(CFLAGS) $(srcdir)/mpe.c -o $@
 
-depend: $(HEADERS) $(C_SOURCES) 
+.depend: $(HEADERS) $(C_SOURCES) 
 	-@if test "$(GCC)" = yes; then\
 	  $(CC) -MM $(CFLAGS) -I$(srcdir)/include -i ../.. $(C_SOURCES) > .depend;\
 	else\
diff --git a/packages/clib b/packages/clib
index dc25a433d..55f1b0d76 160000
--- a/packages/clib
+++ b/packages/clib
@@ -1 +1 @@
-Subproject commit dc25a433df1f77e6271179664080d338e10c9d6b
+Subproject commit 55f1b0d765c607c99b9b9c67f150df64d33128b0
diff --git a/packages/raptor b/packages/raptor
index c488f2493..e75f61fe1 160000
--- a/packages/raptor
+++ b/packages/raptor
@@ -1 +1 @@
-Subproject commit c488f2493012e8e3b83bbcd4db020a3db5b96062
+Subproject commit e75f61fe11da02633e61501dae21122b9adad687
diff --git a/packages/real b/packages/real
index e0a566b31..54d9b5d24 160000
--- a/packages/real
+++ b/packages/real
@@ -1 +1 @@
-Subproject commit e0a566b31a14f28a49fe112f6e56bbd58a12ccd4
+Subproject commit 54d9b5d24c60b1be4dc6c1167a59ef46a0f79ac8