On Sat, Nov 04, 2017 at 05:33:56PM -0700, Alan Coopersmith wrote: > Check for a specific file instead of a specific set of versions from > uname, to cope with manpage section alignment coming to 11.4 instead > of 12.0. > > Signed-off-by: Alan Coopersmith <[email protected]>
Hi, I can't test it anymore, but it looks good to me. Reviewed-by: Matthieu Herrb <[email protected]> > --- > xorg-macros.m4.in | 31 +++++++++++++++++++------------ > 1 file changed, 19 insertions(+), 12 deletions(-) > > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in > index 7935426..efce888 100644 > --- a/xorg-macros.m4.in > +++ b/xorg-macros.m4.in > @@ -114,6 +114,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ > AC_REQUIRE([AC_CANONICAL_HOST]) > AC_REQUIRE([AC_PROG_SED]) > > +case $host_os in > + solaris*) > + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we > + # check for a man page file found in later versions that use > + # traditional section numbers instead > + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], > + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) > + ;; > + *) SYSV_MAN_SECTIONS=false ;; > +esac > + > if test x$APP_MAN_SUFFIX = x ; then > APP_MAN_SUFFIX=1 > fi > @@ -129,9 +140,8 @@ if test x$LIB_MAN_DIR = x ; then > fi > > if test x$FILE_MAN_SUFFIX = x ; then > - case $host_os in > - # Solaris 2.0 - 11 use SysV man page sections > - solaris2.?|solaris2.1[[01]]) FILE_MAN_SUFFIX=4 ;; > + case $SYSV_MAN_SECTIONS in > + true) FILE_MAN_SUFFIX=4 ;; > *) FILE_MAN_SUFFIX=5 ;; > esac > fi > @@ -140,9 +150,8 @@ if test x$FILE_MAN_DIR = x ; then > fi > > if test x$MISC_MAN_SUFFIX = x ; then > - case $host_os in > - # Solaris 2.0 - 11 use SysV man page sections > - solaris2.?|solaris2.1[[01]]) MISC_MAN_SUFFIX=5 ;; > + case $SYSV_MAN_SECTIONS in > + true) MISC_MAN_SUFFIX=5 ;; > *) MISC_MAN_SUFFIX=7 ;; > esac > fi > @@ -151,9 +160,8 @@ if test x$MISC_MAN_DIR = x ; then > fi > > if test x$DRIVER_MAN_SUFFIX = x ; then > - case $host_os in > - # Solaris 2.0 - 11 use SysV man page sections > - solaris2.?|solaris2.1[[01]]) DRIVER_MAN_SUFFIX=7 ;; > + case $SYSV_MAN_SECTIONS in > + true) DRIVER_MAN_SUFFIX=7 ;; > *) DRIVER_MAN_SUFFIX=4 ;; > esac > fi > @@ -162,9 +170,8 @@ if test x$DRIVER_MAN_DIR = x ; then > fi > > if test x$ADMIN_MAN_SUFFIX = x ; then > - case $host_os in > - # Solaris 2.0 - 11 use SysV man page sections > - solaris2.?|solaris2.1[[01]]) ADMIN_MAN_SUFFIX=1m ;; > + case $SYSV_MAN_SECTIONS in > + true) ADMIN_MAN_SUFFIX=1m ;; > *) ADMIN_MAN_SUFFIX=8 ;; > esac > fi > -- > 2.13.0 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: https://lists.x.org/mailman/listinfo/xorg-devel -- Matthieu Herrb
signature.asc
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
