diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bropken MPI_LAM configure

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1695 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2006-09-28 11:42:51 +00:00
parent 683c6d8756
commit 23757e5563
5 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.h.in
View File

@ -65,6 +65,8 @@
#undef HAVE_MALLOC_H
#undef HAVE_MATH_H
#undef HAVE_MEMORY_H
#undef HAVE_MPE_H
#undef HAVE_MPI_H
#undef HAVE_NETDB_H
#undef HAVE_NETINET_IN_H
#undef HAVE_PTHREAD_H
@ -93,8 +95,6 @@
#undef HAVE_UNISTD_H
#undef HAVE_WINSOCK_H
#undef HAVE_WINSOCK2_H
#define HAVE_MPI_H 0
#define HAVE_MPE_H 0
/* Do we have restartable syscalls */
#undef HAVE_RESTARTABLE_SYSCALLS

13
configure vendored
View File

@ -9397,8 +9397,6 @@ fi
done
fi
if test "$yap_cv_mpi" != "no"
then
for ac_header in mpi.h
do
@ -9549,9 +9547,6 @@ fi
done
fi
if test "$yap_cv_mpe" != "no"
then
for ac_header in mpe.h
do
@ -9702,7 +9697,6 @@ fi
done
fi
echo "$as_me:$LINENO: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6
@ -15676,10 +15670,9 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
# 2. Add them.
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs

10
configure.in
View File

@ -912,14 +912,8 @@ if test "$yap_cv_readline" != "no"
then
AC_CHECK_HEADERS( readline/readline.h)
fi
if test "$yap_cv_mpi" != "no"
then
AC_CHECK_HEADERS(mpi.h)
fi
if test "$yap_cv_mpe" != "no"
then
AC_CHECK_HEADERS(mpe.h)
fi
AC_CHECK_HEADERS(mpi.h)
AC_CHECK_HEADERS(mpe.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE

9
library/lammpi/prologterms2c.c
View File

@ -17,15 +17,22 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Last rev: $Id: prologterms2c.c,v 1.3 2006-06-04 19:02:07 nunofonseca Exp $
Last rev: $Id: prologterms2c.c,v 1.4 2006-09-28 11:42:51 vsc Exp $
Comments: This file provides a set of functions to convert a prolog term to a C string and back.
*/
#include "config.h"
#include "prologterms2c.h"
#include <stdio.h>
#include <stdlib.h>
#if HAVE_STRING_H
#include <string.h>
#endif
#if HAVE_STDARG_H
#include <stdarg.h>
#endif
#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#ifdef COMPRESS
#include "minilzo.h"

14
library/lammpi/yap_mpi.c
View File

@ -17,16 +17,26 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Last rev: $Id: yap_mpi.c,v 1.3 2006-06-04 19:02:07 nunofonseca Exp $
Last rev: $Id: yap_mpi.c,v 1.4 2006-09-28 11:42:51 vsc Exp $
Comments: YAP interface to LAM/MPI
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#if HAVE_STRING_H
#include <string.h>
#endif
#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#if HAVE_MPI_H
#include <mpi.h>
#include "prologterms2c.h"
@ -1008,3 +1018,5 @@ init_mpi(void) {
fflush(stderr);
#endif
}
#endif /* HAVE_MPI_H */