fix bootstrapping

diff --git a/Makefile.am b/Makefile.am
index f7952c64b3a25d78146220b714e142e6ab77e658..5a7c03b508eafdd4e149f898875c20f4a79ac8b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I config
 
 # The order here is tricky. SUBDIRS applies both to compilation and
 # installation. Programs depending on the libs must be built after

diff --git a/bootstrap b/bootstrap
index 45d79b9660bc72ef279a2c185a3ac50e2ba13b9c..c71b862a5632b09cc8fd546a9ce9c208e37465c7 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -5,8 +5,4 @@ if [ ! -e config ]; then
        mkdir config
 fi
 
-if [ ! -e m4 ]; then
-       mkdir m4
-fi
-
-autoreconf
+autoreconf -i