mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
build-sys: silence gtk-doc check, remove gtk-doc options from configure and distcheck
This commit is contained in:
parent
92ec4495f7
commit
80a5cbace4
@ -3237,8 +3237,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
|
||||
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
|
||||
--with-rootprefix=$$dc_install_base \
|
||||
--disable-split-usr \
|
||||
--disable-split-usr
|
||||
|
||||
if ENABLE_GTK_DOC
|
||||
DISTCHECK_CONFIGURE_FLAGS += \
|
||||
--enable-gtk-doc
|
||||
endif
|
||||
|
||||
upload: all distcheck
|
||||
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
|
||||
|
14
autogen.sh
14
autogen.sh
@ -21,17 +21,15 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
|
||||
echo "Activated pre-commit hook."
|
||||
fi
|
||||
|
||||
GTKDOCIZE=`which gtkdocize`
|
||||
GTKDOCIZE=$(which gtkdocize 2>/dev/null)
|
||||
if test -z $GTKDOCIZE; then
|
||||
echo "You don't have gtk-doc installed, and thus"
|
||||
echo "won't be able to generate the documentation."
|
||||
NOGTKDOC=1
|
||||
echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
|
||||
echo 'EXTRA_DIST =' > gtk-doc.make
|
||||
else
|
||||
gtkdocize
|
||||
gtkdocargs=--enable-gtk-doc
|
||||
fi
|
||||
|
||||
if test -z "$NOGTKDOC"; then
|
||||
gtkdocize || exit $?
|
||||
fi
|
||||
intltoolize --force --automake
|
||||
autoreconf --force --install --symlink
|
||||
|
||||
@ -44,7 +42,7 @@ args="\
|
||||
--localstatedir=/var \
|
||||
--libdir=$(libdir /usr/lib) \
|
||||
--libexecdir=/usr/lib \
|
||||
--enable-gtk-doc"
|
||||
$gtkdocargs"
|
||||
|
||||
if [ ! -L /bin ]; then
|
||||
args="$args \
|
||||
|
@ -62,14 +62,10 @@ AC_PROG_GCC_TRADITIONAL
|
||||
|
||||
AC_PATH_PROG([M4], [m4])
|
||||
|
||||
# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
|
||||
# it on it's own line.
|
||||
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
|
||||
m4_ifdef([GTK_DOC_CHECK], [
|
||||
GTK_DOC_CHECK([1.18])
|
||||
],[
|
||||
AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
|
||||
])
|
||||
|
||||
],[ AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ])
|
||||
|
||||
GOBJECT_INTROSPECTION_CHECK([1.31.1])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user