Update autogenerated files

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b66c77d..6f2b4cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,12 @@ AC_LANG([C])
 AM_INIT_AUTOMAKE(gnu)
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
+
+dnl Next few lines is a hack to prevent libtool checking for F77
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
+
+dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
@@ -189,6 +195,15 @@ else
 fi
 AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
 
+#########################################
+## Check for libraries extra-dependencies
+##
+
+SG_CONFIGURE_PART(Checking extra libraries dependencies...)
+
+SIMGRID_DEP=""
+GRAS_DEP=""
+
 #########################################
 ## Build optional modules (gtnets)
 ##
@@ -206,18 +221,11 @@ else
   GTNETS_CFLAGS=-I$gtnets_path/include
   AC_SUBST([GTNETS_CFLAGS])  
   GTNETS_LDFLAGS=-L$gtnets_path/lib
-  AC_SUBST([GTNETS_LDFLAGS])  
+  AC_SUBST([GTNETS_LDFLAGS])
+  SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets"
 fi
 AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO)
 
-#########################################
-## Check for libraries extra-dependencies
-##
-
-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