X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=bootstrap.sh;h=74f814d289e0ed8b474f07e00f063b2dee1af071;hp=cb87bf782c4bf3b01489e852bc36d94af85b5625;hb=7e61bf2019c2cab4e1e21ee775bab25ef1a1bb81;hpb=b237ef2cfac7ab0b33170809e8cb64628606207d

diff --git a/bootstrap.sh b/bootstrap.sh
index cb87bf782..74f814d28 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -53,19 +53,20 @@ if type -p colorgcc > /dev/null ; then
 fi
 
 if [ "x$1" = "xam" ] ; then
-    run_versioned automake "$VERSION" -a -c --foreign
+    run_versioned automake "$AM_VERSION" -a -c --foreign
     ./config.status
 else
     rm -rf autom4te.cache
     rm -f config.cache
 
+    libtoolize -c --force
     run_versioned aclocal "$AM_VERSION" -I m4
     run_versioned autoconf "$AC_VERSION" -Wall
     run_versioned autoheader "$AC_VERSION"
     run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
 
     if [ "x$1" != "xac" ]; then
-        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
+        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --with-rootdir= "$@"
         make clean
     fi
 fi