X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=eeb0c1b5e3385356a22a8ca50a0424c55431500a;hp=f9ad5f0a11e1830228113395b824b8cf9853d58c;hb=edcfd89ad0996686488c02ee0062d913fa0ba483;hpb=8e8eb8fbafcaa841fa5393e396acde27b26edf2f

diff --git a/autogen.sh b/autogen.sh
index f9ad5f0a1..eeb0c1b5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #  This file is part of systemd.
 #
@@ -15,26 +15,29 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+set -e
+
+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."
+        echo "Activated pre-commit hook." || :
 fi
 
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
+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
-else
-        gtkdocize --docdir docs/
-        gtkdocargs=--enable-gtk-doc
 fi
 
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
 libdir() {
-        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
 }
 
 args="\
@@ -50,8 +53,8 @@ args="$args \
 "
 fi
 
-if [ "x$1" == "xc" ]; then
-        ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
+if [ "x$1" = "xc" ]; then
+        ./configure CFLAGS='-g -O0' $args
         make clean
 else
         echo
@@ -59,6 +62,6 @@ else
         echo "Initialized build system. For a common configuration please run:"
         echo "----------------------------------------------------------------"
         echo
-        echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args"
+        echo "./configure CFLAGS='-g -O0' $args"
         echo
 fi