X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=3b9dd1fd166626e4f7fde0c6e3b2ca6c7142c5ac;hp=74f814d289e0ed8b474f07e00f063b2dee1af071;hb=8ab49c12dcab02d9d83e63a93676d4fc8f709516;hpb=4bbf01f38a5472e927515f7494037f1045d15f28

diff --git a/autogen.sh b/autogen.sh
index 74f814d28..3b9dd1fd1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,9 +48,9 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-if type -p colorgcc > /dev/null ; then
-   export CC=colorgcc
-fi
+libdir() {
+    echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
 
 if [ "x$1" = "xam" ] ; then
     run_versioned automake "$AM_VERSION" -a -c --foreign
@@ -60,13 +60,21 @@ else
     rm -f config.cache
 
     libtoolize -c --force
+    intltoolize -c -f
     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 --with-rootdir= "$@"
+        CFLAGS="$CFLAGS -g -O0" ./configure \
+          --with-rootprefix= \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --libdir=$(libdir /usr/lib) \
+          --with-rootlibdir=$(libdir /lib) \
+          --libexecdir=/usr/lib \
+          "$@"
         make clean
     fi
 fi