picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build-sys: xsltproc is required for man pages and gtk-doc

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-08-25 01:57:03 +02:00
parent 70f09301d5
commit fe1fed02c7
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -3473,7 +3473,7 @@ CLEANFILES += \
$(pkgconfiglib_DATA) \ $(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA) $(nodist_polkitpolicy_DATA)
if HAVE_XSLTPROC if ENABLE_MANPAGES
XSLTPROC_FLAGS = \ XSLTPROC_FLAGS = \
--nonet \ --nonet \
--stringparam man.output.quietly 1 \ --stringparam man.output.quietly 1 \

19
configure.ac
View File

@ -62,12 +62,17 @@ AM_PROG_CC_C_O
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL
AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([M4], [m4])
AC_PATH_PROG([XSLTPROC], [xsltproc])
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
m4_ifdef([GTK_DOC_CHECK], [ m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
], [AM_CONDITIONAL([ENABLE_GTK_DOC], [false])]) ], [AM_CONDITIONAL([ENABLE_GTK_DOC], [false])])
AS_IF([test "x$enable_gtk_doc" = "xyes" -a "x$XSLTPROC" = x], [
AC_MSG_ERROR([*** GTK doc requested but xsltproc not found])
])
m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
GOBJECT_INTROSPECTION_CHECK([1.31.1]) GOBJECT_INTROSPECTION_CHECK([1.31.1])
], [AM_CONDITIONAL([HAVE_INTROSPECTION], [false])]) ], [AM_CONDITIONAL([HAVE_INTROSPECTION], [false])])
@ -545,14 +550,15 @@ AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
have_manpages=no have_manpages=no
AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
if test "x$enable_manpages" != "xno"; then AS_IF([test "x$enable_manpages" != xno], [
have_manpages=yes AS_IF([test "x$enable_manpages" = xyes -a "x$XSLTPROC" = x], [
fi AC_MSG_ERROR([*** Manpages requested but xsltproc not found])
AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"]) ])
AS_IF([test "x$XSLTPROC" != x], [have_manpages=yes])
])
AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
AC_PATH_PROG([XSLTPROC], [xsltproc])
AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other]))
if test "z$with_distro" = "z"; then if test "z$with_distro" = "z"; then
@ -805,6 +811,7 @@ AC_MSG_RESULT([
D-Bus interfaces dir: ${with_dbusinterfacedir} D-Bus interfaces dir: ${with_dbusinterfacedir}
Split /usr: ${enable_split_usr} Split /usr: ${enable_split_usr}
man pages: ${have_manpages} man pages: ${have_manpages}
gtk-doc: ${enable_gtk_doc}
CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
CPPLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} CPPLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}