[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27751 - in msh: . src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27751 - in msh: . src |
Date: |
Fri, 5 Jul 2013 11:33:50 +0200 |
Author: harsha
Date: 2013-07-05 11:33:49 +0200 (Fri, 05 Jul 2013)
New Revision: 27751
Modified:
msh/configure.ac
msh/src/Makefile.am
msh/src/mping.c
msh/src/mshd.c
Log:
- revert to using mpicc to determine MPI
Modified: msh/configure.ac
===================================================================
--- msh/configure.ac 2013-07-05 08:41:46 UTC (rev 27750)
+++ msh/configure.ac 2013-07-05 09:33:49 UTC (rev 27751)
@@ -5,12 +5,13 @@
AC_PREREQ([2.69])
AC_INIT([msh], [0.0.0], address@hidden)
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+dnl m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_SRCDIR([src/mshd.c])
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
-AC_PROG_CC([mpicc gcc])
+CC=""
+AC_PROG_CC([mpicc])
AM_PROG_CC_C_O dnl allow per target automake flags
# Checks for header files.
@@ -27,35 +28,7 @@
[AC_MSG_ERROR([a required C library function is missing])])
# test for mpi
-mpi=0
-AC_MSG_CHECKING(for MPI)
-AC_ARG_WITH(mpi,
- [AS_HELP_STRING([--with-mpi=PFX],
- [base of MPI installation])],
- [AC_MSG_RESULT([$with_mpi])
- case $with_mpi in
- no)
- ;;
- yes)
- AC_CHECK_HEADERS([mpi/mpi.h], [AC_CHECK_LIB([mpi], [MPI_Init], mpi=1)])
- ;;
- *)
- SAVE_LDFLAGS=$LDFLAGS
- SAVE_CPPFLAGS=$CPPFLAGS
- LDFLAGS="-L$with_mpi/lib $LDFLAGS"
- CPPFLAGS="-I$with_mpi/include $CPPFLAGS"
- AC_CHECK_HEADERS([mpi/mpi.h],
- [AC_CHECK_LIB([mpi], [MPI_Init],
- [MPI_LDFLAGS="-L$with_mpi/lib"
- MPI_CPPFLAGS="-I$with_mpi/include"
- mpi=1])])
- LDFLAGS=$SAVE_LDFLAGS
- CPPFLAGS=$SAVE_CPPFLAGS
- ;;
- esac
- ],
- [AC_MSG_RESULT([--with-mpi not specified])
- AC_CHECK_HEADERS([mpi/mpi.h], AC_CHECK_LIB([mpi], [MPI_Init], [mpi=1]))])
+AC_CHECK_HEADERS([mpi.h], [AC_CHECK_LIB([mpi], [MPI_Init], [mpi=1])])
if test "$mpi" != 1
then
AC_MSG_ERROR([MSH requires MPI libraries])
Modified: msh/src/Makefile.am
===================================================================
--- msh/src/Makefile.am 2013-07-05 08:41:46 UTC (rev 27750)
+++ msh/src/Makefile.am 2013-07-05 09:33:49 UTC (rev 27751)
@@ -1,14 +1,11 @@
bin_PROGRAMS = mping mshd
mping_SOURCES = mping.c
-mping_LDADD = -lmpi
-mping_CPPFLAGS = $(MPI_CPPFLAGS)
-mping_LDFLAGS = $(MPI_LDFLAGS)
mshd_SOURCES = mshd.c util.c util.h scheduler.c scheduler.h common.h
-mshd_LDADD = -levent -lmpi
-mshd_CPPFLAGS = $(MPI_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
-mshd_LDFLAGS = $(MPI_LDFLAGS) $(LIBEVENT_LDFLAGS)
+mshd_LDADD = -levent
+mshd_CPPFLAGS = $(LIBEVENT_CPPFLAGS)
+mshd_LDFLAGS = $(LIBEVENT_LDFLAGS)
check_PROGRAMS = \
test-scheduler \
Modified: msh/src/mping.c
===================================================================
--- msh/src/mping.c 2013-07-05 08:41:46 UTC (rev 27750)
+++ msh/src/mping.c 2013-07-05 09:33:49 UTC (rev 27751)
@@ -14,7 +14,7 @@
#include <getopt.h>
-#include <mpi/mpi.h>
+#include <mpi.h>
static int str2size(char *str)
{
Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c 2013-07-05 08:41:46 UTC (rev 27750)
+++ msh/src/mshd.c 2013-07-05 09:33:49 UTC (rev 27751)
@@ -1,5 +1,5 @@
#include "common.h"
-#include <mpi/mpi.h>
+#include <mpi.h>
#include "util.h"
#include "scheduler.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27751 - in msh: . src,
gnunet <=