From f829668e0d4e4d916eca0edc08dc601ac1d65d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Sat, 2 Jan 2016 13:01:19 +0100 Subject: [PATCH] Let autogen.sh work on Solaris and without gtkdocize --- autogen.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autogen.sh b/autogen.sh index e714cf8..aee0a7c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,21 +1,21 @@ -#!/bin/sh -e +#!/bin/sh -AUTORECONF=$(which autoreconf 2>/dev/null || true) +AUTORECONF=$(which autoreconf 2>/dev/null) if test $? -ne 0; then echo "No 'autoreconf' found. You must install the autoconf package." exit 1 fi -GIT=$(which git 2>/dev/null || true) +GIT=$(which git 2>/dev/null) if test $? -ne 0; then echo "No 'git' found. You must install the git package." exit 1 fi -# create m4 before gtkdocize -mkdir m4 2>/dev/null || true +# create m4 before gtkdocize +mkdir -p m4 2>/dev/null -GTKDOCIZE=$(which gtkdocize 2>/dev/null || true) +GTKDOCIZE=$(which gtkdocize 2>/dev/null) if test $? -ne 0; then echo "No gtk-doc support found. You can't build the docs." # rm because gtk-doc.make might be a link to a protected file @@ -24,7 +24,7 @@ if test $? -ne 0; then echo "CLEANFILES =" >>gtk-doc.make GTKDOCIZE="" else - $GTKDOCIZE || exit $? + $GTKDOCIZE fi $GIT submodule init