X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=3997db30e0de41921e4998a0dc65564b329c023b;hp=33d8fcda2342ad7cb91deba510f6fd24b54f4a26;hb=a4b49e45f7fb56d4456ef20b343105fa0dbda069;hpb=5ea373e101fe7153b0038d9cde015de5f6a6d314

diff --git a/autogen.sh b/autogen.sh
index 33d8fcda2..3997db30e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,10 @@
 
 set -e
 
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
+
 if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
         # This part is allowed to fail
         cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
@@ -25,7 +29,7 @@ if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
 fi
 
 if which gtkdocize >/dev/null 2>/dev/null; then
-        gtkdocize --docdir docs/
+        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."
@@ -35,33 +39,3 @@ fi
 
 intltoolize --force --automake
 autoreconf --force --install --symlink
-
-libdir() {
-        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
-}
-
-args="\
---sysconfdir=/etc \
---localstatedir=/var \
---libdir=$(libdir /usr/lib) \
-$gtkdocargs"
-
-if [ ! -L /bin ]; then
-args="$args \
---with-rootprefix= \
---with-rootlibdir=$(libdir /lib) \
-"
-fi
-
-if [ "x$1" = "xc" ]; then
-        ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
-        make clean
-else
-        echo
-        echo "----------------------------------------------------------------"
-        echo "Initialized build system. For a common configuration please run:"
-        echo "----------------------------------------------------------------"
-        echo
-        echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args"
-        echo
-fi