From f885aa29e590cb747421ebfe897310e7e99c8658 Mon Sep 17 00:00:00 2001 From: velho Date: Mon, 9 Jun 2008 11:25:57 +0000 Subject: [PATCH 1/1] Clean up the mess. Now the GTNETS and SDP detection are clean. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5568 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 85e5dc35bd..e99f0a14d2 100644 --- a/configure.ac +++ b/configure.ac @@ -270,8 +270,6 @@ if test "x$gtnets_path" = "xno" ; then else AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****) AC_MSG_CHECKING(for gtnets) - AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support]) - AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") AC_LANG_PUSH([C++]) GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib" GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets" @@ -288,10 +286,11 @@ fi if test "x$gtnets" = "xyes" ; then AC_MSG_RESULT(Enabling GTNETS support.) + AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support]) LDFLAGS+="-lgtnets -L$gtnets_path/lib" - CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets -DHAVE_GTNETS" + CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets" fi - +AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") @@ -327,7 +326,7 @@ else csdp=no; fi if test "x$csdp" = xyes; then - AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS -DHAVE_SDP" + AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS" SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS" AC_MSG_RESULT(Found working sdp library.) AC_DEFINE([HAVE_SDP], 1, [Indicates whether we have the CSDP library or not]) -- 2.20.1