From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 4 Feb 2005 10:01:26 +0000 (+0000)
Subject: remove gtk-doc-tools cruft
X-Git-Tag: v3.3~4495
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fdd8ad6fdd72c8a26648e7d5e8054e63c7d1c277?hp=c51a6b6afe77a45c502ee8303a2fdc01e0e94ca5

remove gtk-doc-tools cruft


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

diff --git a/Makefile.am b/Makefile.am
index 137f4d08ca..f63ab4fc45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS= include src examples testsuite doc
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
+ACLOCAL = aclocal -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
diff --git a/bootstrap b/bootstrap
index f3089053cf..f31428ef2c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,9 +8,6 @@ amver=1.9
 # AUTOPOINT=
 # LIBTOOLIZE=
 
-# Add the following to ACLOCAL to use the installed m4 macro about gtk-doc-tools instead of ours
-# -I /usr/share/aclocal/gnome2-macros
-
 ACLOCAL="aclocal-$amver -I acmacro" \
 AUTOMAKE="automake-$amver" \
   autoreconf -v -i -s || exit 1
@@ -24,7 +21,7 @@ if test -z "$*"; then
     echo \`$0\'" command line, or rerun aci_configurator and save the new ones."
     echo
   else
-    configure_args="--enable-maintainer-mode --enable-gtk-doc --enable-compile-warnings"
+    configure_args="--enable-maintainer-mode --enable-compile-warnings"
     echo "**Warning**: I am going to run \`configure' with the default arguments."
     echo "ie, $configure_args."
     echo "If you wish to pass any to it, please specify them on the"