cleanup the mecanism in charge of declaring the library dependencies to libtool

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@653 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index ca6f924..d733f15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,20 +52,6 @@ AC_CHECK_FUNCS([gettimeofday \
                 getdtablesize \
                 sysconf])
 
                 getdtablesize \
                 sysconf])
 

-AC_MSG_CHECKING(how to link against winsock)
-save_LIBS="$LIBS"
-case $host_os in
-  *mingw* ) GRAS_WINSOCK_DEP=-lws2_32;;
-  * ) GRAS_WINSOCK_DEP="";;
-esac
-          
-if test x$GRAS_WINSOCK_DEP = x; then 
-   AC_MSG_RESULT(not needed)
-else
-   AC_MSG_RESULT($winsock_ver)
-fi
-AC_SUBST([GRAS_WINSOCK_DEP])
-

 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE


@@ -90,10 +76,30 @@ AC_SUBST([htmldir],         ['${datadir}/doc/gras/html'])dnl
 dnl ####[ Search libs ]#######################################################
 ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
 AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
 dnl ####[ Search libs ]#######################################################
 ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
 AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)

+if test x$HAVE_SimGrid = xyes; then
+  GRAS_SG_DEP="-lsimgrid"
+else
+  GRAS_SG_DEP=""
+fi
+AC_SUBST([GRAS_SG_DEP])
+

 
 dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
 
 dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")

-AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
-AC_CHECK_LIB(socket, connect,    [LIBS="$LIBS -lsocket"])
+GRAS_RL_DEP=""
+AC_CHECK_LIB(nsl, gethostbyname, [GRAS_RL_DEP="$GRAS_RL_DEP -lnsl"])
+AC_CHECK_LIB(socket, connect,    [GRAS_RL_DEP="$GRAS_RL_DEP -lsocket"])
+
+AC_MSG_CHECKING(for extra dependencies of libgrasrl)
+case $host_os in
+  *mingw* ) GRAS_RL_DEP=-lws2_32;;
+esac
+          
+if test "x$GRAS_RL_DEP" = x; then 
+   AC_MSG_RESULT(none)
+else
+   AC_MSG_RESULT($GRAS_RL_DEP)
+fi
+AC_SUBST([GRAS_RL_DEP])

 
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE
 
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE

diff --git a/src/Makefile.am b/src/Makefile.am
index c10bcf2..b39ca5f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,12 +131,12 @@ libgrasrl_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
   \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
   \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c

-libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_WINSOCK_DEP@
+libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@

 
 if HAVE_SG
   libgrassg_la_SOURCES= $(COMMON_S) \
     gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
     \
     gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
 
 if HAVE_SG
   libgrassg_la_SOURCES= $(COMMON_S) \
     gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
     \
     gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c

-  libgrassg_la_LDFLAGS = $(VERSION_INFO)
+  libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@

 endif
 endif