Commit 4936e9a9 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

check for xmllint and xsltproc but don't require these tools.

2004-05-01  Sven Neumann  <sven@gimp.org>

	* configure.in: check for xmllint and xsltproc but don't require
	these tools.

	* menus/Makefile.am
	* tips/Makefile.am: simplified "validate" targets.
parent c8d982c1
2004-05-01 Sven Neumann <sven@gimp.org>
* configure.in: check for xmllint and xsltproc but don't require
these tools.
* menus/Makefile.am
* tips/Makefile.am: simplified "validate" targets.
2004-04-30 Pedro Gimeno <pggimeno@wanadoo.es>
* app/tools/gimprectselecttool.c: Cleanups.
......
......@@ -690,6 +690,7 @@ fi
AC_MSG_CHECKING(for shared memory transport type)
AC_MSG_RESULT($shmtype)
########################
# Define a symbol prefix
########################
......@@ -1283,6 +1284,17 @@ AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
AC_SUBST(DESKTOP_DATADIR)
#####################
# Check for XML tools
#####################
AC_PATH_PROG(XMLLINT, xmllint, no)
AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno")
AC_PATH_PROG(XSLTPROC, xsltproc, no)
AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
######################################
# Checks for gtk-doc and docbook-tools
######################################
......@@ -1345,6 +1357,7 @@ dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
#########################################
# Allow to configure the gimp environment
#########################################
......
......@@ -33,14 +33,11 @@ EXTRA_DIST = \
validate: $(menudata_DATA)
@( xmllint=`which xmllint`; \
if test x$$xmllint != x && test -x $$xmllint; then \
for menu in $(menudata_DATA); do \
$$xmllint --noout --valid $$menu || \
( echo "* $$menu INVALID *"; exit 1; ) ; \
done; \
else \
echo "Can't find xmllint to validate the menu files; proceed with fingers crossed..."; \
fi )
if HAVE_XMLLINT
@for menu in $(menudata_DATA); do \
$(XMLLINT) --noout --valid $$menu || \
( echo "* $$menu INVALID *"; exit 1; ) ; \
done
endif
dist-hook: validate
......@@ -77,12 +77,9 @@ update-po: $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot
done
validate: update-po gimp-tips.xml
( xmllint=`which xmllint`; \
if test x$$xmllint != x && test -x $$xmllint; then \
$$xmllint --noout --valid gimp-tips.xml || \
( echo "* gimp-tips.xml INVALID *"; exit 1; ) \
else \
echo "Can't find xmllint to validate gimp-tips.xml; proceed with fingers crossed..."; \
fi )
if HAVE_XMLLINT
@$(XMLLINT) --noout --valid gimp-tips.xml || \
( echo "* gimp-tips.xml INVALID *"; exit 1; )
endif
dist-hook: validate
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment