X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b398f29231473c714a3e31407a4523ef90b6784d..eb7afb185ea8377b26fc39bc15a4019cb4d0515f:/configure.ac

diff --git a/configure.ac b/configure.ac
index c282f8682f..b7d6631009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,34 @@
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.0.040205],[martin.quinson@ens-lyon.fr])
-AC_CONFIG_SRCDIR([src/include/gras.h])
-AC_REVISION($Revision$)
-AC_CONFIG_SUBDIRS(src/nws_portability)
+AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_CONFIG_SRCDIR([include/gras.h])
+AC_CONFIG_HEADERS([src/gras_config.h])
 
+AC_REVISION($Revision$)
 AC_CANONICAL_TARGET
 AC_LANG([C])
 
-AM_CONFIG_HEADER(src/gras_config.h)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(gnu)
+# MACRO_DIR should tell aclocal to search for my macro. That's the autoconf
+# maintainer plan, but automake does not implement this yet (as in 1.8)
+AC_CONFIG_MACRO_DIR(acmacro) 
+# It seems to be called ACLOCAL_INCLUDE...
+# A M_ACLOCAL_INCLUDE(acmacro)
+
+
 
-AM_PROG_LIBTOOL
+
+AC_PROG_LIBTOOL
 
 # declare the modules (no optional module)
 
 dnl
 dnl Load anything under acmacro/*.m4
 dnl
-test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+dnl test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 ACLOCAL="$ACLOCAL -I acmacro"
 
 
@@ -29,12 +36,33 @@ AC_PROG_CC
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
 
-# Check architecture signature
+# Check architecture signature begin
 GRAS_ARCH
+# Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h unistd.h])
+AC_HEADER_TIME
+AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
+                  sys/stat.h\
+		  sys/time.h ])
+AC_CHECK_FUNCS([gettimeofday ])
+
+
+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
@@ -42,23 +70,34 @@ AC_C_INLINE
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([memset strchr strerror usleep])
-
+dnl A C_FUNC_MEMCMP
+dnl A C_CHECK_FUNCS([memset strchr strerror usleep])
+
+# Can we rebuild the parsers?
+# We really want flex and refuse other lex. So, the parser is portable and
+# does not induce extra lib dependency
+AC_PROG_LEX
+if test "$LEX" != flex; then
+  LEX="$SHELL $missing_dir/missing flex"
+fi
+								  
 # Can we rebuild the documentation?
-GNOME_GTKDOC_CHECK
+GTK_DOC_CHECK()
+AC_SUBST([htmldir],         ['${datadir}/doc/gras/html'])dnl
 
 dnl ####[ Search libs ]#######################################################
-ACI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
-ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h])
+ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
+AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
 
-dnl A C_CHECK_LIB(pthread, pthread_mutex_lock)
+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"])
 	
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
+#   enable_iso_c=yes             # Let's go funky
    GNOME_COMPILE_WARNINGS(yes)
 fi
 
@@ -72,30 +111,46 @@ WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
 dnl ####[ Makes the output ]###################################################
+#    examples/bandwidth/Makefile examples/bandwidth/test_sg
+#    examples/pastry/Makefile    examples/pastry/test_sg
+
 AC_CONFIG_FILES([
   Makefile
+  include/Makefile
   src/Makefile
-    src/include/Makefile
-      src/include/modules/Makefile
-    src/base/Makefile
-      src/base/Tests/Makefile
-      src/base/Tests/gs_example
-      src/base/Tests/run_tests
-    src/modules/Makefile
-    src/examples/Makefile 
-      src/examples/ping/Makefile 
-      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
-      src/examples/alnem/Makefile 
+  src/amok/Makefile
+  examples/Makefile 
+    examples/ping/Makefile      examples/ping/test_sg
   doc/Makefile
-],[( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
-     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests])
+  tools/compile-remote-worker
+  testsuite/Makefile
+    testsuite/run_tests    
+    testsuite/gras/trp_tcp_usage
+    testsuite/gras/trp_file_usage
+],[
+     test -e testsuite/run_tests          && chmod +x testsuite/run_tests;
+     test -e testsuite/gras/trp_tcp_usage && chmod +x testsuite/gras/trp_tcp_usage;
+     test -e testsuite/gras/trp_file_usage&& chmod +x testsuite/gras/trp_file_usage;
+     test -e tools/compile-remote-worker  && chmod +x tools/compile-remote-worker;
+     test -e examples/ping/test_sg        && chmod +x examples/ping/test_sg;
+#     test -e examples/bandwidth/test_sg   && chmod +x examples/bandwidth/test_sg;
+     test -e examples/pastry/test_sg      && chmod +x examples/pastry/test_sg;
+     chmod +x $srcdir/tools/gras-check-arch;
+     chmod +x $srcdir/examples/ping/test_rl
+])
+
+
+
+#    examples/saturate/Makefile  examples/saturate/test_sg
+#    examples/alnem/Makefile     examples/alnem/test_sg
+
+
 
 AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}':
+Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
 
 	Compiler:	${CC}