After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 721228 - configure: search for xml catalog in XDG_DATA_DIRS
configure: search for xml catalog in XDG_DATA_DIRS
Status: RESOLVED FIXED
Product: gtk-doc
Classification: Platform
Component: general
unspecified
Other All
: Normal normal
: 1.20
Assigned To: gtk-doc maintainers
gtk-doc maintainers
Depends on:
Blocks:
 
 
Reported: 2013-12-30 03:56 UTC by Allison Karlitskaya (desrt)
Modified: 2014-01-05 22:08 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Remove redundant acinclude.m4 (2.31 KB, patch)
2013-12-30 03:56 UTC, Allison Karlitskaya (desrt) 		committed Details | Review
configure: search for xml catalog in XDG_DATA_DIRS (2.72 KB, patch)
2013-12-30 03:56 UTC, Allison Karlitskaya (desrt) 		committed Details | Review
configure: search for xml catalog in XDG_DATA_DIRS (2.72 KB, patch)
2014-01-02 17:30 UTC, Stefan Sauer (gstreamer, gtkdoc dev) 		committed Details | Review
Remove redundant acinclude.m4 (2.31 KB, patch)
2014-01-02 17:30 UTC, Stefan Sauer (gstreamer, gtkdoc dev) 		committed Details | Review

Description Allison Karlitskaya (desrt) 2013-12-30 03:56:07 UTC 
See patches.
Comment 1 Allison Karlitskaya (desrt) 2013-12-30 03:56:08 UTC 
Created attachment 265018 [details] [review]
Remove redundant acinclude.m4

This file contains only copies of the files from m4/ and should not be
in version control.
Comment 2 Allison Karlitskaya (desrt) 2013-12-30 03:56:10 UTC 
Created attachment 265019 [details] [review]
configure: search for xml catalog in XDG_DATA_DIRS

Detect the xml catalog file in either /etc/xml/catalog (currently the
only place we check) and also in XDG_DATA_DIRS/xml/catalog.

This will help find the XML catalog on systems that have it in
/usr/local/share/xml/catalog (like the BSDs) and will also help to find
it in the case that we've installed docbook ourselves as part of
bootstrapping jhbuild (like on Mac OS).

--with-xml-catalog is still supported and, if given, we will only
attempt to use the given path and not guess others.
Comment 3 Stefan Sauer (gstreamer, gtkdoc dev) 2014-01-02 17:29:47 UTC 
The following fixes have been pushed:
a551ffe configure: search for xml catalog in XDG_DATA_DIRS
61ac18f Remove redundant acinclude.m4
Comment 4 Stefan Sauer (gstreamer, gtkdoc dev) 2014-01-02 17:30:01 UTC 
Created attachment 265170 [details] [review]
configure: search for xml catalog in XDG_DATA_DIRS

Detect the xml catalog file in either /etc/xml/catalog (currently the
only place we check) and also in XDG_DATA_DIRS/xml/catalog.

This will help find the XML catalog on systems that have it in
/usr/local/share/xml/catalog (like the BSDs) and will also help to find
it in the case that we've installed docbook ourselves as part of
bootstrapping jhbuild (like on Mac OS).

--with-xml-catalog is still supported and, if given, we will only
attempt to use the given path and not guess others.
Comment 5 Stefan Sauer (gstreamer, gtkdoc dev) 2014-01-02 17:30:05 UTC 
Created attachment 265171 [details] [review]
Remove redundant acinclude.m4

This file contains only copies of the files from m4/ and should not be
in version control.