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

lammpi: configuration fixes.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1670 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
nunofonseca 2006-06-06 14:58:42 +00:00
parent 989d9579b3
commit 61f4dfbf4c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO CPP EGREP M4 M4GENHDRS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD DYNLIB_LD YAPLIB DYNYAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_JPL JAVA_HOME JAVAC JAR IN_UNIX YAPMPILIB MPI_OBJS MPI_LIBS INSTALL_COMMAND CROSS_SIMULATOR INSTALLCLP JAVALIBPATH JAVAINCPATH LAMOBJS M4GENABSMI LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO CPP EGREP M4 M4GENHDRS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD DYNLIB_LD YAPLIB DYNYAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_JPL JAVA_HOME JAVAC JAR IN_UNIX YAPMPILIB LAM_MPI_CC MPI_OBJS MPI_LIBS INSTALL_COMMAND CROSS_SIMULATOR INSTALLCLP JAVALIBPATH JAVAINCPATH LAMOBJS M4GENABSMI LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -5118,6 +5118,7 @@ else
JAR="$yap_cv_jpl"/bin/jar JAR="$yap_cv_jpl"/bin/jar
fi fi
LAM_MPI_CC=${MPI_CC}
MPI_OBJS= MPI_OBJS=
if test "$yap_cv_mpi" != "no" if test "$yap_cv_mpi" != "no"
then then
@ -5291,8 +5292,8 @@ fi
fi fi
CC=${OLD_CC} CC=${OLD_CC}
else else
MPI_CC=${MPI_CC} # MPI_CC=${MPI_CC}
# MPI_CC=${CC} MPI_CC=${CC}
fi fi
@ -5387,7 +5388,7 @@ fi
# LAM # LAM
OLD_CC=${CC} OLD_CC=${CC}
CC=${MPI_CC} CC=${LAM_MPI_CC}
echo "$as_me:$LINENO: checking for main in -llam" >&5 echo "$as_me:$LINENO: checking for main in -llam" >&5
echo $ECHO_N "checking for main in -llam... $ECHO_C" >&6 echo $ECHO_N "checking for main in -llam... $ECHO_C" >&6
if test "${ac_cv_lib_lam_main+set}" = set; then if test "${ac_cv_lib_lam_main+set}" = set; then
@ -12752,6 +12753,7 @@ EXEC_SUFFIX=""
echo "$as_me:$LINENO: checking for gcc threaded code" >&5 echo "$as_me:$LINENO: checking for gcc threaded code" >&5
@ -16142,6 +16144,7 @@ s,@JAVAC@,$JAVAC,;t t
s,@JAR@,$JAR,;t t s,@JAR@,$JAR,;t t
s,@IN_UNIX@,$IN_UNIX,;t t s,@IN_UNIX@,$IN_UNIX,;t t
s,@YAPMPILIB@,$YAPMPILIB,;t t s,@YAPMPILIB@,$YAPMPILIB,;t t
s,@LAM_MPI_CC@,$LAM_MPI_CC,;t t
s,@MPI_OBJS@,$MPI_OBJS,;t t s,@MPI_OBJS@,$MPI_OBJS,;t t
s,@MPI_LIBS@,$MPI_LIBS,;t t s,@MPI_LIBS@,$MPI_LIBS,;t t
s,@INSTALL_COMMAND@,$INSTALL_COMMAND,;t t s,@INSTALL_COMMAND@,$INSTALL_COMMAND,;t t

8
configure.in
View File

@ -518,6 +518,7 @@ else
JAR="$yap_cv_jpl"/bin/jar JAR="$yap_cv_jpl"/bin/jar
fi fi
LAM_MPI_CC=${MPI_CC}
MPI_OBJS= MPI_OBJS=
if test "$yap_cv_mpi" != "no" if test "$yap_cv_mpi" != "no"
then then
@ -545,8 +546,8 @@ then
fi fi
CC=${OLD_CC} CC=${OLD_CC}
else else
MPI_CC=${MPI_CC} # MPI_CC=${MPI_CC}
# MPI_CC=${CC} MPI_CC=${CC}
fi fi
@ -568,7 +569,7 @@ fi
# LAM # LAM
OLD_CC=${CC} OLD_CC=${CC}
CC=${MPI_CC} CC=${LAM_MPI_CC}
AC_CHECK_LIB([lam], [main], AC_CHECK_LIB([lam], [main],
LAMOBJS=yap_mpi@SHLIB_SUFFIX@, LAMOBJS=yap_mpi@SHLIB_SUFFIX@,
LAMOBJS=no) LAMOBJS=no)
@ -1002,6 +1003,7 @@ AC_SUBST(JAVAC)
AC_SUBST(JAR) AC_SUBST(JAR)
AC_SUBST(IN_UNIX) AC_SUBST(IN_UNIX)
AC_SUBST(YAPMPILIB) AC_SUBST(YAPMPILIB)
AC_SUBST(LAM_MPI_CC)
AC_SUBST(MPI_OBJS) AC_SUBST(MPI_OBJS)
AC_SUBST(MPI_LIBS) AC_SUBST(MPI_LIBS)
AC_SUBST(INSTALL_COMMAND) AC_SUBST(INSTALL_COMMAND)