[Guardsoft-cvs] guard config.h.in,1.17,1.18 configure,1.27,1.28 configure.in,1.33,1.34 defs.h,1.28,1
Brought to you by:
jarrah
Menu
▾
▴
[Guardsoft-cvs] guard config.h.in,1.17,1.18 configure,1.27,1.28 configure.in,1.33,1.34 defs.h,1.28,1.29
|
From: Greg W. <ja...@us...> - 2005-05-01 16:31:38
|
Update of /cvsroot/guardsoft/guard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27839 Modified Files: config.h.in configure configure.in defs.h Log Message: Add support for GDB MI. Index: defs.h =================================================================== RCS file: /cvsroot/guardsoft/guard/defs.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** defs.h 7 Jan 2004 02:29:47 -0000 1.28 --- defs.h 1 May 2005 16:31:29 -0000 1.29 *************** *** 37,41 **** --- 37,45 ---- #define DBG_PROTO "socket" #ifdef GDB + #ifdef LIBMIGDB + #define DBG_BACKEND "gdbmi" + #else /* LIBMIGDB */ #define DBG_BACKEND "gdb" + #endif /* LIBMIGDB */ #elif defined(IDB) #define DBG_BACKEND "idb" Index: config.h.in =================================================================== RCS file: /cvsroot/guardsoft/guard/config.h.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config.h.in 7 Jan 2004 02:29:47 -0000 1.17 --- config.h.in 1 May 2005 16:31:28 -0000 1.18 *************** *** 98,101 **** --- 98,104 ---- #undef LIBAIF + /* Define if you have the libmigdb package. */ + #undef LIBMIGDB + /* Enable MPICH support in Guard */ #undef MPICH *************** *** 119,122 **** --- 122,128 ---- #undef MPICH_BPROC + /* Enable Open MPI in Guard. */ + #undef OMPI + /* Enable POSIX support in Guard. */ #undef POSIX Index: configure =================================================================== RCS file: /cvsroot/guardsoft/guard/configure,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** configure 7 Jan 2004 02:29:47 -0000 1.27 --- configure 1 May 2005 16:31:28 -0000 1.28 *************** *** 1,18 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - - if expr a : '\(a\)' >/dev/null 2>&1; then [...5766 lines suppressed...] [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. ! ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac *************** *** 6125,6130 **** # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ ! --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || ! { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } --- 7277,7282 ---- # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ ! --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || ! { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } Index: configure.in =================================================================== RCS file: /cvsroot/guardsoft/guard/configure.in,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** configure.in 7 Jan 2004 02:29:47 -0000 1.33 --- configure.in 1 May 2005 16:31:29 -0000 1.34 *************** *** 116,119 **** --- 116,122 ---- fi + dnl Check for libmigdb + AC_TEST_PACKAGE_NEW(libmigdb,[#include "mi_gdb.h"],-lmigdb,,[/usr/local $(TOP)/../libmigdb/src],LIBMIGDB) + dnl Check for HDF. AC_CHECK_LIB(mfhdf, SDcreate,,, -ldf -lz -lnsl) *************** *** 182,197 **** dnl Standard MPICH startup ! AC_PATH_PROG(MPIRUN, mpirun, no) ! dnl AC_PATH_PROG(MPIPG, mpirun.pg, no) ! if test "$ac_cv_path_MPIRUN" != no ; then ! AC_DEFINE(MPICH,1,[Enable MPICH support in Guard]) ! AC_DEFINE_UNQUOTED(MPIRUN, "$ac_cv_path_MPIRUN", [Location of mpirun command.]) ! dnl AC_DEFINE_UNQUOTED(MPIPG, "$ac_cv_path_MPIPG", [Location of mpirun.pg command.]) ! AC_PATH_PROG(MPDTRACE, mpdtrace, no) ! if test "$ac_cv_path_MPDTRACE" != no ; then ! AC_DEFINE(MPICH_MPD,1,[Enable MPICH support in Guard with mpd]) ! AC_DEFINE_UNQUOTED(MPDTRACE, "$ac_cv_path_MPDTRACE", [Location of mpdtrace command.]) fi fi --- 185,202 ---- dnl Standard MPICH startup ! AC_PATH_PROG(MPIPG, mpirun.pg, no) ! if test "$ac_cv_path_MPIPG" != no ; then ! AC_PATH_PROG(MPIRUN, mpirun, no) ! if test "$ac_cv_path_MPIRUN" != no ; then ! AC_DEFINE(MPICH,1,[Enable MPICH support in Guard]) ! AC_DEFINE_UNQUOTED(MPIRUN, "$ac_cv_path_MPIRUN", [Location of mpirun command.]) ! dnl AC_DEFINE_UNQUOTED(MPIPG, "$ac_cv_path_MPIPG", [Location of mpirun.pg command.]) ! AC_PATH_PROG(MPDTRACE, mpdtrace, no) ! if test "$ac_cv_path_MPDTRACE" != no ; then ! AC_DEFINE(MPICH_MPD,1,[Enable MPICH support in Guard with mpd]) ! AC_DEFINE_UNQUOTED(MPDTRACE, "$ac_cv_path_MPDTRACE", [Location of mpdtrace command.]) ! fi fi fi *************** *** 204,207 **** --- 209,222 ---- fi + dnl Open MPI + AC_PATH_PROG(OMPI_INFO, ompi_info, no) + if test "$ac_cv_path_OMPI_INFO" != no; then + AC_PATH_PROG(MPIRUN, mpirun, no) + if test "$ac_cv_path_MPIRUN" != no ; then + AC_DEFINE(OMPI,1,[Enable Open MPI support in Guard.]) + AC_DEFINE_UNQUOTED(MPIRUN, "$ac_cv_path_MPIRUN", [Location of mpirun command.]) + fi + fi + dnl P4 Parallel Programming System (from ANL) AC_DEFINE(P4,1,[Enable P4 support in Guard.]) |
