X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=bootstrap.sh;h=74f814d289e0ed8b474f07e00f063b2dee1af071;hp=73243ed4405a0f14069d55727111484c6bdf07aa;hb=8260358d5a04912223e8a0062b70a621e2241e96;hpb=47be870bd83fb3719dffc3ee9348a409ab762a14

diff --git a/bootstrap.sh b/bootstrap.sh
index 73243ed44..74f814d28 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -48,33 +48,25 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-# We check for this here, because if pkg-config is not found in the
-# system, it's likely that the pkg.m4 macro file is also not present,
-# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
-# configure file faulty.
-if ! pkg-config --version &>/dev/null; then
-    echo "pkg-config is required to bootstrap this program" &>/dev/null
-    exit 1
-fi
-
 if type -p colorgcc > /dev/null ; then
    export CC=colorgcc
 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