X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=2d4acdfef167ca6a69424c823ea5d5d67e2829c1;hp=0fc6e57027af85d111f0067be49932b5e8feb8f3;hb=09e75d32a30c7527df7dace0f80327817cc23bb6;hpb=85e74b26c30b4c34a7ed8342b8f692ccdf3908b4 diff --git a/autogen.sh b/autogen.sh index 0fc6e5702..2d4acdfef 100755 --- a/autogen.sh +++ b/autogen.sh @@ -28,15 +28,6 @@ if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then echo "Activated pre-commit hook." || : fi -if which gtkdocize >/dev/null 2>/dev/null; then - gtkdocize --docdir docs/ --flavour no-tmpl - gtkdocargs=--enable-gtk-doc -else - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." - rm -f docs/gtk-doc.make - echo 'EXTRA_DIST =' > docs/gtk-doc.make -fi - intltoolize --force --automake autoreconf --force --install --symlink @@ -48,11 +39,15 @@ args="\ --sysconfdir=/etc \ --localstatedir=/var \ --libdir=$(libdir /usr/lib) \ -$gtkdocargs" +" + +if [ -f "$topdir/.config.args" ]; then + args="$args $(cat $topdir/.config.args)" +fi if [ ! -L /bin ]; then args="$args \ ---with-rootprefix= \ +--with-rootprefix=/ \ --with-rootlibdir=$(libdir /lib) \ " fi