X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=bootstrap.sh;h=f59a8156bfd0bc3eddc01277afd1710ba6c60b8f;hp=73243ed4405a0f14069d55727111484c6bdf07aa;hb=2ded0c0442f597dc397f7b0e9a15cf453578d11e;hpb=47be870bd83fb3719dffc3ee9348a409ab762a14 diff --git a/bootstrap.sh b/bootstrap.sh index 73243ed44..f59a8156b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -48,15 +48,6 @@ 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 @@ -74,7 +65,7 @@ else 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