From: mquinson Date: Sat, 17 Jul 2004 22:55:34 +0000 (+0000) Subject: Pass the automake argument (gnu) in the macro so that I don't have to pass them on... X-Git-Tag: v3.3~5059 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/61f985af34dc3ccfb0742985ef688adce9da5ee5 Pass the automake argument (gnu) in the macro so that I don't have to pass them on command line, so that autoreconf works; (useless) macro reordering git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@288 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/configure.ac b/configure.ac index 0fa95e83bb..2108dda6a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,23 +1,25 @@ - AC_PREREQ(2.59) +AC_PREREQ(2.59) #We need a recent ACI ACI_PREREQ(2003.01.16) AC_INIT([GRAS],[0.1],[martin.quinson@ens-lyon.fr]) +AC_CONFIG_SRCDIR([src/include/gras.h]) +AC_CONFIG_HEADERS([src/gras_config.h]) +AC_REVISION($Revision$) +AC_CANONICAL_TARGET +AC_LANG([C]) -AC_CONFIG_SRCDIR([src/include/gras.h]) +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) -AC_REVISION($Revision$) -AC_CANONICAL_TARGET -AC_LANG([C]) -AC_CONFIG_HEADERS([src/gras_config.h]) -AM_INIT_AUTOMAKE AC_PROG_LIBTOOL @@ -26,7 +28,7 @@ AC_PROG_LIBTOOL 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"