From: alegrand Date: Wed, 1 Aug 2007 00:55:33 +0000 (+0000) Subject: Improve gtnets and sdp detection. X-Git-Tag: v3.3~1432 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c6de256871ef1335762ac0e0ec8ea1859b70b979 Improve gtnets and sdp detection. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3928 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/configure.ac b/configure.ac index b3053e9496..c34a399dc1 100644 --- a/configure.ac +++ b/configure.ac @@ -189,50 +189,80 @@ SG_CONFIGURE_PART(Checking extra libraries dependencies...) SIMGRID_DEP="" GRAS_DEP="" +if test xpthread=xyes ; then + # if the pthreads are usable + if test "x$with_context" = "xpthread" ; then + # if we use them to implement the xbt_context + SIMGRID_DEP="-lpthread" + fi + # we need them in any case for the gras lib (which is multithreaded), but on windows (of course) + if test "x$with_context" != "xwindows" ; then + GRAS_DEP="-lpthread" + fi +fi + + ######################################### ## Build optional modules (gtnets) ## +gtnets=no AC_ARG_WITH(gtnets, AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]), - gtnets_path="$withval",gtnets_path="NO") -if test "x$gtnets_path" = "xNO" ; then + gtnets_path="$withval",gtnets_path="no") +if test "x$gtnets_path" = "xno" ; then AC_MSG_RESULT(Eventually you will come to GTNetS.) else AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****) - AC_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not]) - if ! test -e $gtnets_path ; then - AC_MSG_ERROR(Provided path to GTNetS include files ($gtnets_path) do not exist!) + AC_MSG_CHECKING(for gtnets) +# AC_CHECK_LIB(gtnets,Simulator.RunUntilNextCompletion,gtnets=yes, gtnets=no,-L$gtnets_path/lib) + AX_CXX_CHECK_LIB(gtnets,[Simulator::RunUntilNextCompletion],gtnets=yes, gtnets=no,-L$gtnets_path/lib) + + if test "x$gtnets" = xyes ; then + GTNETS_CFLAGS=-I$gtnets_path/include + AC_SUBST([GTNETS_CFLAGS]) + GTNETS_LDFLAGS=-L$gtnets_path/lib + AC_SUBST([GTNETS_LDFLAGS]) + SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS" + AC_MSG_RESULT(Found working gtnets library.) + AC_DEFINE(HAVE_GTNETS, 1, [Indicates whether we have the GTNETS library or not]) + else + AC_MSG_RESULT(Could not find any working gtnets library.) fi - GTNETS_CFLAGS=-I$gtnets_path/include - AC_SUBST([GTNETS_CFLAGS]) - GTNETS_LDFLAGS=-L$gtnets_path/lib - AC_SUBST([GTNETS_LDFLAGS]) - SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets" fi -AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO) +AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno) -if test xpthread=xyes ; then - # if the pthreads are usable - if test "x$with_context" = "xpthread" ; then - # if we use them to implement the xbt_context - SIMGRID_DEP="-lpthread" - fi - # we need them in any case for the gras lib (which is multithreaded), but on windows (of course) - if test "x$with_context" != "xwindows" ; then - GRAS_DEP="-lpthread" +######################################### +## Build optional modules (csdp) +## +csdp=no +AC_ARG_WITH(csdp, + AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, ie not using csdp)]), + csdp_path="$withval",csdp_path="no") +if test "x$csdp_path" = "xno" ; then + AC_MSG_RESULT(Eventually you will come to csdp.) +else + AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not ****) + AC_MSG_CHECKING(for csdp) + AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,-L$csdp_path/lib -llapack -lblas -lm) + AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no,-I$csdp_path/include -I$csdp_path/include/csdp) + + if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then + csdp=yes; + else + csdp=no; fi + if test "x$csdp" = xyes; then + CSDP_CFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp" + AC_SUBST([CSDP_CFLAGS]) + CSDP_LDFLAGS="-L$csdp_path/lib" + AC_SUBST([CSDP_LDFLAGS]) + SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS -lsdp -llapack -lblas -lm" + AC_MSG_RESULT(Found working sdp library.) + AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not]) + else + AC_MSG_RESULT(Could not find any working sdp library.) + fi; fi - -AC_MSG_CHECKING(for csdp) -sdp=no -AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm) -if test "x$csdp" = xyes; then - SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm" - AC_MSG_RESULT(Found working sdp library.) - AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not]) -else - AC_MSG_RESULT(Could not find any working sdp library.) -fi; AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno) AC_SUBST([SIMGRID_DEP]) diff --git a/src/Makefile.am b/src/Makefile.am index 36eea9f4f7..1f31ffecbe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS+= -g @GTNETS_CFLAGS@ +AM_CFLAGS+= -g @GTNETS_CFLAGS@ @CSDP_CFLAGS@ #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -233,7 +233,7 @@ GRAS_RL_SRC= \ gras/Virtu/rl_dns.c\ \ gras/Msg/rl_msg.c - + GRAS_RL_SRC+=$(XBT_RL_SRC) GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ @@ -255,7 +255,7 @@ AMOK_SRC= \ # Deal with optional modules # ############################## -if USE_GTNETS +if HAVE_GTNETS GTNETS_USED=$(GTNETS_SRC) else GTNETS_USED= @@ -293,7 +293,7 @@ lib_LTLIBRARIES += libsimgrid4java.la libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(JCTX_SRC) \ $(JMSG_C_SRC) $(MSG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) + $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid4java_la_GCJFLAGS = -fjni diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index dfbc2788b7..b4c601d93f 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -65,7 +65,6 @@ xbt_context_usage_LDADD= $(LDADD_SG) surf_maxmin_usage_LDADD= $(LDADD_SG) surf_maxmin_bench_LDADD= $(LDADD_SG) surf_simeng_usage_LDADD= $(LDADD_SG) -surf_simeng_bench_LDADD= $(LDADD_SG) surf_trace_usage_LDADD= $(LDADD_SG) surf_surf_usage_LDADD= $(LDADD_SG) surf_surf_usage2_LDADD= $(LDADD_SG)