Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d32f41df9be0b1e1ed8fb43629abbdfcdf294c27..9d2c652a9b4ab7070e4f7c0ddd97eb63f699b647 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,36 +1,33 @@
 #!/bin/sh
 
-set -e
-
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
-    cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
-    chmod +x .git/hooks/pre-commit && \
-    echo "Activated pre-commit hook."
-fi
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-gtkdocize
-autoreconf --install --symlink
+set -e
 
-libdir() {
-       echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
-}
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
 
-args="\
---prefix=/usr \
---with-rootprefix= \
---sysconfdir=/etc \
---bindir=/sbin \
---libdir=$(libdir /usr/lib) \
---with-rootlibdir=$(libdir /lib) \
---libexecdir=/lib \
---with-systemdsystemunitdir=/lib/systemd/system \
---with-selinux \
---enable-gtk-doc"
+# We do not need this, we are not systemd upstream!
+#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 && \
+#        chmod +x .git/hooks/pre-commit && \
+#        echo "Activated pre-commit hook." || :
+#fi
 
-echo
-echo "----------------------------------------------------------------"
-echo "Initialized build system. For a common configuration please run:"
-echo "----------------------------------------------------------------"
-echo
-echo "./configure CFLAGS='-g -O0' $args"
-echo
+intltoolize --force --automake
+autoreconf --force --install --symlink