[GNUnet-SVN] r27750 - in msh: . doc doc/fig/svg src

[gnunet]

Author: harsha
Date: 2013-07-05 10:41:46 +0200 (Fri, 05 Jul 2013)
New Revision: 27750

Modified:
   msh/
   msh/configure.ac
   msh/doc/
   msh/doc/fig/svg/
   msh/src/Makefile.am
   msh/src/mping.c
   msh/src/mshd.c
   msh/src/test_scheduler.c
Log:
- build enhancements


Index: msh
===================================================================
--- msh 2013-07-04 15:29:56 UTC (rev 27749)
+++ msh 2013-07-05 08:41:46 UTC (rev 27750)

Property changes on: msh
___________________________________________________________________
Modified: svn:ignore
## -13,6 +13,7 ##
 Makefile
 install-sh
 test-driver
+compile
 GRTAGS
 GPATH
 GTAGS
Modified: msh/configure.ac
===================================================================
--- msh/configure.ac    2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/configure.ac    2013-07-05 08:41:46 UTC (rev 27750)
@@ -5,16 +5,16 @@
 AC_PREREQ([2.69])
 AC_INIT([msh], [0.0.0], address@hidden)
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_SRCDIR([src/mping.c])
+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])
+AC_PROG_CC([mpicc gcc])
+AM_PROG_CC_C_O                  dnl allow per target automake flags
 
-# Checks for libraries.
-AC_CHECK_LIB([mpi],[MPI_Init],,[AC_MSG_ERROR([cannot find MPI libraries])])
 # Checks for header files.
-AC_CHECK_HEADERS([stdlib.h string.h unistd.h mpi.h netinet/in.h net/if.h 
ifaddrs.h \
+AC_CHECK_HEADERS([stdlib.h string.h unistd.h netinet/in.h net/if.h ifaddrs.h \
 sys/socket.h sys/select.h sys/time.h sys/types.h error.h errno.h limits.h],,
  [AC_MSG_ERROR([a required standard UNIX header is missing])])
 
@@ -26,6 +26,76 @@
 AC_CHECK_FUNCS([strdup strerror getnameinfo getifaddrs freeifaddrs],,
                [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]))])
+if test "$mpi" != 1
+then
+ AC_MSG_ERROR([MSH requires MPI libraries])
+fi
+
+# test for libevent
+libevent=0
+AC_MSG_CHECKING(for libevent)
+AC_ARG_WITH(libevent,
+   [AS_HELP_STRING([--with-libevent=PFX],
+       [base of libevent installation])],
+   [AC_MSG_RESULT([$with_libevent])
+    case $with_libevent in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS([event2/event.h], [AC_CHECK_LIB([event], 
[event_base_new], libevent=1)])
+        ;;
+      *)
+        SAVE_LDFLAGS=$LDFLAGS
+        SAVE_CPPFLAGS=$CPPFLAGS
+        LDFLAGS="-L$with_libevent/lib $LDFLAGS"
+        CPPFLAGS="-I$with_libevent/include $CPPFLAGS"
+        AC_CHECK_HEADERS([event2/event.h],
+          [AC_CHECK_LIB([event], [event_base_new],
+            [LIBEVENT_LDFLAGS="-L$with_libevent/lib"
+             LIBEVENT_CPPFLAGS="-I$with_libevent/include"
+             libevent=1])])
+        LDFLAGS=$SAVE_LDFLAGS
+        CPPFLAGS=$SAVE_CPPFLAGS
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-libevent not specified])
+    AC_CHECK_HEADERS([event2/event.h], [AC_CHECK_LIB([event], 
[event_base_new], libevent=1)])])
+if test "$libevent" != 1
+then
+ AC_MSG_ERROR([MSH requires libevent])
+fi
+
 AC_CONFIG_FILES([Makefile
                src/Makefile])
 AC_OUTPUT

Index: msh/doc
===================================================================
--- msh/doc     2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/doc     2013-07-05 08:41:46 UTC (rev 27750)

Property changes on: msh/doc
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,6 ##
+msh.fdb_latexmk
+msh.log
+auto
+msh.out
+msh.pdf
+msh.aux
Index: msh/doc/fig/svg
===================================================================
--- msh/doc/fig/svg     2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/doc/fig/svg     2013-07-05 08:41:46 UTC (rev 27750)

Property changes on: msh/doc/fig/svg
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+*.pdf
+*.pdf_tex
Modified: msh/src/Makefile.am
===================================================================
--- msh/src/Makefile.am 2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/src/Makefile.am 2013-07-05 08:41:46 UTC (rev 27750)
@@ -1,9 +1,14 @@
 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
+mshd_LDADD = -levent -lmpi
+mshd_CPPFLAGS = $(MPI_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+mshd_LDFLAGS = $(MPI_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 check_PROGRAMS = \
   test-scheduler \
@@ -12,10 +17,14 @@
 test_scheduler_SOURCES = test_scheduler.c scheduler.c scheduler.h common.h \
        util.c util.h common.h
 test_scheduler_LDADD = -levent
+test_scheduler_CPPFLAGS = $(LIBEVENT_CPPFLAGS)
+test_scheduler_LDFLAGS = $(LIBEVENT_LDFLAGS)
 
 test_scheduler_socket_SOURCES = test_scheduler_socket.c scheduler.c 
scheduler.h \
        common.h util.c util.h
 test_scheduler_socket_LDADD = -levent
+test_scheduler_socket_CPPFLAGS = $(LIBEVENT_CPPFLAGS)
+test_scheduler_socket_LDFLAGS = $(LIBEVENT_LDFLAGS)
 
 TESTS = \
   test-scheduler \

Modified: msh/src/mping.c
===================================================================
--- msh/src/mping.c     2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/src/mping.c     2013-07-05 08:41:46 UTC (rev 27750)
@@ -14,7 +14,7 @@
 
 #include <getopt.h>
 
-#include "mpi.h"
+#include <mpi/mpi.h>
 
 static int str2size(char *str)
 {

Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/src/mshd.c      2013-07-05 08:41:46 UTC (rev 27750)
@@ -1,5 +1,5 @@
 #include "common.h"
-#include <mpi.h>
+#include <mpi/mpi.h>
 #include "util.h"
 #include "scheduler.h"
 

Modified: msh/src/test_scheduler.c
===================================================================
--- msh/src/test_scheduler.c    2013-07-04 15:29:56 UTC (rev 27749)
+++ msh/src/test_scheduler.c    2013-07-05 08:41:46 UTC (rev 27750)
@@ -59,4 +59,5 @@
 int main (int argc, char *argv[])
 {
   MSH_assert (MSH_OK == scheduler_run (run, NULL));
+  return 0;
 }