Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On 2010-04-08 08:14, Dan Nicholson wrote: Huh, I hadn't noticed that. I think we should demand that you have the version with the .pc file once there's a release. For the very few people who are going to attempt to build the sgml documentation, I think they can be bothered to grab a newer doctools package. That would be easier, and indeed the first version of my patch did just that, but Gaetan pointed out that this would cause a regression if macros is updated but not doctools. Whether or not that is acceptable as a tradeoff for the functionality of using pkg-config needs to be decided. Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, Apr 8, 2010 at 11:22 PM, Yaakov (Cygwin/X) yselkow...@users.sourceforge.net wrote: On 2010-04-08 08:14, Dan Nicholson wrote: Huh, I hadn't noticed that. I think we should demand that you have the version with the .pc file once there's a release. For the very few people who are going to attempt to build the sgml documentation, I think they can be bothered to grab a newer doctools package. That would be easier, and indeed the first version of my patch did just that, but Gaetan pointed out that this would cause a regression if macros is updated but not doctools. Whether or not that is acceptable as a tradeoff for the functionality of using pkg-config needs to be decided. As long as someone makes a release of the doctools, I'd be willing to make that sacrifice. 1. The number of people actually building the sgml docs is likely extremely small and probably is encompassed by x developers trying to make a katamari release and a handful of distro packagers. I think they can be bothered to update one more package that has 0 dependencies. 2. The gain in proper versioning outweighs the loss of backwards compatibility in my mind. 3. The time when people will be attempting to build the docs is likely just before or after the next Xorg release. They'll be wanting to download the new doctools for the updated entities anyway. -- Dan ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Fri, 2010-04-09 at 06:11 -0700, Dan Nicholson wrote: On Thu, Apr 8, 2010 at 11:22 PM, Yaakov (Cygwin/X) yselkow...@users.sourceforge.net wrote: On 2010-04-08 08:14, Dan Nicholson wrote: Huh, I hadn't noticed that. I think we should demand that you have the version with the .pc file once there's a release. For the very few people who are going to attempt to build the sgml documentation, I think they can be bothered to grab a newer doctools package. That would be easier, and indeed the first version of my patch did just that, but Gaetan pointed out that this would cause a regression if macros is updated but not doctools. Whether or not that is acceptable as a tradeoff for the functionality of using pkg-config needs to be decided. As long as someone makes a release of the doctools, I'd be willing to make that sacrifice. 1. The number of people actually building the sgml docs is likely extremely small and probably is encompassed by x developers trying to make a katamari release and a handful of distro packagers. I think they can be bothered to update one more package that has 0 dependencies. 2. The gain in proper versioning outweighs the loss of backwards compatibility in my mind. 3. The time when people will be attempting to build the docs is likely just before or after the next Xorg release. They'll be wanting to download the new doctools for the updated entities anyway. I don't have objections in this case to somewhat break compatibility. I routinely test for such a scenario when making changes as I have been reminded that changes and new features in macros should not adversely affect current or previous versions of clients. There is some leeway here as long as it does not just plain break and is easy to figure out. It's a judgement call. -- Dan ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On 2010-04-05 08:58, Dan Nicholson wrote: On Thu, Mar 25, 2010 at 4:12 PM, Yaakov (Cygwin/X) wrote: +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools], This should take an optional version number as an argument in case you need newer doctools or something. I think all it would take is this: PKG_CHECK_EXISTS([xorg-sgml-doctools] m4_ifval([$1], [= $1]), ... Not quite, because if a minimum version is requested but not found then it would fall back to the AC_CHECK_FILE which would still pass. Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, Apr 8, 2010 at 3:09 AM, Yaakov (Cygwin/X) yselkow...@users.sourceforge.net wrote: On 2010-04-05 08:58, Dan Nicholson wrote: On Thu, Mar 25, 2010 at 4:12 PM, Yaakov (Cygwin/X) wrote: +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools], This should take an optional version number as an argument in case you need newer doctools or something. I think all it would take is this: PKG_CHECK_EXISTS([xorg-sgml-doctools] m4_ifval([$1], [= $1]), ... Not quite, because if a minimum version is requested but not found then it would fall back to the AC_CHECK_FILE which would still pass. Huh, I hadn't noticed that. I think we should demand that you have the version with the .pc file once there's a release. For the very few people who are going to attempt to build the sgml documentation, I think they can be bothered to grab a newer doctools package. Not to mention that we very much should enforce version on defs.ent since it carries all the Xorg katamari information. It would suck to have someone build the docs saying that the Xorg release is 7.4 right now. I can't see any easy way to do this without the .pc file. -- Dan ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Sun, 2010-04-04 at 13:23 -0500, Yaakov (Cygwin/X) wrote: On 2010-04-03 09:59, Gaetan Nadon wrote: On Fri, 2010-04-02 at 13:12 -0500, Yaakov (Cygwin/X) wrote: To implement this we need to: 1) Push these commits to doctools and macros. 2) Version bump and release doctools-1.4. 3) Version bump and release macros-1.7.0. Who shall do this, and when? I am available to do any/all of these tasks (after the week-end). I usually take care of macros. I'll let you layout the release plan. I have pushed the commits to doctools and macros. Could you handle the version bumps and releases for both modules at your convenience? Will do. Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, Mar 25, 2010 at 4:12 PM, Yaakov (Cygwin/X) yselkow...@users.sourceforge.net wrote: From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- xorg-macros.m4.in | 54 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..916b472 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,31 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools], This should take an optional version number as an argument in case you need newer doctools or something. I think all it would take is this: PKG_CHECK_EXISTS([xorg-sgml-doctools] m4_ifval([$1], [ = $1]), ... -- Dan ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On 2010-04-03 09:59, Gaetan Nadon wrote: On Fri, 2010-04-02 at 13:12 -0500, Yaakov (Cygwin/X) wrote: To implement this we need to: 1) Push these commits to doctools and macros. 2) Version bump and release doctools-1.4. 3) Version bump and release macros-1.7.0. Who shall do this, and when? I am available to do any/all of these tasks (after the week-end). I usually take care of macros. I'll let you layout the release plan. I have pushed the commits to doctools and macros. Could you handle the version bumps and releases for both modules at your convenience? Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Fri, 2010-04-02 at 13:12 -0500, Yaakov (Cygwin/X) wrote: On 2010-03-25 20:00, Gaetan Nadon wrote: All set to go. Thanks. I modified slightly the doctools patch per the recent thread, as the .pc.in need not be in EXTRA_DIST because it will be disted automatically since it is used by AC_OUTPUT. To implement this we need to: 1) Push these commits to doctools and macros. 2) Version bump and release doctools-1.4. 3) Version bump and release macros-1.7.0. Who shall do this, and when? I am available to do any/all of these tasks (after the week-end). I usually take care of macros. I'll let you layout the release plan. Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On 2010-03-25 20:00, Gaetan Nadon wrote: All set to go. Thanks. I modified slightly the doctools patch per the recent thread, as the .pc.in need not be in EXTRA_DIST because it will be disted automatically since it is used by AC_OUTPUT. To implement this we need to: 1) Push these commits to doctools and macros. 2) Version bump and release doctools-1.4. 3) Version bump and release macros-1.7.0. Who shall do this, and when? Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- This depends on the patch for xorg-sgml-doctools to provide a pkg-config file. xorg-macros.m4.in | 45 - 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..beb5fd5 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,22 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +PKG_CHECK_EXISTS([xorg-sgml-doctools], +[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` +have_sgml_ent=yes], +[have_sgml_ent=no]) +AC_MSG_RESULT([$have_sgml_ent]) +AC_SUBST(XORG_SGML_PATH) +]) + # XORG_CHECK_LINUXDOC # --- # Minimum version: 1.0.0 @@ -187,23 +203,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL BUILD_LINUXDOC AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x$cross_compiling = xyes ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -245,24 +252,20 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) AC_MSG_CHECKING([whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKTXT != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKTXT != x test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi @@ -270,7 +273,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) AC_MSG_CHECKING([whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPDF != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPDF != x test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi @@ -278,7 +281,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) AC_MSG_CHECKING([whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPS != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPS != x test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi @@ -286,7 +289,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) AC_MSG_CHECKING([whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKHTML != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKHTML != x test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi -- 1.6.6.1 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, 2010-03-25 at 03:48 -0500, Yaakov (Cygwin/X) wrote: From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- This depends on the patch for xorg-sgml-doctools to provide a pkg-config file. xorg-macros.m4.in | 45 - 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..beb5fd5 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,22 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +PKG_CHECK_EXISTS([xorg-sgml-doctools], +[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` +have_sgml_ent=yes], +[have_sgml_ent=no]) +AC_MSG_RESULT([$have_sgml_ent]) +AC_SUBST(XORG_SGML_PATH) +]) + # XORG_CHECK_LINUXDOC # --- # Minimum version: 1.0.0 @@ -187,23 +203,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL BUILD_LINUXDOC AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x$cross_compiling = xyes ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -245,24 +252,20 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) AC_MSG_CHECKING([whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKTXT != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKTXT != x test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi @@ -270,7 +273,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) AC_MSG_CHECKING([whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPDF != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPDF != x test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi @@ -278,7 +281,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) AC_MSG_CHECKING([whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPS != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPS != x test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi @@ -286,7 +289,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) AC_MSG_CHECKING([whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKHTML != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKHTML != x test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi That's the right thing to do. I tested the patches and found a scenario that fails. When a doctools v1.3 is present, the linuxdoc in hw/dmx/doc do not build. There is a requirement that an older client of util-macros behaves the same way when linked with a newer version. This should be relatively easy to fix. In util-macros v1.7, the code should revert to the v1.6 flawed behaviour when the doctools pc file is not found. It should not assume that the package is missing and that the sgml definitions are missing as well. Note this patch
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, 2010-03-25 at 18:08 -0400, Gaetan Nadon wrote: On Thu, 2010-03-25 at 03:48 -0500, Yaakov (Cygwin/X) wrote: From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- This depends on the patch for xorg-sgml-doctools to provide a pkg-config file. xorg-macros.m4.in | 45 - 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..beb5fd5 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,22 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +PKG_CHECK_EXISTS([xorg-sgml-doctools], +[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` +have_sgml_ent=yes], +[have_sgml_ent=no]) +AC_MSG_RESULT([$have_sgml_ent]) +AC_SUBST(XORG_SGML_PATH) +]) + # XORG_CHECK_LINUXDOC # --- # Minimum version: 1.0.0 @@ -187,23 +203,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL BUILD_LINUXDOC AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x$cross_compiling = xyes ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -245,24 +252,20 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) AC_MSG_CHECKING([whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKTXT != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKTXT != x test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi @@ -270,7 +273,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) AC_MSG_CHECKING([whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPDF != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPDF != x test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi @@ -278,7 +281,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) AC_MSG_CHECKING([whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPS != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPS != x test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi @@ -286,7 +289,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) AC_MSG_CHECKING([whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKHTML != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKHTML != x test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi That's the right thing to do. I tested the patches and found a scenario that fails. When a doctools v1.3 is present, the linuxdoc in hw/dmx/doc do not build. There is a requirement that an older client of util-macros behaves the same way when linked with a newer version. This should be relatively easy to fix. In util-macros v1.7, the code should
[PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- xorg-macros.m4.in | 54 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..916b472 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,31 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools], +[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`], +[if test x$cross_compiling != xyes ; then +AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], + [XORG_SGML_PATH=$prefix/share/sgml]) + fi]) + +if test x$XORG_SGML_PATH != x ; then + AC_MSG_RESULT([$XORG_SGML_PATH]) +else + AC_MSG_RESULT([no]) +fi + +AC_SUBST(XORG_SGML_PATH) +]) # XORG_CHECK_SGML_DOCTOOLS + # XORG_CHECK_LINUXDOC # --- # Minimum version: 1.0.0 @@ -187,23 +212,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL BUILD_LINUXDOC AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x$cross_compiling = xyes ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -245,24 +261,20 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) AC_MSG_CHECKING([whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKTXT != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKTXT != x test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi @@ -270,7 +282,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) AC_MSG_CHECKING([whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPDF != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPDF != x test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi @@ -278,7 +290,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) AC_MSG_CHECKING([whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPS != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPS != x test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi @@ -286,7 +298,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) AC_MSG_CHECKING([whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKHTML != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKHTML != x test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi -- 1.6.6.1 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On 2010-03-25 17:08, Gaetan Nadon wrote: That's the right thing to do. I tested the patches and found a scenario that fails. When a doctools v1.3 is present, the linuxdoc in hw/dmx/doc do not build. There is a requirement that an older client of util-macros behaves the same way when linked with a newer version. This should be relatively easy to fix. In util-macros v1.7, the code should revert to the v1.6 flawed behaviour when the doctools pc file is not found. It should not assume that the package is missing and that the sgml definitions are missing as well. Thanks for the review; revised patch sent to list. Note this patch introduces a build order dependency where doctools be built before xserver. Nothing wrong with that, just need to check the build script. Only if you want to --enable-builddocs in xserver, just as before. Once that's fixed, the release plan should be: util-macros v1.7 released first. doctools v1.4 with XORG_MACROS_VERSION(1.7) released second. The new doctools-1.4 does not need macros-1.7, it does not use XORG_CHECK_SGML_DOCTOOLS nor the other macros affected by this change. Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, 2010-03-25 at 18:12 -0500, Yaakov (Cygwin/X) wrote: From: Yaakov Selkowitz yselkow...@users.sourceforge.net Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net --- xorg-macros.m4.in | 54 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 055c83e..916b472 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -178,6 +178,31 @@ AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS +# +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools], +[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`], +[if test x$cross_compiling != xyes ; then +AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], + [XORG_SGML_PATH=$prefix/share/sgml]) + fi]) + +if test x$XORG_SGML_PATH != x ; then + AC_MSG_RESULT([$XORG_SGML_PATH]) +else + AC_MSG_RESULT([no]) +fi + +AC_SUBST(XORG_SGML_PATH) +]) # XORG_CHECK_SGML_DOCTOOLS + # XORG_CHECK_LINUXDOC # --- # Minimum version: 1.0.0 @@ -187,23 +212,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL BUILD_LINUXDOC AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x$cross_compiling = xyes ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -245,24 +261,20 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then -XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) AC_MSG_CHECKING([whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKTXT != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKTXT != x test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi @@ -270,7 +282,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) AC_MSG_CHECKING([whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPDF != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPDF != x test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi @@ -278,7 +290,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) AC_MSG_CHECKING([whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKPS != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKPS != x test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi @@ -286,7 +298,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) AC_MSG_CHECKING([whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x test x$DOCBOOKHTML != x +if test x$XORG_SGML_PATH != x test x$DOCBOOKHTML != x test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi All set to go. Reviewed by: Gaetan Nadon mems...@videotron.ca signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:macros] doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctools
On Thu, 2010-03-25 at 18:18 -0500, Yaakov (Cygwin/X) wrote: On 2010-03-25 17:08, Gaetan Nadon wrote: That's the right thing to do. I tested the patches and found a scenario that fails. When a doctools v1.3 is present, the linuxdoc in hw/dmx/doc do not build. There is a requirement that an older client of util-macros behaves the same way when linked with a newer version. This should be relatively easy to fix. In util-macros v1.7, the code should revert to the v1.6 flawed behaviour when the doctools pc file is not found. It should not assume that the package is missing and that the sgml definitions are missing as well. Thanks for the review; revised patch sent to list. Note this patch introduces a build order dependency where doctools be built before xserver. Nothing wrong with that, just need to check the build script. Only if you want to --enable-builddocs in xserver, just as before. Yes Once that's fixed, the release plan should be: util-macros v1.7 released first. doctools v1.4 with XORG_MACROS_VERSION(1.7) released second. The new doctools-1.4 does not need macros-1.7, it does not use XORG_CHECK_SGML_DOCTOOLS nor the other macros affected by this change. Right, old habit of mine Yaakov Cygwin/X ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
