From MAILER-DAEMON Mon Apr 01 13:41:29 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UMijZ-00020S-5v for mharc-groff-commit@gnu.org; Mon, 01 Apr 2013 13:41:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMijV-00020J-QF for groff-commit@gnu.org; Mon, 01 Apr 2013 13:41:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMijT-0005kX-8u for groff-commit@gnu.org; Mon, 01 Apr 2013 13:41:25 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:37841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMijT-0005k5-67 for groff-commit@gnu.org; Mon, 01 Apr 2013 13:41:23 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UMijS-00053Q-4M for groff-commit@gnu.org; Mon, 01 Apr 2013 17:41:22 +0000 Date: Mon, 01 Apr 2013 17:41:22 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/groffer ChangeLog perl/groffer.pl X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 17:41:28 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/01 17:41:22 Modified files: contrib/groffer: ChangeLog contrib/groffer/perl: groffer.pl Log message: Expand PS-viewers. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/ChangeLog?cvsroot=groff&r1=1.63&r2=1.64 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/groffer.pl?cvsroot=groff&r1=1.14&r2=1.15 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/groffer/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -b -r1.63 -r1.64 --- ChangeLog 29 Mar 2013 22:11:11 -0000 1.63 +++ ChangeLog 1 Apr 2013 17:41:21 -0000 1.64 @@ -1,5 +1,9 @@ 2013-03-29 Bernd Warken + * perl/groffer.pl: Change viewers for `PS'. + +2013-03-29 Bernd Warken + * perl/groffer.pl: Change viewers for `PS' and `PDF'. * version.sh: New version is `1.1.3'. Index: perl/groffer.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/groffer/perl/groffer.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- perl/groffer.pl 29 Mar 2013 22:11:11 -0000 1.14 +++ perl/groffer.pl 1 Apr 2013 17:41:21 -0000 1.15 @@ -198,7 +198,7 @@ 'xpdf -z 150', 'gpdf', 'xpdf', 'zathura'. 'epdfview', 'qpdfview', 'apvlv', 'qpdfview', 'kghostview --scale 1.45', 'gv', 'ggv'], - 'PS' => ['gs', 'gs_x11', 'ghostview', + 'PS' => ['gs', 'gs_x11', 'ghostscript', 'ghostview', 'kghostview --scale 1.45', 'gv', 'okular', 'kpdf', 'evince', 'ggv'], 'TTY' => ['xless'], From MAILER-DAEMON Wed Apr 10 18:56:05 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQ3vx-00087F-8a for mharc-groff-commit@gnu.org; Wed, 10 Apr 2013 18:56:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3vu-00085a-6s for groff-commit@gnu.org; Wed, 10 Apr 2013 18:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ3vp-0000qm-M6 for groff-commit@gnu.org; Wed, 10 Apr 2013 18:56:02 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:47781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3vp-0000qZ-5P for groff-commit@gnu.org; Wed, 10 Apr 2013 18:55:57 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQ3vo-0002sc-U9 for groff-commit@gnu.org; Wed, 10 Apr 2013 22:55:56 +0000 Date: Wed, 10 Apr 2013 22:55:56 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog man/roff.man X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2013 22:56:04 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/10 22:55:56 Modified files: . : ChangeLog man : roff.man Log message: man/roff.man: For roff(7), add information about the free git package RUNOFF.git with documentation about historical RUNOFF and the available files written in the classical RUNOFF language: $ git clone git@github.com:RUNOFF/RUNOFF.git CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1398&r2=1.1399 http://cvs.savannah.gnu.org/viewcvs/groff/man/roff.man?cvsroot=groff&r1=1.44&r2=1.45 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1398 retrieving revision 1.1399 diff -u -b -r1.1398 -r1.1399 --- ChangeLog 29 Mar 2013 11:41:20 -0000 1.1398 +++ ChangeLog 10 Apr 2013 22:55:56 -0000 1.1399 @@ -1,3 +1,9 @@ +2013-04-11 Bernd Warken + + * man/roff.man: For roff(7), add information about the free git + package RUNOFF.git with documentation about historical RUNOFF and + the available files written in the classical RUNOFF language.. + 2013-03-29 Bernd Warken Rename `groff_lilypond' to `glilypond'. So remove the former Index: man/roff.man =================================================================== RCS file: /cvsroot/groff/groff/man/roff.man,v retrieving revision 1.44 retrieving revision 1.45 diff -u -b -r1.44 -r1.45 --- man/roff.man 22 Jan 2013 00:29:43 -0000 1.44 +++ man/roff.man 10 Apr 2013 22:55:56 -0000 1.45 @@ -191,6 +191,18 @@ were ported to the GCOS system at Bell Labs when BTL left the development of Multics. . +.P +There is a free +.I git +package at +.I github +consisting of the available RUNOFF documentation and RUNOFF files. +. +You can call it anonymously by the shell command +.EX +$ git clone git@github.com:RUNOFF/RUNOFF.git +.EE +. . .\" -------------------------------------------------------------------- .SS "The Classical nroff/troff System" From MAILER-DAEMON Wed Apr 10 19:36:11 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQ4Yl-0005bR-PG for mharc-groff-commit@gnu.org; Wed, 10 Apr 2013 19:36:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ4Yi-0005au-DR for groff-commit@gnu.org; Wed, 10 Apr 2013 19:36:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ4Yh-0002ie-4t for groff-commit@gnu.org; Wed, 10 Apr 2013 19:36:08 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:39849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ4Yg-0002i0-Tk for groff-commit@gnu.org; Wed, 10 Apr 2013 19:36:07 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQ4Yg-0004bI-G5 for groff-commit@gnu.org; Wed, 10 Apr 2013 23:36:06 +0000 Date: Wed, 10 Apr 2013 23:36:06 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog contrib/glilypond/ChangeLog con... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2013 23:36:09 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/10 23:36:06 Modified files: . : ChangeLog contrib/glilypond: ChangeLog ChangeLog.0x Log message: Minor corrections for the actual entries of ChangeLog files. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1400&r2=1.1401 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.3&r2=1.4 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog.0x?cvsroot=groff&r1=1.2&r2=1.3 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1400 retrieving revision 1.1401 diff -u -b -r1.1400 -r1.1401 --- ChangeLog 10 Apr 2013 23:22:55 -0000 1.1400 +++ ChangeLog 10 Apr 2013 23:36:05 -0000 1.1401 @@ -1,13 +1,13 @@ 2013-04-11 Bernd Warken - * contrib/glilypond/: There is a free git package containing all - versions of the former name `groff_lilypond v0.x'. They work with - lilypond parts in roff files, but were not installed. This - package can be got at: + * contrib/glilypond/: There is a free `git' package containing all + old versions of the former name `groff_lilypond v0.*'. They work + with `lilypond' parts in `roff' files, but were not installed. + This package can be got at: $ git clone git@github.com:RUNOFF/groff_lilypond.git - The new version glilypond v1.x are not included there. + The new versions `glilypond v1.*' are not included there. 2013-04-11 Bernd Warken Index: contrib/glilypond/ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- contrib/glilypond/ChangeLog 10 Apr 2013 23:22:56 -0000 1.3 +++ contrib/glilypond/ChangeLog 10 Apr 2013 23:36:06 -0000 1.4 @@ -1,13 +1,13 @@ 2013-04-11 Bernd Warken - * old groff_lilypond: There is now a free git package containing - all versions of the former name `groff_lilypond v0.x'. They work - with lilypond parts in roff files, but were not installed. This - package can be got at: + * old groff_lilypond: There is now a free `git' package containing + all old versions of the former name `groff_lilypond v0.*'. They + work with `lilypond' parts in `roff' files, but were not + installed. This package can be got at: $ git clone git@github.com:RUNOFF/groff_lilypond.git - The new versions glilypond 1.x are not includeed there. + The new versions `glilypond 1.*' are not included there. 2013-03-29 Bernd Warken Index: contrib/glilypond/ChangeLog.0x =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog.0x,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- contrib/glilypond/ChangeLog.0x 10 Apr 2013 23:22:56 -0000 1.2 +++ contrib/glilypond/ChangeLog.0x 10 Apr 2013 23:36:06 -0000 1.3 @@ -1,13 +1,13 @@ 2013-04-11 Bernd Warken - * old groff_lilypond: There is now a free git package containing - all versions of the former name `groff_lilypond v0.x'. They work - with lilypond parts in roff files, but were not installed. This - package can be got at: + * old groff_lilypond: There is now a free `git' package containing + all old versions of the former name `groff_lilypond v0.*'. They + work with `lilypond' parts in `roff' files, but were not + installed. This package can be got at: $ git clone git@github.com:RUNOFF/groff_lilypond.git - The new versions glilypond 1.x are not includeed there. + The new versions `glilypond 1.*' are not included there. 2013-03-28 Bernd Warken From MAILER-DAEMON Wed Apr 10 19:44:43 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQ4h1-000855-Fm for mharc-groff-commit@gnu.org; Wed, 10 Apr 2013 19:44:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ4gx-00084M-Rb for groff-commit@gnu.org; Wed, 10 Apr 2013 19:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ4gw-0005ca-Ea for groff-commit@gnu.org; Wed, 10 Apr 2013 19:44:39 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:51473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ4Lx-0007rk-5J for groff-commit@gnu.org; Wed, 10 Apr 2013 19:22:57 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQ4Lw-0003yM-IR for groff-commit@gnu.org; Wed, 10 Apr 2013 23:22:56 +0000 Date: Wed, 10 Apr 2013 23:22:56 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog contrib/glilypond/ChangeLog con... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2013 23:44:41 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/10 23:22:56 Modified files: . : ChangeLog contrib/glilypond: ChangeLog ChangeLog.0x Log message: contrib/glilypond/: There is a free git package containing all versions of the former name `groff_lilypond v0.x'. They work with lilypond parts in roff files, but were not installed. This package can be got at: $ git clone git@github.com:RUNOFF/groff_lilypond.git The new versions glilypond v1.x are not included there. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1399&r2=1.1400 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog.0x?cvsroot=groff&r1=1.1&r2=1.2 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1399 retrieving revision 1.1400 diff -u -b -r1.1399 -r1.1400 --- ChangeLog 10 Apr 2013 22:55:56 -0000 1.1399 +++ ChangeLog 10 Apr 2013 23:22:55 -0000 1.1400 @@ -1,5 +1,16 @@ 2013-04-11 Bernd Warken + * contrib/glilypond/: There is a free git package containing all + versions of the former name `groff_lilypond v0.x'. They work with + lilypond parts in roff files, but were not installed. This + package can be got at: + + $ git clone git@github.com:RUNOFF/groff_lilypond.git + + The new version glilypond v1.x are not included there. + +2013-04-11 Bernd Warken + * man/roff.man: For roff(7), add information about the free git package RUNOFF.git with documentation about historical RUNOFF and the available files written in the classical RUNOFF language.. Index: contrib/glilypond/ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- contrib/glilypond/ChangeLog 29 Mar 2013 12:29:04 -0000 1.2 +++ contrib/glilypond/ChangeLog 10 Apr 2013 23:22:56 -0000 1.3 @@ -1,3 +1,14 @@ +2013-04-11 Bernd Warken + + * old groff_lilypond: There is now a free git package containing + all versions of the former name `groff_lilypond v0.x'. They work + with lilypond parts in roff files, but were not installed. This + package can be got at: + + $ git clone git@github.com:RUNOFF/groff_lilypond.git + + The new versions glilypond 1.x are not includeed there. + 2013-03-29 Bernd Warken Published version is `v1.0'. Index: contrib/glilypond/ChangeLog.0x =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog.0x,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- contrib/glilypond/ChangeLog.0x 29 Mar 2013 11:41:20 -0000 1.1 +++ contrib/glilypond/ChangeLog.0x 10 Apr 2013 23:22:56 -0000 1.2 @@ -1,3 +1,14 @@ +2013-04-11 Bernd Warken + + * old groff_lilypond: There is now a free git package containing + all versions of the former name `groff_lilypond v0.x'. They work + with lilypond parts in roff files, but were not installed. This + package can be got at: + + $ git clone git@github.com:RUNOFF/groff_lilypond.git + + The new versions glilypond 1.x are not includeed there. + 2013-03-28 Bernd Warken Rename `groff_lilypond' to `glilypond' for *.pl and *.man files. From MAILER-DAEMON Wed Apr 10 20:08:37 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQ549-0007TO-Pz for mharc-groff-commit@gnu.org; Wed, 10 Apr 2013 20:08:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ546-0007SV-5V for groff-commit@gnu.org; Wed, 10 Apr 2013 20:08:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ543-00048d-1R for groff-commit@gnu.org; Wed, 10 Apr 2013 20:08:34 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:35755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ542-00048W-UH for groff-commit@gnu.org; Wed, 10 Apr 2013 20:08:30 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQ542-0006C1-Ix for groff-commit@gnu.org; Thu, 11 Apr 2013 00:08:30 +0000 Date: Thu, 11 Apr 2013 00:08:30 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog contrib/groffer/ChangeLog X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2013 00:08:36 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/11 00:08:30 Modified files: . : ChangeLog contrib/groffer: ChangeLog Log message: contrib/groffer: There is now a free `git' package containing all old `groffer' versions `v0.*' and `v1.*'. The new versions `groffer 2.*' will actually not be included. This package can be got at: $ git clone git@github.com:RUNOFF/groffer.git main ChangeLog file: Emacs corrections keeping the content. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1401&r2=1.1402 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/ChangeLog?cvsroot=groff&r1=1.64&r2=1.65 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1401 retrieving revision 1.1402 diff -u -b -r1.1401 -r1.1402 --- ChangeLog 10 Apr 2013 23:36:05 -0000 1.1401 +++ ChangeLog 11 Apr 2013 00:08:30 -0000 1.1402 @@ -1,5 +1,14 @@ 2013-04-11 Bernd Warken + * contrib/groffer/: There is a free `git' package containing all + old `groffer' versions `v0.*' and `v1.*'. The new versions + `groffer 2.*' will actually not be included. This package can be + got at: + + $ git clone git@github.com:RUNOFF/groffer.git + +2013-04-11 Bernd Warken + * contrib/glilypond/: There is a free `git' package containing all old versions of the former name `groff_lilypond v0.*'. They work with `lilypond' parts in `roff' files, but were not installed. @@ -89,8 +98,9 @@ also says that the DSC parser works in a case sensitive manner. In other words, `ProcSet' is not valid according to the DSC - documentation, only `procset' is. So much about today's validity of - DSC... This patch adapts grops's code to the PostScript reality. + documentation, only `procset' is. So much about today's validity + of DSC... This patch adapts grops's code to the PostScript + reality. (resource_manager::do_begin_data): Fix typo (present since the beginning) which prevented correct handling of binary data. @@ -177,20 +187,20 @@ macro warning: adjusted level n bookmark; should be <= n - Added copyright and mention debt owed to Keith Marshall for original - `pdfmark.tmac', upon which `pdf.tmac' is largely based. + Added copyright and mention debt owed to Keith Marshall for + original `pdfmark.tmac', upon which `pdf.tmac' is largely based. * font/devpdf/Foundry.in, font/devpdf/util/BuildFoundries.pl (LocateFile): The font for EURO had the wrong entry in the `download' file (it pointed to The font in the build directory, which is wrong). It has always been permissable to include a path - along with the font name in the Foundry file, but until now the font - had to exist to be valid. It is now permitted to start the path - with an asterisk which tells BuildFoundry to use the path/filename - in the download file without checking if the font exists. This - allows the font to be found in `../devps' even though it is not - there during the build (if source and build are different), but will - be there after the install. + along with the font name in the Foundry file, but until now the + font had to exist to be valid. It is now permitted to start the + path with an asterisk which tells BuildFoundry to use the + path/filename in the download file without checking if the font + exists. This allows the font to be found in `../devps' even + though it is not there during the build (if source and build are + different), but will be there after the install. 2013-01-13 Werner LEMBERG @@ -207,7 +217,8 @@ 2013-01-07 Deri James - * font/devpdf/util/BuildFoundries.pl (LoadFoundry): Improve warning. + * font/devpdf/util/BuildFoundries.pl (LoadFoundry): Improve + warning. 2013-01-07 Werner LEMBERG @@ -219,11 +230,11 @@ At the same time, fix a small bug causing `.lf' requests not starting a line. - * src/preproc/tbl/table.cpp (table::init_output, - table::compute_expand_width, table::compute_separation_factor, - table::define_bottom_macro, table::do_bottom): Temporarily switch - off eqn delimiters, wrapping the code into a `.ig' block. This uses - the new functionality just added to eqn. + * src/preproc/tbl/table.cpp (table::init_output) + (table::compute_expand_width, table::compute_separation_factor) + (table::define_bottom_macro, table::do_bottom): Temporarily switch + off eqn delimiters, wrapping the code into a `.ig' block. This + uses the new functionality just added to eqn. * src/preproc/eqn/eqn.man, src/preproc/tbl/tbl.man: Updated. @@ -231,8 +242,8 @@ [eqn] Add `delim on'. - * src/preproc/eqn/lex.cpp (start_delim_saved, end_delim_saved): New - global variables. + * src/preproc/eqn/lex.cpp (start_delim_saved, end_delim_saved): + New global variables. (do_delim): Handle `delim on' to restore previous start and end delimiters. @@ -258,8 +269,8 @@ Version 1.22.1 released ======================= - Due to CVE-2012-3386, ftp.gnu.org rejected uploading of version 1.22 - -- in other words, 1.22 has never been released. + Due to CVE-2012-3386, ftp.gnu.org rejected uploading of version + 1.22 -- in other words, 1.22 has never been released. * NEWS, REVISION, doc/groff.texinfo, doc/webpage.ms: Updated. @@ -360,8 +371,8 @@ * src/devices/gropdf/gropdf.pl (do_D): The command \D't N' moves horizontal position by 'N'. gropdf now obeys this rule. - (do_t): Fixed kerning issue where width of non-kerned text could be - wrongly calculated using previous kern factor. + (do_t): Fixed kerning issue where width of non-kerned text could + be wrongly calculated using previous kern factor. 2012-09-21 Werner LEMBERG @@ -383,15 +394,15 @@ [gropdf] Various minor fixes. - * font/devpdf/Foundry.in: Add font path to debian `gsfonts' package. + * font/devpdf/Foundry.in: Add font path to debian `gsfonts' + package. - * font/devpdf/util/BuildFoundries.pl: Handle missing fonts in a more - sane way, do NOT abort the complete make run! + * font/devpdf/util/BuildFoundries.pl: Handle missing fonts in a + more sane way, do NOT abort the complete make run! * src/devices/gropdf/gropdf: Accept papersize names (i.e. A4) as - either upper or lower case. - The -p (papersize) option should be length,width (currently reversed - - width,length) + either upper or lower case. The -p (papersize) option should be + length,width (currently reversed - width,length) * src/devices/gropdf/pdfmom.pl: Support use of GROFF_BIN_PATH. @@ -510,8 +521,8 @@ Remove running text in the synopses of various manual pages, as it badly screws up attempts to mechanically parse them. - * contrib/mom/groff_mom.man: Use .URL rather than .UR/.UE, as this is - now preferred for manual pages. + * contrib/mom/groff_mom.man: Use .URL rather than .UR/.UE, as this + is now preferred for manual pages. 2012-07-03 Werner LEMBERG @@ -560,29 +571,34 @@ * doc/groff.texinfo: Add extra info about `.asciify'. Document new gropdf options -u and -s. - * src/devices/gropdf/gropdf.man: Remove references to Type 42 fonts, - they do not work in PDFs. + * src/devices/gropdf/gropdf.man: Remove references to Type 42 + fonts, they do not work in PDFs. + Document new option -s which adds `statistics' line to end of PDF - file showing number of pages in document. This has always been the - default behaviour (to add this line), all other software seems to - ignore it as intended, but `gs' sometimes complains, so the default - is now to omit the statistics. - Document new option -u[cmapfilename] to allow a user ToUnicode CMap - instead of gropdf's default. If no `cmapfilename' given then do not - include any ToUnicode CMap. + file showing number of pages in document. This has always been + the default behaviour (to add this line), all other software seems + to ignore it as intended, but `gs' sometimes complains, so the + default is now to omit the statistics. + + Document new option -u[cmapfilename] to allow a user ToUnicode + CMap instead of gropdf's default. If no `cmapfilename' given then + do not include any ToUnicode CMap. * src/devices/gropdf/gropdf.pl : Allow `bundled' flags on command line (i.e. -de = -d -e). - Use $RT_SEP as multi path separator, not hard coded `:'. Update all - users. - New flags -u and -s. - Once a custom papersize has been set as \X'papersize x,y' make it - sticky so all following pages use custom size. - When importing pdf with \X'pdf: pdfpic ...' do not compress objects - which are already compressed! This caused problems with PDFs - created with ImageMagick, now fixed. - (IsText, PutLine, do_t): The troff `u' command can contain a kerning - adjustment number, this was not being handled, now fixed. + + Use $RT_SEP as multi path separator, not hard coded `:'. Update + all users. + + New flags -u and -s. Once a custom papersize has been set as + \X'papersize x,y' make it sticky so all following pages use custom + size. When importing pdf with \X'pdf: pdfpic ...' do not compress + objects which are already compressed! This caused problems with + PDFs created with ImageMagick, now fixed. + + (IsText, PutLine, do_t): The troff `u' command can contain a + kerning adjustment number, this was not being handled, now fixed. + (do_c): The troff `c' command was not being handled correctly, now fixed. (FindChar, RemapChr, do_N): Handle fonts with more than 255 glyphs. @@ -604,8 +620,10 @@ strings. (pdfbookmark): Correct handling of bookmark levels. Convert \[em] to hyphen in bookmarks - Rather use -N than -T for "named" bookmarks (-T already used for "tag" - in pdfmark.tmac) + + Rather use -N than -T for "named" bookmarks (-T already used for + "tag" in pdfmark.tmac) + (.pdfclean): New macro which attempts to asciify bookmark text. (.pdfpagename): New wrapper macro for \X'pdf: pagename'. (.pdfswitchtopage): New wrapper macro for \X'pdf: switchtopage'. @@ -621,8 +639,8 @@ * src/roff/troff/number.cpp (parse_expr) : Add cast. - * src/devices/xditview/Makefile.sub (EXTRA_CFLAGS): Add `-Dlint' so - that unused static ID arrays don't cause a warning. + * src/devices/xditview/Makefile.sub (EXTRA_CFLAGS): Add `-Dlint' + so that unused static ID arrays don't cause a warning. (Some) problems reported by Bjarni Ingi Gislason . @@ -643,14 +661,15 @@ Update configuration files from `gnulib' and `config' repositories. - This also fixes a problem with `iconv' on Solaris 10, as reported in + This also fixes a problem with `iconv' on Solaris 10, as reported + in http://lists.gnu.org/archive/html/bug-groff/2012-02/msg00007.html * configure.ac: Call `gl_LOCALCHARSET. Call `AM_ICONV' as C++. - * config.guess, config.rpath, config.sub, install-sh, mkinstalldirs: + * config.guess, config.rpath, config.sub, install-sh, mkinstalldir: Updated. * m4/codeset.m4, m4/glib21.m4, m4/iconv.m4, m4/lib-ld.m4, @@ -683,8 +702,9 @@ [gropdf] Fixes and omissions. - * src/devices/gropdf/gropdf.pl (, do_u): Add facility to handle - track kerning (.tkf). + * src/devices/gropdf/gropdf.pl (, do_u): Add facility to + handle track kerning (.tkf). + (do_x, do_p, do_t): If pages are reordered using `pagename' and `switchtopage' keep track of outline bookmarks. (do_x): Handle multiple files on gropdf command line, stitch @@ -693,8 +713,9 @@ processed in order. What prevented it working properly before is the way an `x i' (initialize) record has been handled. It now processes the initialization code only in the first file. - (PutHotSpot): Allow user to control size of hotspot bounding box on - clickable links by setting PDFHREF.LEADING + + (PutHotSpot): Allow user to control size of hotspot bounding box + on clickable links by setting PDFHREF.LEADING * tmac/pdf.tmac (PDFHREF.LEADING): Adjust value. (pdf*href): Pass value of PDFHREF.LEADING to gropdf. @@ -740,14 +761,15 @@ Some hdtbl and mom examples want PostScript formatting which requires the `DESC' file to be ready; however, the top-level - `Makefile.in' doesn't currently enforce the proper order of building - of `font/dev' before `contrib/hdtbl', `contrib/mom', and so on. + `Makefile.in' doesn't currently enforce the proper order of + building of `font/dev' before `contrib/hdtbl', `contrib/mom', and + so on. Given that `font/dev' and the contrib examples are in different child processes of the recursive make system, it doesn't seem possible to solve this using clean Makefile dependencies. We now - enforce the order by splitting the shell command invoking recursive - make in the top level `Makefile.in'. + enforce the order by splitting the shell command invoking + recursive make in the top level `Makefile.in'. * Makefile.in (ALLDIRS): Remove `OTHERDIRS'. (dodirs): Updated. @@ -797,7 +819,8 @@ 2011-11-14 Werner LEMBERG - * src/preproc/tbl/tbl.man: Improve documentation of `_' and friends. + * src/preproc/tbl/tbl.man: Improve documentation of `_' and + friends. 2011-10-31 Werner LEMBERG @@ -810,8 +833,9 @@ * src/utils/tfmtodit/tfmtodit.cpp (char_info_word): Use `unsigned char' for all members. - * src/devices/grohtml/html-text.cpp (html_text::remove_def): Remove - unused variable `q'. + * src/devices/grohtml/html-text.cpp (html_text::remove_def): + Remove unused variable `q'. + * src/devices/grohtml/post-html.cpp (html_printer::lookahead_for_tables): Remove unused variable `left' and `seen_text'. @@ -821,13 +845,13 @@ [mdoc] Synchronize string tables with the mandoc(1) utility. * tmac/doc-common: Add many architecture names used in NetBSD and - OpenBSD (and "arm" from FreeBSD) and remove the duplicate OS version - entry for Darwin-10.6.0. + OpenBSD (and "arm" from FreeBSD) and remove the duplicate OS + version entry for Darwin-10.6.0. * tmac/doc-syms: Add many library names used in NetBSD and FreeBSD. - * tmac/groff_mdoc.man: Document all supported architecture names, OS - versions, and library names. + * tmac/groff_mdoc.man: Document all supported architecture names) + (OS versions, and library names. 2011-09-11 Joseph Koshy @@ -851,8 +875,9 @@ [gropdf] Minor updates and fixes. - * src/devices/gropdf/gropdf.pl: Change command line option `-fy' to - `-y' for consistency. + * src/devices/gropdf/gropdf.pl: Change command line option `-fy' + to `-y' for consistency. + Better support for Windows platform. (do_x): Handle keywords `pagename' and `switchtopage'. @@ -878,8 +903,8 @@ 2011-07-29 Daiki Ueno - Fix cross building. - Problem reported by Christophe Jarry . + Fix cross building. Problem reported by Christophe Jarry + . * Makefile.in ($GNULIBDIRS): Pass original config arguments to src/libs/gnulib/configure. @@ -921,9 +946,10 @@ (@h, @n, @o, @t, @k, )b, (c, (q, )q, (l, )l, (f, @q, PE): Updated. * doc/meref.me: Document changes. - * src/preproc/tbl/table.cpp (ROW_START_LINE_REG, ROW_SAVE_LINE_REG, - ROW_MAX_LINE_REG, REPEATED_NM_SET_MACRO, REPEATED_NM_SUS_MACRO): New - macros. + * src/preproc/tbl/table.cpp (ROW_START_LINE_REG) + (ROW_SAVE_LINE_REG, ROW_MAX_LINE_REG, REPEATED_NM_SET_MACRO) + (REPEATED_NM_SUS_MACRO): New macros. + (table::init_output): Define REPEATED_NM_SET_MACRO and REPEATED_NM_SUS_MACRO. (table::print_single_hline, table::print_double_hline, @@ -979,18 +1005,19 @@ * Makefile.in ($TARGETS): We must not pass `$MDEFINES' recursively down to the sub-makes started in src/libs/gnulib, because that - directory has its own values for `$top_srcdir' etc., and overriding - those from the command line will cause the build to fail. - Currently, `$MAKEOVERRIDES' will prevent the recursive passing of - those overrides with GNU make, but not with other make(1) - implementations. It looks like all targets that require `$MDEFINES' - set them explicitly anyway, so we shouldn't need to set `$MDEFINES' - on the top level. + directory has its own values for `$top_srcdir' etc., and + overriding those from the command line will cause the build to + fail. Currently, `$MAKEOVERRIDES' will prevent the recursive + passing of those overrides with GNU make, but not with other + make(1) implementations. It looks like all targets that require + `$MDEFINES' set them explicitly anyway, so we shouldn't need to + set `$MDEFINES' on the top level. 2011-03-21 Jan Vcelak Bernd Warken - [groffer] Remove hardcoded path to 'libdir/groff/groffer' directory. + [groffer] Remove hardcoded path to 'libdir/groff/groffer' + directory. * configure.ac: add GROFFERDIR variables. @@ -1002,16 +1029,16 @@ [troff] Improve error message. - * src/roff/troff/input.cc (token::delimiter): Improve error message. - Suggested by Doug McIlroy . + * src/roff/troff/input.cc (token::delimiter): Improve error + message. Suggested by Doug McIlroy . 2011-03-04 Werner LEMBERG [mdoc] Within .An, .Aq, .Ao, and .Ac now use `<' and `>'. Problem reported by Ulrich Spörlein - * tmac/doc.tmac (Aq, Ao, Ac): Implement it to follow RFC 822 and RFC - 2822. + * tmac/doc.tmac (Aq, Ao, Ac): Implement it to follow RFC 822 and + RFC 2822. 2011-02-14 Werner LEMBERG @@ -1031,8 +1058,9 @@ Fix Savannah bug #32301. - * src/roff/groff/Makefile.sub (XLIBS), src/preproc/grn/Makefile.sub, - src/preproc/html/Makefile.sub: Add $(LIBGNU). + * src/roff/groff/Makefile.sub (XLIBS), + src/preproc/grn/Makefile.sub, src/preproc/html/Makefile.sub: Add + $(LIBGNU). 2011-01-29 Krzysztof Żelechowski @@ -1110,8 +1138,8 @@ Fix handling of wide characters in no-SGR mode. * src/devices/grotty/tty.cpp (tty_printer::make_underline): Only - emit a single backspace in no-SGR mode. less (at least) backspaces - over a character at a time. + emit a single backspace in no-SGR mode. less (at least) + backspaces over a character at a time. (tty_printer::make_bold): Likewise. 2011-01-19 Werner LEMBERG Index: contrib/groffer/ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/groffer/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -b -r1.64 -r1.65 --- contrib/groffer/ChangeLog 1 Apr 2013 17:41:21 -0000 1.64 +++ contrib/groffer/ChangeLog 11 Apr 2013 00:08:30 -0000 1.65 @@ -1,3 +1,12 @@ +2013-04-11 Bernd Warken + + * contrib/groffer: There is now a free `git' package containing + all old `groffer' versions `v0.*' and `v1.*'. The new versions + `groffer 2.*' will actually not be included. This package can be + got at: + + $ git clone git@github.com:RUNOFF/groffer.git + 2013-03-29 Bernd Warken * perl/groffer.pl: Change viewers for `PS'. @@ -16,8 +25,8 @@ 2012-08-07 Eric S. Raymond - Yet more elimination of low-level troff hackery in the documentation - so it can be lifted to structural markup. + Yet more elimination of low-level troff hackery in the + documentation so it can be lifted to structural markup. * perl/groffer.man: Use .IP rather than .TP in .Topic; this make structural parsing work. Also remove a @@ -284,22 +293,22 @@ The former part of the ChangeLog file is in `shell/ChangeLog.0'. 2006-10-01 Bernd Warken - ________________________________________________________________ - License +________________________________________________________________ +License - Copyright (C) 2006-2009, 2011 +Copyright (C) 2006-2009, 2011 Free Software Foundation, Inc. - Written by Bernd Warken . +Written by Bernd Warken . - Copying and distribution of this file, with or without - modification, are permitted provided the copyright notice and this - notice are preserved. +Copying and distribution of this file, with or without +modification, are permitted provided the copyright notice and this +notice are preserved. - This file is part of `groffer', which is part of the `groff' - project. +This file is part of `groffer', which is part of the `groff' +project. - ####### Emacs settings +####### Emacs settings - Local Variables: - mode: change-log - End: +Local Variables: +mode: change-log +End: From MAILER-DAEMON Fri Apr 12 09:11:34 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQdlO-00019p-5a for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 09:11:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQdlF-00018w-BN for groff-commit@gnu.org; Fri, 12 Apr 2013 09:11:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQdlB-0004b9-Rp for groff-commit@gnu.org; Fri, 12 Apr 2013 09:11:25 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:39703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQdlB-0004az-Np for groff-commit@gnu.org; Fri, 12 Apr 2013 09:11:21 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQdl9-0002QC-3B for groff-commit@gnu.org; Fri, 12 Apr 2013 13:11:19 +0000 Date: Fri, 12 Apr 2013 13:11:19 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog Makefile.in configure configure... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 13:11:31 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 13:11:18 Modified files: . : ChangeLog Makefile.in configure configure.ac m4 : groff.m4 Log message: `grog': In the following, the file `grog.pl' will be split. For the coming files, a lib-directory is needed for storage. m4/groff.m4, configure.ac: Add libdir information for `grog'. Makefile.in: Add @grog_dir@. Run `autoconf'. `grog' has now a lib-directory at `$prefix/lib/groff/grog'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1402&r2=1.1403 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.125&r2=1.126 http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.91&r2=1.92 http://cvs.savannah.gnu.org/viewcvs/groff/configure.ac?cvsroot=groff&r1=1.51&r2=1.52 http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.9&r2=1.10 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1402 retrieving revision 1.1403 diff -u -b -r1.1402 -r1.1403 --- ChangeLog 11 Apr 2013 00:08:30 -0000 1.1402 +++ ChangeLog 12 Apr 2013 13:11:14 -0000 1.1403 @@ -1,3 +1,16 @@ +2013-04-12 Bernd Warken + + * `grog': In the following, the file `grog.pl' will be split. For + the coming files, a lib-directory is needed for storage. + + * m4/groff.m4, configure.ac: Add libdir information for `grog'. + + * Makefile.in: Add @grog_dir@. + + Run `autoconf'. + + `grog' has now a lib-directory at `$prefix/lib/groff/grog'. + 2013-04-11 Bernd Warken * contrib/groffer/: There is a free `git' package containing all Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.125 retrieving revision 1.126 diff -u -b -r1.125 -r1.126 --- Makefile.in 29 Mar 2013 11:41:20 -0000 1.125 +++ Makefile.in 12 Apr 2013 13:11:16 -0000 1.126 @@ -192,6 +192,7 @@ groffer_dir=@groffer_dir@ glilypond_dir=@glilypond_dir@ +grog_dir=@grog_dir@ # `tmacpath' says where to look for macro files. # The current directory will be prepended in unsafe mode only; the home @@ -505,6 +506,7 @@ "appresdir=$(appresdir)" \ "groffer_dir=$(groffer_dir)" \ "glilypond_dir=$(glilypond_dir)" \ + "grog_dir=$(grog_dir)" \ "bindir=$(bindir)" \ "common_words_file=$(common_words_file)" \ "datadir=$(datadir)" \ Index: configure =================================================================== RCS file: /cvsroot/groff/groff/configure,v retrieving revision 1.91 retrieving revision 1.92 diff -u -b -r1.91 -r1.92 --- configure 29 Mar 2013 12:29:04 -0000 1.91 +++ configure 12 Apr 2013 13:11:17 -0000 1.92 @@ -741,6 +741,7 @@ PACKAGE_NAME PATH_SEPARATOR SHELL +grog_dir glilypond_dir' ac_subst_files='' ac_user_opts=' @@ -5530,6 +5531,8 @@ glilypond_dir=$libdir/groff/glilypond +grog_dir=$libdir/groff/grog + if test -z "$PSPRINT"; then for ac_prog in lpr do Index: configure.ac =================================================================== RCS file: /cvsroot/groff/groff/configure.ac,v retrieving revision 1.51 retrieving revision 1.52 diff -u -b -r1.51 -r1.52 --- configure.ac 29 Mar 2013 11:41:20 -0000 1.51 +++ configure.ac 12 Apr 2013 13:11:17 -0000 1.52 @@ -63,6 +63,7 @@ GROFF_GROFFERDIR_OPTION GROFF_GROFFERDIR_DEFAULT GROFF_GLILYPONDDIR_DEFAULT +GROFF_GROGDIR_DEFAULT GROFF_PRINT AC_PROG_EGREP AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl]) Index: m4/groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- m4/groff.m4 29 Mar 2013 11:41:21 -0000 1.9 +++ m4/groff.m4 12 Apr 2013 13:11:18 -0000 1.10 @@ -1215,3 +1215,7 @@ AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT], glilypond_dir=$libdir/groff/glilypond AC_SUBST([glilypond_dir])) + +AC_DEFUN([GROFF_GROGDIR_DEFAULT], + grog_dir=$libdir/groff/grog + AC_SUBST([grog_dir])) From MAILER-DAEMON Fri Apr 12 10:19:15 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQeot-0008TE-RS for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 10:19:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQeok-0008SE-LN for groff-commit@gnu.org; Fri, 12 Apr 2013 10:19:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQeoh-00054S-1R for groff-commit@gnu.org; Fri, 12 Apr 2013 10:19:06 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:46650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQeog-00054L-Ua for groff-commit@gnu.org; Fri, 12 Apr 2013 10:19:02 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQeog-0006Zo-Ce for groff-commit@gnu.org; Fri, 12 Apr 2013 14:19:02 +0000 Date: Fri, 12 Apr 2013 14:19:02 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/grog/Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 14:19:14 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 14:19:02 Modified files: . : ChangeLog src/roff/grog : Makefile.sub Log message: grog: remove shell version. Add file perl_test.pl for testing the available Perl version. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1403&r2=1.1404 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/Makefile.sub?cvsroot=groff&r1=1.14&r2=1.15 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1403 retrieving revision 1.1404 diff -u -b -r1.1403 -r1.1404 --- ChangeLog 12 Apr 2013 13:11:14 -0000 1.1403 +++ ChangeLog 12 Apr 2013 14:19:02 -0000 1.1404 @@ -1,5 +1,19 @@ 2013-04-12 Bernd Warken + * `grog': Remove the shell version of `grog'. Now there is only + Perl version. + + * src/roff/grog/perl.sh: Remove this file. + + * src/roff/grog/Makefile.sub: This file handles the removement of + the shell version. + + * src/roff/grog/perl_test.pl: New file for testing the available + Perl version in the system to be installed into. This file will + be installed into the grog lib-directory. + +2013-04-12 Bernd Warken + * `grog': In the following, the file `grog.pl' will be split. For the coming files, a lib-directory is needed for storage. Index: src/roff/grog/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/grog/Makefile.sub,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- src/roff/grog/Makefile.sub 8 Jan 2009 08:28:28 -0000 1.14 +++ src/roff/grog/Makefile.sub 12 Apr 2013 14:19:02 -0000 1.15 @@ -2,9 +2,9 @@ # File position: /src/roff/grog/Makefile.sub -# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 1993, 2006, 2009, 2013 Free Software Foundation, Inc. -# Last update: 5 Jan 2009 +# Last update: 12 Apr 2013 # This file is part of `grog' which is part of `groff'. @@ -24,34 +24,59 @@ ######################################################################## MAN1=grog.n -MOSTLYCLEANADD=grog +MOSTLYCLEANADD=grog $(MAN1) HAVE_PERL + +# not all make programs have $(RM) predefined. +RM=rm -f all: grog $(MAN1) -grog: grog.pl grog.sh $(SH_DEPS_SED_SCRIPT) - -@rm -f $@; - if test -n "$(PERLPATH)" && test -f "$(PERLPATH)" && \ - "$(PERLPATH)" -e 'require v5.6'; then \ - echo 'Using the Perl version for grog.'; \ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|@VERSION@|$(version)$(revision)|" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/grog.pl >$@; \ - else \ - echo 'Using the shell version for grog.'; \ +GROG=$(srcdir)/perl_test.pl + +GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'` + +grog: grog.pl $(SH_DEPS_SED_SCRIPT) + -@$(RM) -f $@; + if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ + : >HAVE_PERL; \ + echo "Perl version works for "$@"'."; \ sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|@g@|$(g)|g" \ + -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -e "s|@EGREP@|$(EGREP)|g" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/grog.sh >$@; \ + $(srcdir)/grog.pl >$@; \ + chmod +x $@; \ + else \ + echo "This program "$@" needs a newer version of Perl."; \ + exit 1 fi chmod +x $@ install_data: grog - -@test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) - -@rm -f $(DESTDIR)$(bindir)/grog + -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) + $(RM) $(DESTDIR)$(bindir)/grog $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog + -test -d $(DESTDIR)$(grog_dir) \ + || $(mkinstalldirs) $(DESTDIR)$(grog_dir) + for f in $(GROG_); do \ + $(RM) $(DESTDIR)$(grog_dir)/$$f; \ + done + if test -f HAVE_PERL; then \ + for f in $(GROG_); do \ + $(INSTALL_SCRIPT) $(srcdir)/$$f \ + $(DESTDIR)$(grog_dir)/$$f; \ + done; \ + fi; + + uninstall_sub: - -rm -f $(DESTDIR)$(bindir)/grog + $(RM) $(DESTDIR)$(bindir)/grog + for f in $(GROG_); do \ + $(RM) $(DESTDIR)$(grog_dir)/$$f; \ + done + -test -d $(DESTDIR)$(libdir)/groff/grog || \ + rmdir $(DESTDIR)$(libdir)/groff/grog From MAILER-DAEMON Fri Apr 12 10:30:41 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQezx-0001uy-SQ for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 10:30:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQezv-0001uj-9B for groff-commit@gnu.org; Fri, 12 Apr 2013 10:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQezs-0001T0-2p for groff-commit@gnu.org; Fri, 12 Apr 2013 10:30:39 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:58584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQezr-0001Sl-Tl for groff-commit@gnu.org; Fri, 12 Apr 2013 10:30:36 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQezr-0007Dr-B9 for groff-commit@gnu.org; Fri, 12 Apr 2013 14:30:35 +0000 Date: Fri, 12 Apr 2013 14:30:35 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/src/roff/grog perl_test.pl X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 14:30:40 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 14:30:35 Added files: src/roff/grog : perl_test.pl Log message: grog: perl_test.pl added to CVS. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/perl_test.pl?cvsroot=groff&rev=1.1 Patches: Index: perl_test.pl =================================================================== RCS file: perl_test.pl diff -N perl_test.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl_test.pl 12 Apr 2013 14:30:34 -0000 1.1 @@ -0,0 +1,41 @@ +#! /usr/bin/env perl + +# grog - create groff arguments for `roff' files + +# Source file position: /roff/grog/perl_test.sh +# Installed position: /lib/groff/grog/perl_test.sh + +# Copyright (C) 2013 +# Free Software Foundation, Inc. +# Written by Bernd Warken . + +# Last update: 12 Apr 2013 + +# This file is part of `grog', which is part of `groff'. + +# `groff' is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# `groff' is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +######################################################################## + +# This file tests whether perl has a suitable version. It is used by +# glilypond.pl and Makefile.sub. + +require v5.6; + + +######################################################################## +### Emacs settings +# Local Variables: +# mode: CPerl +# End: From MAILER-DAEMON Fri Apr 12 10:44:16 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQfD6-00009T-1a for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 10:44:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfCz-000093-AZ for groff-commit@gnu.org; Fri, 12 Apr 2013 10:44:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQfCu-0006MM-2A for groff-commit@gnu.org; Fri, 12 Apr 2013 10:44:09 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:58653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfCt-0006ME-W0 for groff-commit@gnu.org; Fri, 12 Apr 2013 10:44:04 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQfCt-0007m3-Da for groff-commit@gnu.org; Fri, 12 Apr 2013 14:44:03 +0000 Date: Fri, 12 Apr 2013 14:44:03 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/src/roff/grog grog.sh X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 14:44:14 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 14:44:03 Removed files: src/roff/grog : grog.sh Log message: grog: clear the file content in src/roff/grog/. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/grog.sh?cvsroot=groff&r1=1.21&r2=0 Patches: Index: grog.sh =================================================================== RCS file: grog.sh diff -N grog.sh --- grog.sh 22 Jan 2013 00:29:43 -0000 1.21 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,279 +0,0 @@ -#! /bin/sh -# grog -- guess options for groff command -# Like doctype in Kernighan & Pike, Unix Programming Environment, pp 306-8. - -# Source file position: /src/roff/grog/grog.sh -# Installed position: /bin/grog - -# Copyright (C) 1993, 2006, 2009, 2011-2012 Free Software Foundation, Inc. -# Written by James Clark, maintained by Werner Lemberg. -# Rewritten by and put under GPL Bernd Warken . - -# This file is part of `grog', which is part of `groff'. - -# `groff' is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License (GPL) as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# `groff' is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -######################################################################## -Last_Update='22 Jan 2011' -######################################################################## - -soelim=@g@soelim - -opts= -mopt= -nr=0 -sp="([ ]|$)" -double_minus=0 -was_minus=0 -filespec= -had_filespec=0 - -for arg -do - if test _"${double_minus}"_ = _1_ - then - had_filespec=1 - if test -f "${arg}" && test -r "${arg}" - then - case "$arg" in - *" "*) - eval filespec="'${filespec} '"'\"'"'${arg}'"'\"' - ;; - *) - eval filespec="'${filespec} ${arg}'" - ;; - esac - else - echo "grog: ${arg} is not a readable file.">&2 - fi - continue - fi - case "$arg" in - --) - double_minus=1 - ;; - -) - # omit several - - if test _"${was_minus}"_ = _0_ - then - was_minus=1 - filespec="${filespec} -" - fi - ;; - -C) - sp=; opts="$opts -C"; - ;; - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo \ -"Shell version of GNU grog of $Last_Update in groff version @VERSION@"; - exit 0 - ;; - -h|--h|--he|--hel|--help) - cat <&2 - mopt= - fi - ;; - -*) - opts="$opts $arg" - ;; - *) - had_filespec=1 - if test -f "${arg}" && test -r "${arg}" - then - case "$arg" in - *" "*) - eval filespec="'${filespec} '"'\"'"'${arg}'"'\"' - ;; - *) - eval filespec="'${filespec} ${arg}'" - ;; - esac - else - echo "grog: ${arg} is not a readable file.">&2 - fi - ;; - esac -done -if test _"${filespec}"_ = __ && test _"${had_filespec}"_ = _0_ -then - filespec='-' -fi -if test _"${filespec}"_ = __ -then - exit 1 -fi -if test "${double_minus}" = 1 -then - eval files="'-- ${filespec}'" -else - eval files="'${filespec}'" -fi -files=`echo $files|sed s/\"/\'/g` - - -eval sed "'s/[ ]*$//'" '--' "${filespec}" \ -| sed 's/^[ ]*begin[ ][ ]*chem$/.cstart/' \ -| sed 's/^[.'"'"'][ ]*/./' \ -| @EGREP@ -h \ - "^\.(\[|\])|cstart|((P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|NH|TL|TS|TE|EQ|TH|SH|so|\[|R1|GS|G1|PH|SA)$sp)" \ -| sed '/^\.so/s/^.*$/.SO_START\ -&\ -.SO_END/' \ -| $soelim \ -| @EGREP@ \ - '^\.(cstart|P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|NH|TL|TS|TE|EQ|TH|TL|NH|SH|\[|\]|R1|GS|G1|PH|SA|SO_START|SO_END)' \ -| awk ' -/^\.SO_START$/ { so = 1 - soelim = soelim||chem||eqn||grap||grn||pic||tbl||refer||(refer_start && !refer_end) } -/^\.SO_END$/ { so = 0 } -/^\.cstart$/ { chem++; if (so > 0) soelim++ } -/^\.TS/ { tbl++; in_tbl = 1; if (so > 0) soelim++; } -/^\.TE/ { in_tbl = 0 } -/^\.PS([ 0-9.<].*)?$/ { pic++; if (so > 0) soelim++ } -/^\.EQ/ { eqn++; if (so > 0) soelim++ } -/^\.R1/ { refer++; if (so > 0) soelim++ } -/^\.\[/ { refer_start++; if (so > 0) soelim++ } -/^\.\]/ { refer_end++; if (so > 0) soelim++ } -/^\.GS/ { grn++; if (so > 0) soelim++ } -/^\.G1/ { grap++; if (so > 0) soelim++ } -/^\.TH/ { if (in_tbl != 1) TH++ } -/^\.PP/ { PP++ } -/^\.TL/ { TL++ } -/^\.NH/ { NH++ } -/^\.[IL]P/ { ILP++ } -/^\.P$/ { P++ } -/^\.SH/ { SH++ } -/^\.(PH|SA)/ { mm++ } -/^\.([pnil]p|sh)/ { me++ } -/^\.Dd/ { mdoc++ } -/^\.(Tp|Dp|De|Cx|Cl)/ { mdoc_old++ } -/^\.(O[oc]|.* O[oc]( |$))/ { - sub(/\\\".*/, "") - gsub(/\"[^\"]*\"/, "") - sub(/\".*/, "") - sub(/^\.Oo/, " Oo ") - sub(/^\.Oc/, " Oc ") - sub(/ Oo$/, " Oo ") - sub(/ Oc$/, " Oc ") - while (/ Oo /) { - sub(/ Oo /, " ") - Oo++ - } - while (/ Oc /) { - sub(/ Oc /, " ") - Oo-- - } -} -/^\.(PRINTSTYLE|START)/ { mom++ } - -END { - printf "groff" - refer = refer || (refer_start && refer_end) - if (pic > 0 || tbl > 0 || grn > 0 || grap > 0 || - eqn > 0 || refer > 0 || chem > 0) { - printf " -" - if (soelim > 0) printf "s" - if (refer > 0) printf "R" - if (grn > 0) printf "g" - if (chem > 0) printf "j" - if (grap > 0) printf "G" - if (pic > 0) printf "p" - if (tbl > 0) printf "t" - if (eqn > 0) printf "e" - } - mnr = 0 - m = "" - is_man = 0 - is_mm = 0 - is_mom = 0 - # me - if (me > 0) { - mnr++; m = "-me"; printf " -me" - } - # man - if (SH > 0 && TH > 0) { - mnr++; m = "-man"; printf " -man"; is_man = 1 - } - # mom - if (mom > 0) { - mnr++; m = "-mom"; printf " -mom"; is_mom = 1 - } - # mm - if ( mm > 0 || (P > 0 && is_man == 0) ) { - mnr++; m = "-mm"; printf " -mm"; is_mm = 1 - } - # ms - if ( NH > 0 || (TL > 0 && is_mm == 0) || (ILP > 0 && is_man == 0) || - (PP > 0 && is_mom == 0 && is_man == 0) ) { - # .TL also occurs in -mm, .IP and .LP also occur in -man - # .PP also occurs in -mom and -man - mnr++; m = "-ms"; printf " -ms" - } - # mdoc - if (mdoc > 0) { - mnr++ - if (mdoc_old > 0 || Oo > 0) { - m = "-mdoc-old"; printf " -mdoc-old" - } - else { - m = "-mdoc"; printf " -mdoc" - } - } - - if (mnr == 0) { - if (mopt != "") - printf "%s", mopt - } - - if (opts != "") - printf "%s", opts - if (files != "") - printf " %s", files - print "" - - if (mnr == 1) { - if (mopt != "" && m != mopt) - printf "grog: wrong option %s\n", mopt | "cat 1>&2" - } - if (mnr >= 2) { - err = "grog: error: there are several -m* arguments" - printf "%s\n", err | "cat 1>&2" - exit mnr - } -}' "opts=$opts" "mopt=$mopt" "files=$files" - From MAILER-DAEMON Fri Apr 12 11:14:50 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQfgg-0000aP-3L for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 11:14:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfga-0000aE-4y for groff-commit@gnu.org; Fri, 12 Apr 2013 11:14:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQfgV-0000vd-7I for groff-commit@gnu.org; Fri, 12 Apr 2013 11:14:44 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:54088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfgV-0000vY-3d for groff-commit@gnu.org; Fri, 12 Apr 2013 11:14:39 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQfgU-0001Ax-6h for groff-commit@gnu.org; Fri, 12 Apr 2013 15:14:38 +0000 Date: Fri, 12 Apr 2013 15:14:38 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/src/roff/grog Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 15:14:48 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 15:14:38 Modified files: src/roff/grog : Makefile.sub Log message: grog: correct Makefile.sub CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/Makefile.sub?cvsroot=groff&r1=1.15&r2=1.16 Patches: Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/grog/Makefile.sub,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- Makefile.sub 12 Apr 2013 14:19:02 -0000 1.15 +++ Makefile.sub 12 Apr 2013 15:14:37 -0000 1.16 @@ -36,7 +36,7 @@ GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'` grog: grog.pl $(SH_DEPS_SED_SCRIPT) - -@$(RM) -f $@; + -$(RM) -f $@; if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ : >HAVE_PERL; \ echo "Perl version works for "$@"'."; \ @@ -51,23 +51,21 @@ chmod +x $@; \ else \ echo "This program "$@" needs a newer version of Perl."; \ - exit 1 - fi - chmod +x $@ + exit 1; \ + fi; install_data: grog - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/grog - $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog + -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); + $(RM) $(DESTDIR)$(bindir)/grog; + $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog; -test -d $(DESTDIR)$(grog_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(grog_dir) + || $(mkinstalldirs) $(DESTDIR)$(grog_dir); for f in $(GROG_); do \ $(RM) $(DESTDIR)$(grog_dir)/$$f; \ done if test -f HAVE_PERL; then \ for f in $(GROG_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f \ - $(DESTDIR)$(grog_dir)/$$f; \ + $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \ done; \ fi; @@ -77,6 +75,6 @@ $(RM) $(DESTDIR)$(bindir)/grog for f in $(GROG_); do \ $(RM) $(DESTDIR)$(grog_dir)/$$f; \ - done + done; -test -d $(DESTDIR)$(libdir)/groff/grog || \ - rmdir $(DESTDIR)$(libdir)/groff/grog + rmdir $(DESTDIR)$(libdir)/groff/grog; From MAILER-DAEMON Fri Apr 12 17:07:52 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQlCK-0000Eu-PV for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 17:07:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQlCE-0000E8-7p for groff-commit@gnu.org; Fri, 12 Apr 2013 17:07:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQlC9-0002L0-Ew for groff-commit@gnu.org; Fri, 12 Apr 2013 17:07:46 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:50963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQlC9-0002KZ-By for groff-commit@gnu.org; Fri, 12 Apr 2013 17:07:41 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQlC8-0005DY-A2 for groff-commit@gnu.org; Fri, 12 Apr 2013 21:07:40 +0000 Date: Fri, 12 Apr 2013 21:07:40 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 21:07:51 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 21:07:40 Modified files: contrib/glilypond: ChangeLog Makefile.sub Log message: Correct former entries of glilypond. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.1&r2=1.2 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- ChangeLog 10 Apr 2013 23:36:06 -0000 1.4 +++ ChangeLog 12 Apr 2013 21:07:39 -0000 1.5 @@ -1,5 +1,9 @@ 2013-04-11 Bernd Warken + * Makefile.sub: Corrections for Emacs. + +2013-04-11 Bernd Warken + * old groff_lilypond: There is now a free `git' package containing all old versions of the former name `groff_lilypond v0.*'. They work with `lilypond' parts in `roff' files, but were not Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- Makefile.sub 29 Mar 2013 11:41:21 -0000 1.1 +++ Makefile.sub 12 Apr 2013 21:07:39 -0000 1.2 @@ -7,7 +7,7 @@ # Written by Werner Lemberg and # Bernd Warken . -# Last update: 28 Mar 2013 +# Last update: 12 Apr 2013 # This file is part of `glilypond' which is part of `groff'. @@ -48,7 +48,7 @@ if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ : >HAVE_PERL; \ echo "Perl version works for "$@"'."; \ - sed \ + sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ @@ -69,7 +69,7 @@ || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done + done; if test -f HAVE_PERL; then \ for f in $(GLILYPOND_); do \ $(INSTALL_SCRIPT) $(srcdir)/$$f \ @@ -81,8 +81,9 @@ $(RM) $(DESTDIR)$(bindir)/glilypond for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done - -rmdir $(DESTDIR)$(libdir)/groff/glilypond + done; + test -d $(DESTDIR)$(libdir)/groff/glilypond && \ + rmdir $(DESTDIR)$(libdir)/groff/glilypond ######################################################################## # Emacs settings From MAILER-DAEMON Fri Apr 12 17:46:09 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQlnN-0004Mt-7O for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 17:46:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQlnG-0004Lp-Cz for groff-commit@gnu.org; Fri, 12 Apr 2013 17:46:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQlnB-0000IY-Bv for groff-commit@gnu.org; Fri, 12 Apr 2013 17:46:02 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:55186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQlnB-0000ID-6t for groff-commit@gnu.org; Fri, 12 Apr 2013 17:45:57 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQlnA-0006yc-ON for groff-commit@gnu.org; Fri, 12 Apr 2013 21:45:56 +0000 Date: Fri, 12 Apr 2013 21:45:56 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog glilypond.pl ... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 21:46:07 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 21:45:56 Modified files: contrib/glilypond: ChangeLog glilypond.pl perl_test.pl subs.pl Log message: `glilypond': Replace `state' by global variable. So the Perl version can be reduced from `v5.9.4' to `v5.6'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.5&r2=1.6 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/perl_test.pl?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/subs.pl?cvsroot=groff&r1=1.1&r2=1.2 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- ChangeLog 12 Apr 2013 21:07:39 -0000 1.5 +++ ChangeLog 12 Apr 2013 21:45:56 -0000 1.6 @@ -1,3 +1,11 @@ +2013-04-12 Bernd Warken + + * subs.pl: Replace `state' by global variable. So the Perl + version can be older. + + * perl_test.pl: Replace the Perl version by `v5.6', analogously to + `groffer'. + 2013-04-11 Bernd Warken * Makefile.sub: Corrections for Emacs. Index: glilypond.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 Index: perl_test.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/perl_test.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- perl_test.pl 29 Mar 2013 11:41:21 -0000 1.1 +++ perl_test.pl 12 Apr 2013 21:45:56 -0000 1.2 @@ -9,7 +9,7 @@ # Free Software Foundation, Inc. # Written by Bernd Warken . -# Last update: 18 Mar 2013 +# Last update: 12 Apr 2013 # This file is part of `glilypond', which is part of `groff'. @@ -31,8 +31,8 @@ # This file tests whether perl has a suitable version. It is used by # glilypond.pl and Makefile.sub. -require v5.9.4; # for `state' in `subs.pl' - +# former: require v5.9.4; # for `state' in `subs.pl' +require v5.6; # analogously to `groffer' ######################################################################## ### Emacs settings Index: subs.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/subs.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- subs.pl 29 Mar 2013 11:41:21 -0000 1.1 +++ subs.pl 12 Apr 2013 21:45:56 -0000 1.2 @@ -12,7 +12,7 @@ Copyright (C) 2013 Free Software Foundation, Inc. Written by Bernd Warken -Last update: 26 Mar 2013 +Last update: 12 Apr 2013 This file is part of `glilypond', which is part of `GNU groff'. @@ -248,11 +248,11 @@ } # end sub make_dir() +my $number = 0; sub next_temp_file { our ( $Temp, $v, $Args ); - state $n = 0; - ++$n; - my $temp_basename = $Args -> { 'prefix' } . '_temp_' . $n; + ++$number; + my $temp_basename = $Args -> { 'prefix' } . '_temp_' . $number; my $temp_file = File::Spec -> catfile( $Temp -> { 'temp_dir' } , $temp_basename ); $v -> print( "next temporary file: `$temp_file'" ); From MAILER-DAEMON Fri Apr 12 18:30:49 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQmUb-0002bG-87 for mharc-groff-commit@gnu.org; Fri, 12 Apr 2013 18:30:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQmUY-0002XU-Ee for groff-commit@gnu.org; Fri, 12 Apr 2013 18:30:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQmUX-0004CK-6g for groff-commit@gnu.org; Fri, 12 Apr 2013 18:30:46 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:46327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQmUX-0004C8-0v for groff-commit@gnu.org; Fri, 12 Apr 2013 18:30:45 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UQmUW-0000rx-FN for groff-commit@gnu.org; Fri, 12 Apr 2013 22:30:44 +0000 Date: Fri, 12 Apr 2013 22:30:44 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog glilypond.pl X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 22:30:47 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/12 22:30:44 Modified files: contrib/glilypond: ChangeLog glilypond.pl Log message: glilypond.pl: Fix END for early exit of `--version'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.6&r2=1.7 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.2&r2=1.3 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- ChangeLog 12 Apr 2013 21:45:56 -0000 1.6 +++ ChangeLog 12 Apr 2013 22:30:44 -0000 1.7 @@ -1,5 +1,9 @@ 2013-04-12 Bernd Warken + * glilypond.pl: Fix END for early exit of `--version'. + +2013-04-12 Bernd Warken + * subs.pl: Replace `state' by global variable. So the Perl version can be older. Index: glilypond.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- glilypond.pl 12 Apr 2013 21:45:56 -0000 1.2 +++ glilypond.pl 12 Apr 2013 22:30:44 -0000 1.3 @@ -15,7 +15,7 @@ { use constant VERSION => 'v1.0'; # version of glilypond - use constant LASTUPDATE => '28 Mar 2013'; # date of last update + use constant LASTUPDATE => '12 Apr 2013'; # date of last update ### This constant `LICENSE' is the license for this file `GPL' >= 3 use constant LICENSE => q* @@ -653,6 +653,8 @@ END { + exit unless ( defined($Temp -> { 'temp_dir' })); + if ( $Args -> { 'keep_all' } ) { # With --keep_all, no temporary files are removed. $v -> print( "keep_all: `TRUE'" ); From MAILER-DAEMON Sat Apr 13 09:14:30 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UR0Hm-00083d-DV for mharc-groff-commit@gnu.org; Sat, 13 Apr 2013 09:14:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR0Hj-00083W-Kv for groff-commit@gnu.org; Sat, 13 Apr 2013 09:14:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UR0Hh-0005wd-Hy for groff-commit@gnu.org; Sat, 13 Apr 2013 09:14:27 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:54358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR0Hh-0005wX-FK for groff-commit@gnu.org; Sat, 13 Apr 2013 09:14:25 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UR0Hc-0004br-R3 for groff-commit@gnu.org; Sat, 13 Apr 2013 13:14:21 +0000 Date: Sat, 13 Apr 2013 13:14:20 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/autom4te.cache X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2013 13:14:28 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/13 13:14:20 New directory: autom4te.cache CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/autom4te.cache/?cvsroot=groff From MAILER-DAEMON Sat Apr 13 11:28:06 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UR2N4-0003mt-5R for mharc-groff-commit@gnu.org; Sat, 13 Apr 2013 11:28:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR2N1-0003lX-6w for groff-commit@gnu.org; Sat, 13 Apr 2013 11:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UR2N0-00043Y-AG for groff-commit@gnu.org; Sat, 13 Apr 2013 11:28:03 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:43178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR2N0-00043Q-6s for groff-commit@gnu.org; Sat, 13 Apr 2013 11:28:02 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UR2Mz-0003wV-TV for groff-commit@gnu.org; Sat, 13 Apr 2013 15:28:01 +0000 Date: Sat, 13 Apr 2013 15:28:01 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2013 15:28:04 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/13 15:28:01 Modified files: . : ChangeLog Log message: Add and remove directory `autom4te.cache' from `autoconf'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1404&r2=1.1405 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1404 retrieving revision 1.1405 diff -u -b -r1.1404 -r1.1405 --- ChangeLog 12 Apr 2013 14:19:02 -0000 1.1404 +++ ChangeLog 13 Apr 2013 15:28:01 -0000 1.1405 @@ -1,3 +1,9 @@ +2013-04-13 Bernd Warken + + * `autotools': During the run of `autoconf' and `autoreconf' a + subdirectory `autom4te.cache' was created. I first added this to + groff CVS and removed it again after an email-discussion. + 2013-04-12 Bernd Warken * `grog': Remove the shell version of `grog'. Now there is only From MAILER-DAEMON Sat Apr 13 14:38:50 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UR5Le-000721-LH for mharc-groff-commit@gnu.org; Sat, 13 Apr 2013 14:38:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR5Lb-00071v-FS for groff-commit@gnu.org; Sat, 13 Apr 2013 14:38:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UR5La-0002WT-HC for groff-commit@gnu.org; Sat, 13 Apr 2013 14:38:47 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:51522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UR5La-0002WM-DV for groff-commit@gnu.org; Sat, 13 Apr 2013 14:38:46 -0400 Received: from keithmarshall by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UR5LZ-00065H-If for groff-commit@gnu.org; Sat, 13 Apr 2013 18:38:45 +0000 Date: Sat, 13 Apr 2013 18:38:45 +0000 Message-Id: To: groff-commit@gnu.org From: Keith Marshall X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff .cvsignore ChangeLog X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2013 18:38:49 -0000 CVSROOT: /sources/groff Module name: groff Changes by: Keith Marshall 13/04/13 18:38:45 Modified files: . : .cvsignore ChangeLog Log message: Avoid consideration of autotool cache for CVS inclusion. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/.cvsignore?cvsroot=groff&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1405&r2=1.1406 Patches: Index: .cvsignore =================================================================== RCS file: /sources/groff/groff/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- .cvsignore 4 Oct 2004 07:20:04 -0000 1.4 +++ .cvsignore 13 Apr 2013 18:38:45 -0000 1.5 @@ -1,5 +1,6 @@ Makefile config.log config.status +autom4te.cache stamp-h test-groff Index: ChangeLog =================================================================== RCS file: /sources/groff/groff/ChangeLog,v retrieving revision 1.1405 retrieving revision 1.1406 diff -u -b -r1.1405 -r1.1406 --- ChangeLog 13 Apr 2013 15:28:01 -0000 1.1405 +++ ChangeLog 13 Apr 2013 18:38:45 -0000 1.1406 @@ -1,3 +1,9 @@ +2013-04-13 Keith Marshall + + Avoid consideration of autotool cache for CVS inclusion. + + * .cvsignore (autom4te.cache): Add reference. + 2013-04-13 Bernd Warken * `autotools': During the run of `autoconf' and `autoreconf' a From MAILER-DAEMON Sun Apr 14 19:11:19 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URW4t-0002bS-Ot for mharc-groff-commit@gnu.org; Sun, 14 Apr 2013 19:11:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URW4p-0002al-8R for groff-commit@gnu.org; Sun, 14 Apr 2013 19:11:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URW4m-0001FO-GB for groff-commit@gnu.org; Sun, 14 Apr 2013 19:11:15 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:33448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URW4m-0001Ep-DN for groff-commit@gnu.org; Sun, 14 Apr 2013 19:11:12 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URW4k-0007Yf-RD for groff-commit@gnu.org; Sun, 14 Apr 2013 23:11:11 +0000 Date: Sun, 14 Apr 2013 23:11:10 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog Makefile.in aclocal.m4 configur... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Apr 2013 23:11:18 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/14 23:11:10 Modified files: . : ChangeLog Makefile.in aclocal.m4 configure configure.ac m4 : groff.m4 Log message: Add Perl test to the configuration. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1406&r2=1.1407 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.126&r2=1.127 http://cvs.savannah.gnu.org/viewcvs/groff/aclocal.m4?cvsroot=groff&r1=1.58&r2=1.59 http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.92&r2=1.93 http://cvs.savannah.gnu.org/viewcvs/groff/configure.ac?cvsroot=groff&r1=1.52&r2=1.53 http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.10&r2=1.11 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1406 retrieving revision 1.1407 diff -u -b -r1.1406 -r1.1407 --- ChangeLog 13 Apr 2013 18:38:45 -0000 1.1406 +++ ChangeLog 14 Apr 2013 23:11:00 -0000 1.1407 @@ -1,3 +1,21 @@ +2013-04-15 Bernd Warken + + Add Perl test to configuration. During the run of `configure' the + program is broken with error when there is no `Perl' or the `perl' + program is too old. + + * m4/groff.m4: Add macro `GROFF_PERL' that tests the availability + of the `perl' program and tests wether this has a version of at + most `v5.6.1'. Define variables $PERL and $PERLPATH for the full + name of the `perl' program and $PERLVERSION as the lest version. + + * configure.ac: Add information of the macro `GROFF_PERL'. + + * Makefile.in: Add definitions of the macro variables and their + `@...@' counterparts. + + Run `autoreconf -I m4'. + 2013-04-13 Keith Marshall Avoid consideration of autotool cache for CVS inclusion. Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.126 retrieving revision 1.127 diff -u -b -r1.126 -r1.127 --- Makefile.in 12 Apr 2013 13:11:16 -0000 1.126 +++ Makefile.in 14 Apr 2013 23:11:01 -0000 1.127 @@ -429,7 +429,9 @@ # Flag that tells etags to assume C++. ETAGSCCFLAG=-C # Full path to perl. +PERL=@PERL@ PERLPATH=@PERLPATH@ +PERLVERSION=@PERLVERSION@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ # Sed script to deal with OS dependencies in sh scripts. @@ -483,7 +485,7 @@ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ - "PERLPATH=$(PERLPATH)" \ + "PERLPATH=$(PERL)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/groff/groff/aclocal.m4,v retrieving revision 1.58 retrieving revision 1.59 diff -u -b -r1.58 -r1.59 --- aclocal.m4 28 Dec 2012 11:59:30 -0000 1.58 +++ aclocal.m4 14 Apr 2013 23:11:07 -0000 1.59 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.12.5 -*- Autoconf -*- - -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,6 +12,251 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION + +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that perl supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PERL],[perl]) +# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the perl you have supports at least +# version 5.8.0. +# +# NOTE: This macro uses the $PERL variable to perform the check. +# AX_WITH_PERL can be used to set that variable prior to running this +# macro. The $PERL_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_PROG_PERL_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PERL"],[ + ax_perl_version="$1" + + AC_MSG_CHECKING([for perl version]) + changequote(<<,>>) + perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + changequote([,]) + AC_MSG_RESULT($perl_version) + + AC_SUBST([PERL_VERSION],[$perl_version]) + + AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the perl interpreter]) + $3 + ]) +]) + m4_include([m4/codeset.m4]) m4_include([m4/fcntl-o.m4]) m4_include([m4/glibc21.m4]) Index: configure =================================================================== RCS file: /cvsroot/groff/groff/configure,v retrieving revision 1.92 retrieving revision 1.93 diff -u -b -r1.92 -r1.93 --- configure 12 Apr 2013 13:11:17 -0000 1.92 +++ configure 14 Apr 2013 23:11:08 -0000 1.93 @@ -630,7 +630,6 @@ make_install_pdfdoc make_pdfdoc ac_ct_AWK -AWK ALT_AWK_PROGS make_install_html make_html @@ -672,12 +671,15 @@ RANLIB MAKEINFO YACC -PERLPATH DVIPRINT PSPRINT LPQ LP LPR +AWK +PERL_VERSION +SED +PERL groffer_dir appresdir XLIBDIRS @@ -5533,6 +5535,234 @@ grog_dir=$libdir/groff/grog +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +PERLVERSION=v5.6.1 + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$PERL" = "no"; then + as_fn_error 1 "perl binary not found" "$LINENO" 5 + fi + + + + + if test -n "$PERL"; then : + + ax_perl_version="$PERLVERSION" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl version" >&5 +$as_echo_n "checking for perl version... " >&6; } + + perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_version" >&5 +$as_echo "$perl_version" >&6; } + + PERL_VERSION=$perl_version + + + + + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + + ax_compare_version_A=`echo "$ax_perl_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version_B=`echo "$perl_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version=`echo "x$ax_compare_version_A +x$ax_compare_version_B" | sed 's/^ *//' | sort | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"` + + + + if test "$ax_compare_version" = "true" ; then + + : + PERLPATH=$PERL + + else + : + \ + as_fn_error 1 "perl version is too old" "$LINENO" 5 + + fi + + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the perl interpreter" >&5 +$as_echo "$as_me: WARNING: could not find the perl interpreter" >&2;} + \ + as_fn_error 1 "perl version is too old" "$LINENO" 5 + +fi + if test -z "$PSPRINT"; then for ac_prog in lpr do @@ -5758,47 +5988,6 @@ EGREP="$ac_cv_path_EGREP" -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERLPATH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PERLPATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERLPATH="$PERLPATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERLPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PERLPATH" && ac_cv_path_PERLPATH="/usr/bin/perl" - ;; -esac -fi -PERLPATH=$ac_cv_path_PERLPATH -if test -n "$PERLPATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERLPATH" >&5 -$as_echo "$PERLPATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - for ac_prog in byacc 'bison -y' do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -11255,6 +11444,7 @@ ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF Index: configure.ac =================================================================== RCS file: /cvsroot/groff/groff/configure.ac,v retrieving revision 1.52 retrieving revision 1.53 diff -u -b -r1.52 -r1.53 --- configure.ac 12 Apr 2013 13:11:17 -0000 1.52 +++ configure.ac 14 Apr 2013 23:11:10 -0000 1.53 @@ -64,9 +64,9 @@ GROFF_GROFFERDIR_DEFAULT GROFF_GLILYPONDDIR_DEFAULT GROFF_GROGDIR_DEFAULT +GROFF_PERL GROFF_PRINT AC_PROG_EGREP -AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl]) GROFF_PROG_YACC GROFF_MAKEINFO AC_PROG_RANLIB Index: m4/groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- m4/groff.m4 12 Apr 2013 13:11:18 -0000 1.10 +++ m4/groff.m4 14 Apr 2013 23:11:10 -0000 1.11 @@ -2,7 +2,7 @@ # Copyright (C) 1989-1995, 2001-2007, 2009, 2011, 2013 # Free Software Foundation, Inc. # -# Last update: 28 Mar 2013 +# Last update: 14 Apr 2013 # # This file is part of groff. # @@ -58,6 +58,19 @@ AC_DEFUN([GROFF_PROG_YACC], [AC_CHECK_PROGS([YACC], [byacc 'bison -y'], [yacc])]) + +# We need Perl 5.6.1 or newer. + +AC_DEFUN([GROFF_PERL], + [PERLVERSION=v5.6.1 + AC_PATH_PROG([PERL], [perl], [no]) + if test "$PERL" = "no"; then + AC_MSG_ERROR([perl binary not found], 1) + fi + AX_PROG_PERL_VERSION([$PERLVERSION], PERLPATH=$PERL, \ + AC_MSG_ERROR([perl version is too old], 1))]) + + # We need makeinfo 4.8 or newer. AC_DEFUN([GROFF_MAKEINFO], From MAILER-DAEMON Sun Apr 14 19:49:59 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URWgJ-0003FF-RF for mharc-groff-commit@gnu.org; Sun, 14 Apr 2013 19:49:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URWgD-0003Cr-BU for groff-commit@gnu.org; Sun, 14 Apr 2013 19:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URWg9-0004gX-SQ for groff-commit@gnu.org; Sun, 14 Apr 2013 19:49:53 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:44212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URWg9-0004gB-Oz for groff-commit@gnu.org; Sun, 14 Apr 2013 19:49:49 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URWg9-0000uw-9K for groff-commit@gnu.org; Sun, 14 Apr 2013 23:49:49 +0000 Date: Sun, 14 Apr 2013 23:49:49 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog INSTALL INSTALL.gen MANIFEST RE... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Apr 2013 23:49:58 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/14 23:49:49 Modified files: . : ChangeLog INSTALL INSTALL.gen MANIFEST README Log message: Add documentation for the installation. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1407&r2=1.1408 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL?cvsroot=groff&r1=1.17&r2=1.18 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.gen?cvsroot=groff&r1=1.6&r2=1.7 http://cvs.savannah.gnu.org/viewcvs/groff/MANIFEST?cvsroot=groff&r1=1.19&r2=1.20 http://cvs.savannah.gnu.org/viewcvs/groff/README?cvsroot=groff&r1=1.24&r2=1.25 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1407 retrieving revision 1.1408 diff -u -b -r1.1407 -r1.1408 --- ChangeLog 14 Apr 2013 23:11:00 -0000 1.1407 +++ ChangeLog 14 Apr 2013 23:49:48 -0000 1.1408 @@ -1,5 +1,10 @@ 2013-04-15 Bernd Warken + * README, INSTALL, INSTALL.gen, MANIFEST: Add documentation in the + top directory about some parts of `autotools' and `glilypond'. + +2013-04-15 Bernd Warken + Add Perl test to configuration. During the run of `configure' the program is broken with error when there is no `Perl' or the `perl' program is too old. Index: INSTALL =================================================================== RCS file: /cvsroot/groff/groff/INSTALL,v retrieving revision 1.17 retrieving revision 1.18 diff -u -b -r1.17 -r1.18 --- INSTALL 5 Jan 2009 20:10:29 -0000 1.17 +++ INSTALL 14 Apr 2013 23:49:48 -0000 1.18 @@ -1,6 +1,8 @@ - Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2009 + Copyright 1997,1999,2000,2001,2002,2003,2004,2006,2009,2013 Free Software Foundation, Inc. + Last Update: 15 Apr 2013 + Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. @@ -94,6 +96,11 @@ using the malloc that comes with GNU Emacs version 20 can give a worthwhile (and sometimes spectacular) performance improvement. +Many programs within the `groff' system are written in the Perl +language. So you need a `perl' program with the least version of +`v5.6.1'. + + If you want A4 or letter paper format and the configure script produces an incorrect guess, say Index: INSTALL.gen =================================================================== RCS file: /cvsroot/groff/groff/INSTALL.gen,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- INSTALL.gen 28 Dec 2012 11:59:30 -0000 1.6 +++ INSTALL.gen 14 Apr 2013 23:49:48 -0000 1.7 @@ -1,8 +1,10 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, -Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 + Free Software Foundation, Inc. + +Last Update: 15 Apr 2013 Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -44,9 +46,23 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' +if you want to change it or regenerate `configure' using a newer +version of `autoconf'. + + You can also use `autoreconf -I m4' which does the same as `autoconf' +together with some other internal things. You might get the following +warnings: + + /usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted \ +definition of AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD + /usr/share/aclocal/gtkglextmm-1.2.m4:225: run info \ +'(automake)Extending aclocal' + /usr/share/aclocal/gtkglextmm-1.2.m4:225: or see \ +http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal + +Just ignore this. It is just a small bug that is known, but that was +not corrected. The simplest way to compile this package is: Index: MANIFEST =================================================================== RCS file: /cvsroot/groff/groff/MANIFEST,v retrieving revision 1.19 retrieving revision 1.20 diff -u -b -r1.19 -r1.20 --- MANIFEST 29 Jan 2013 08:08:33 -0000 1.19 +++ MANIFEST 14 Apr 2013 23:49:48 -0000 1.20 @@ -1,6 +1,8 @@ Copyright 2001-2006, 2009-2013 Free Software Foundation, Inc. + Last Update: 15 Apr 2013 + Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. @@ -44,6 +46,8 @@ graphical formats. gdiffmk An improved implementation of the diffmk command to mark differences between groff/nroff/troff files. + glilypond A preprocessor that handles `lilypond' parts in a `roff' + file. grap2graph Convert grap diagraps into different graphical formats. groffer A wrapper to conveniently view roff files. hdtbl A sophisticated table macro package. Index: README =================================================================== RCS file: /cvsroot/groff/groff/README,v retrieving revision 1.24 retrieving revision 1.25 diff -u -b -r1.24 -r1.25 --- README 1 Feb 2013 08:29:55 -0000 1.24 +++ README 14 Apr 2013 23:49:49 -0000 1.25 @@ -1,6 +1,8 @@ Copyright (C) 1989-2006, 2008, 2009, 2012-2013 Free Software Foundation, Inc. + Last Update: 15 Apr 2013 + Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. @@ -35,9 +37,17 @@ anonymous ftp from `ftp.gnu.org' in the directory `gnu/groff'. The current development version of `groff' is available from a `CVS' -repository. You can access it by first selecting a parent directory -in which to create a working copy (call it, say, `~/cvswork'), and -then executing the commands +repository. + +It makes sense if you first declare the following shell variable in +your system: + + export CVS_RSH + CVS_RSH=ssh + +You can access it then by selecting a parent directory in which to +create a working copy (call it, say, `~/cvswork'), and then executing +the commands cd ~/cvswork cvs -d:pserver:anonymous@cvs.savannah.gnu.org/sources/groff -z5 co groff @@ -77,6 +87,7 @@ Depending on your requirements, you may need at least some of the following tools to build `groff' directly from its source: + perl >= v5.6.1 (see macro GROFF_PERL in m4/groff.m4) ghostscript the psutils package the netpbm package From MAILER-DAEMON Mon Apr 15 01:37:00 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URc68-000573-Ok for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 01:37:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URc64-00056Q-80 for groff-commit@gnu.org; Mon, 15 Apr 2013 01:36:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URc61-0007WN-CT for groff-commit@gnu.org; Mon, 15 Apr 2013 01:36:56 -0400 Received: from mout.gmx.net ([212.227.17.22]:64875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URc61-0007Vy-1c for groff-commit@gnu.org; Mon, 15 Apr 2013 01:36:53 -0400 Received: from mailout-de.gmx.net ([10.1.76.32]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0Mb5Wf-1U74H3289D-00KfFF for ; Mon, 15 Apr 2013 07:36:50 +0200 Received: (qmail invoked by alias); 15 Apr 2013 05:36:50 -0000 Received: from 188-22-246-56.adsl.highway.telekom.at (EHLO localhost) [188.22.246.56] by mail.gmx.net (mp032) with SMTP; 15 Apr 2013 07:36:50 +0200 X-Authenticated: #54312696 X-Provags-ID: V01U2FsdGVkX19qqhdH+Q9qeptI7soi2XHLFdGVcaB+ThfFJISNe7 DG7LyPB7mFPYhx Date: Mon, 15 Apr 2013 07:36:46 +0200 (CEST) Message-Id: <20130415.073646.238704065.wl@gnu.org> To: groff-bernd.warken-72@web.de From: Werner LEMBERG In-Reply-To: References: X-Mailer: Mew version 6.5 on Emacs 24.3.50.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.22 Cc: groff-commit@gnu.org Subject: Re: [Groff-commit] groff ChangeLog Makefile.in aclocal.m4 configur... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 05:36:59 -0000 Bernd, there are some problems with this patch. > +PERL=@PERL@ > PERLPATH=@PERLPATH@ > +PERLVERSION=@PERLVERSION@ We don't need PERL *and* PERLPATH. You should rename everything to use either the former or the latter. > --- aclocal.m4 28 Dec 2012 11:59:30 -0000 1.58 > +++ aclocal.m4 14 Apr 2013 23:11:07 -0000 1.59 > @@ -1,7 +1,8 @@ > -# generated automatically by aclocal 1.12.5 -*- Autoconf -*- > - > -# Copyright (C) 1996-2012 Free Software Foundation, Inc. > +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- Ouch. Please always use the newest version aclocal and friends. BTW, this is one of the reasons to *not* include generated files in the CVS... > +# =========================================================================== > +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html > +# =========================================================================== > [...] This is wrong. You have apparently installed somewhere on your system the macro file which contains AX_COMPARE_VERSION, but this makes the call of autoreconf work *only* on your private computer. Instead, you have to add the file `ax_compare_version.m4' to groff's `m4' directory! If you do that, `aclocal.m4' will contain just a single line, namely m4_include([m4/ax_compare_version.m4]) > +# We need Perl 5.6.1 or newer. > + > +AC_DEFUN([GROFF_PERL], > + [PERLVERSION=v5.6.1 > + AC_PATH_PROG([PERL], [perl], [no]) > + if test "$PERL" = "no"; then > + AC_MSG_ERROR([perl binary not found], 1) > + fi > + AX_PROG_PERL_VERSION([$PERLVERSION], PERLPATH=$PERL, \ > + AC_MSG_ERROR([perl version is too old], 1))]) Please use tabs and spaces in a similar way as in the original files. Here, the last two lines use spaces instead of tabs. Additionally, the first indentation level in `groff.m4' has two (or three) spaces, not a tab, so it should be AC_DEFUN([GROFF_PERL], [PERLVERSION=v5.6.1 AC_PATH_PROG([PERL], [perl], [no]) if test "x$PERL" = "xno"; then AC_MSG_ERROR([perl binary not found]) fi AX_PROG_PERL_VERSION([$PERLVERSION], PERLPATH=$PERL, AC_MSG_ERROR([perl version is too old]))]) Note the use of `x' in the comparison since using "$PERL" = "no" is not portable across existing shells in case $PERL expands to nothing (this was a mistake in my example code, sorry). Additionally, you don't need a trailing `\' within m4 macros. Werner From MAILER-DAEMON Mon Apr 15 10:46:59 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URkgN-0000lo-CG for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 10:46:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URkgJ-0000k8-4O for groff-commit@gnu.org; Mon, 15 Apr 2013 10:46:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URkgH-0003By-5S for groff-commit@gnu.org; Mon, 15 Apr 2013 10:46:55 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:42639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URkgH-0003Bu-1S for groff-commit@gnu.org; Mon, 15 Apr 2013 10:46:53 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URkgG-0007jh-Gm for groff-commit@gnu.org; Mon, 15 Apr 2013 14:46:52 +0000 Date: Mon, 15 Apr 2013 14:46:52 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/m4 groff.m4 ax_compare_version.m4 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 14:46:57 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/15 14:46:52 Modified files: m4 : groff.m4 Added files: m4 : ax_compare_version.m4 Log message: Add file m4/ax_compare_version.m4 from the latest version of autoconf-archive. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.11&r2=1.12 http://cvs.savannah.gnu.org/viewcvs/groff/m4/ax_compare_version.m4?cvsroot=groff&rev=1.1 Patches: Index: groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- groff.m4 14 Apr 2013 23:11:10 -0000 1.11 +++ groff.m4 15 Apr 2013 14:46:52 -0000 1.12 @@ -2,7 +2,7 @@ # Copyright (C) 1989-1995, 2001-2007, 2009, 2011, 2013 # Free Software Foundation, Inc. # -# Last update: 14 Apr 2013 +# Last update: 15 Apr 2013 # # This file is part of groff. # @@ -64,10 +64,10 @@ AC_DEFUN([GROFF_PERL], [PERLVERSION=v5.6.1 AC_PATH_PROG([PERL], [perl], [no]) - if test "$PERL" = "no"; then + if test "x$PERL" = "xno"; then AC_MSG_ERROR([perl binary not found], 1) fi - AX_PROG_PERL_VERSION([$PERLVERSION], PERLPATH=$PERL, \ + AX_PROG_PERL_VERSION([$PERLVERSION], true, \ AC_MSG_ERROR([perl version is too old], 1))]) Index: ax_compare_version.m4 =================================================================== RCS file: ax_compare_version.m4 diff -N ax_compare_version.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ax_compare_version.m4 15 Apr 2013 14:46:52 -0000 1.1 @@ -0,0 +1,177 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION From MAILER-DAEMON Mon Apr 15 10:48:00 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URkhM-0001Hf-0V for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 10:48:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URkhD-0001C3-Og for groff-commit@gnu.org; Mon, 15 Apr 2013 10:47:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URkh5-0003L9-QY for groff-commit@gnu.org; Mon, 15 Apr 2013 10:47:51 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:46099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URkh5-0003L5-LA for groff-commit@gnu.org; Mon, 15 Apr 2013 10:47:43 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URkh5-0007mY-DE for groff-commit@gnu.org; Mon, 15 Apr 2013 14:47:43 +0000 Date: Mon, 15 Apr 2013 14:47:43 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog Makefile.in aclocal.m4 arch/djg... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 14:47:58 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/15 14:47:43 Modified files: . : ChangeLog Makefile.in aclocal.m4 arch/djgpp : config.site contrib/mm : Makefile.sub font/devpdf : Makefile.sub src/devices/gropdf: Makefile.sub gropdf.pl pdfmom.pl src/utils/afmtodit: Makefile.sub Log message: Change $PERLPATH to $PERL. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1408&r2=1.1409 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.127&r2=1.128 http://cvs.savannah.gnu.org/viewcvs/groff/aclocal.m4?cvsroot=groff&r1=1.59&r2=1.60 http://cvs.savannah.gnu.org/viewcvs/groff/arch/djgpp/config.site?cvsroot=groff&r1=1.3&r2=1.4 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mm/Makefile.sub?cvsroot=groff&r1=2.10&r2=2.11 http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/Makefile.sub?cvsroot=groff&r1=1.6&r2=1.7 http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/Makefile.sub?cvsroot=groff&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/gropdf.pl?cvsroot=groff&r1=1.12&r2=1.13 http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/pdfmom.pl?cvsroot=groff&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/afmtodit/Makefile.sub?cvsroot=groff&r1=1.8&r2=1.9 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1408 retrieving revision 1.1409 diff -u -b -r1.1408 -r1.1409 --- ChangeLog 14 Apr 2013 23:49:48 -0000 1.1408 +++ ChangeLog 15 Apr 2013 14:47:41 -0000 1.1409 @@ -1,5 +1,26 @@ 2013-04-15 Bernd Warken + In the whole `groff' system, rename autoconf variable `$PERLPATH' + to `$PERL', which has the same content. But `$PERL' suits to + `AX_PROG_PERL_VERSION' in m4 macro `GROFF_PERL' in `m4/groff.m4'. + + * src/utils/afmtodit/Makefile.sub, + * src/devices/gropdf/gropdf.pl, + * src/devices/gropdf/Makefile.sub, + * src/devices/gropdf/pdfmom.pl, + * arch/djgpp/config.site, + * font/devpdf/Makefile.sub, + * contrib/mm/Makefile.sub, + * m4/groff.m4, + * Makefile.in: Replace `$PERLPATH' by `$PERL'. + + * m4/ax_compare_version.m4: New file, copied from daily version of + `GNU autoconf-archive'. + + `autoconf' was not yet run, a newer version is needed. + +2013-04-15 Bernd Warken + * README, INSTALL, INSTALL.gen, MANIFEST: Add documentation in the top directory about some parts of `autotools' and `glilypond'. Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.127 retrieving revision 1.128 diff -u -b -r1.127 -r1.128 --- Makefile.in 14 Apr 2013 23:11:01 -0000 1.127 +++ Makefile.in 15 Apr 2013 14:47:41 -0000 1.128 @@ -430,7 +430,6 @@ ETAGSCCFLAG=-C # Full path to perl. PERL=@PERL@ -PERLPATH=@PERLPATH@ PERLVERSION=@PERLVERSION@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ @@ -485,7 +484,6 @@ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ - "PERLPATH=$(PERL)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/groff/groff/aclocal.m4,v retrieving revision 1.59 retrieving revision 1.60 diff -u -b -r1.59 -r1.60 --- aclocal.m4 14 Apr 2013 23:11:07 -0000 1.59 +++ aclocal.m4 15 Apr 2013 14:47:41 -0000 1.60 @@ -12,257 +12,1382 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# This macro compares two version strings. Due to the various number of -# minor-version numbers that can exist, and the fact that string -# comparisons are not compatible with numeric comparisons, this is not -# necessarily trivial to do in a autoconf script. This macro makes doing -# these comparisons easy. -# -# The six basic comparisons are available, as well as checking equality -# limited to a certain number of minor-version levels. -# -# The operator OP determines what type of comparison to do, and can be one -# of: -# -# eq - equal (test A == B) -# ne - not equal (test A != B) -# le - less than or equal (test A <= B) -# ge - greater than or equal (test A >= B) -# lt - less than (test A < B) -# gt - greater than (test A > B) -# -# Additionally, the eq and ne operator can have a number after it to limit -# the test to that number of minor versions. -# -# eq0 - equal up to the length of the shorter version -# ne0 - not equal up to the length of the shorter version -# eqN - equal up to N sub-version levels -# neN - not equal up to N sub-version levels -# -# When the condition is true, shell commands ACTION-IF-TRUE are run, -# otherwise shell commands ACTION-IF-FALSE are run. The environment -# variable 'ax_compare_version' is always set to either 'true' or 'false' -# as well. -# -# Examples: -# -# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) -# -# would both be true. -# -# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) -# -# would both be false. -# -# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) -# -# would be true because it is only comparing two minor versions. -# -# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) -# -# would be true because it is only comparing the lesser number of minor -# versions of the two values. -# -# Note: The characters that separate the version numbers do not matter. An -# empty string is the same as version 0. OP is evaluated by autoconf, not -# configure, so must be a string, not a variable. -# -# The author would like to acknowledge Guido Draheim whose advice about -# the m4_case and m4_ifvaln functions make this macro only include the -# portions necessary to perform the specific comparison specified by the -# OP argument in the final configure script. -# -# LICENSE -# -# Copyright (c) 2008 Tim Toolan -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 11 - -dnl ######################################################################### -AC_DEFUN([AX_COMPARE_VERSION], [ - AC_REQUIRE([AC_PROG_AWK]) - - # Used to indicate true or false condition - ax_compare_version=false - - # Convert the two version strings to be compared into a format that - # allows a simple string comparison. The end result is that a version - # string of the form 1.12.5-r617 will be converted to the form - # 0001001200050617. In other words, each number is zero padded to four - # digits, and non digits are removed. - AS_VAR_PUSHDEF([A],[ax_compare_version_A]) - A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - AS_VAR_PUSHDEF([B],[ax_compare_version_B]) - B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary - dnl # then the first line is used to determine if the condition is true. - dnl # The sed right after the echo is to remove any indented white space. - m4_case(m4_tolower($2), - [lt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [gt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [le],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ], - [ge],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ],[ - dnl Split the operator from the subversion count if present. - m4_bmatch(m4_substr($2,2), - [0],[ - # A count of zero means use the length of the shorter version. - # Determine the number of characters in A and B. - ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` - ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` - - # Set A to no more than B's length and B to no more than A's length. - A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` - B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` - ], - [[0-9]+],[ - # A count greater than zero means use only that many subversions - A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - ], - [.+],[ - AC_WARNING( - [illegal OP numeric parameter: $2]) - ],[]) - - # Pad zeros at end of numbers to make same length. - ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" - B="$B`echo $A | sed 's/./0/g'`" - A="$ax_compare_version_tmp_A" - - # Check for equality or inequality as necessary. - m4_case(m4_tolower(m4_substr($2,0,2)), - [eq],[ - test "x$A" = "x$B" && ax_compare_version=true +# codeset.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET); return !cs;], + [am_cv_langinfo_codeset=yes], + [am_cv_langinfo_codeset=no]) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE([HAVE_LANGINFO_CODESET], [1], + [Define if you have and nl_langinfo(CODESET).]) + fi +]) + +# glibc21.m4 serial 4 +dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([gl_GLIBC21], + [ + AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], + [ac_cv_gnu_library_2_1], + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif ], - [ne],[ - test "x$A" != "x$B" && ax_compare_version=true - ],[ - AC_WARNING([illegal OP parameter: $2]) - ]) - ]) - - AS_VAR_POPDEF([A])dnl - AS_VAR_POPDEF([B])dnl - - dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. - if test "$ax_compare_version" = "true" ; then - m4_ifvaln([$4],[$4],[:])dnl - m4_ifvaln([$5],[else $5])dnl - fi -]) dnl AX_COMPARE_VERSION - -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# Makes sure that perl supports the version indicated. If true the shell -# commands in ACTION-IF-TRUE are executed. If not the shell commands in -# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by -# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. -# -# Example: -# -# AC_PATH_PROG([PERL],[perl]) -# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) -# -# This will check to make sure that the perl you have supports at least -# version 5.8.0. -# -# NOTE: This macro uses the $PERL variable to perform the check. -# AX_WITH_PERL can be used to set that variable prior to running this -# macro. The $PERL_VERSION variable will be valorized with the detected -# version. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 11 - -AC_DEFUN([AX_PROG_PERL_VERSION],[ - AC_REQUIRE([AC_PROG_SED]) - AC_REQUIRE([AC_PROG_GREP]) - - AS_IF([test -n "$PERL"],[ - ax_perl_version="$1" - - AC_MSG_CHECKING([for perl version]) - changequote(<<,>>) - perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` - changequote([,]) - AC_MSG_RESULT($perl_version) + [ac_cv_gnu_library_2_1=yes], + [ac_cv_gnu_library_2_1=no]) + ] + ) + AC_SUBST([GLIBC21]) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) - AC_SUBST([PERL_VERSION],[$perl_version]) +# iconv.m4 serial 11 (gettext-0.18.1) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. - AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ - : - $2 - ],[ +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + [am_cv_func_iconv=yes]) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) +]) + +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])) +gl_iconv_AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL([am_cv_proto_iconv], [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], + [Define as const if the declaration of iconv() needs const.]) + fi +]) + +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL([acl_cv_path_LD], +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT([$LD]) +else + AC_MSG_RESULT([no]) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) + +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_PREREQ([2.54]) + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + popdef([NAME]) + popdef([Name]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + LIB[]NAME[]_PREFIX= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + dnl Tell automake >= 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE([rpath], + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. : - $3 + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$acl_hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +dnl For those cases where a variable contains several -L and -l options +dnl referring to unknown libraries and directories, this macro determines the +dnl necessary additional linker options for the runtime path. +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, +dnl otherwise linking without libtool is assumed. +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], +[ + AC_REQUIRE([AC_LIB_RPATH]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + $1= + if test "$enable_rpath" != no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode directories into the resulting + dnl binary. + rpathdirs= + next= + for opt in $2; do + if test -n "$next"; then + dir="$next" + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= + else + case $opt in + -L) next=yes ;; + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= ;; + *) next= ;; + esac + fi + done + if test "X$rpathdirs" != "X"; then + if test -n ""$3""; then + dnl libtool is used for linking. Use -R options. + for dir in $rpathdirs; do + $1="${$1}${$1:+ }-R$dir" + done + else + dnl The linker is used for linking directly. + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user + dnl must pass all path elements in one option. + alldirs= + for dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="$flag" + else + dnl The -rpath options are cumulative. + for dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="${$1}${$1:+ }$flag" + done + fi + fi + fi + fi + fi + AC_SUBST([$1]) +]) + +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" ]) - ],[ - AC_MSG_WARN([could not find the perl interpreter]) - $3 + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) -m4_include([m4/codeset.m4]) -m4_include([m4/fcntl-o.m4]) -m4_include([m4/glibc21.m4]) -m4_include([m4/groff.m4]) -m4_include([m4/iconv.m4]) -m4_include([m4/lib-ld.m4]) -m4_include([m4/lib-link.m4]) -m4_include([m4/lib-prefix.m4]) -m4_include([m4/localcharset.m4]) Index: arch/djgpp/config.site =================================================================== RCS file: /cvsroot/groff/groff/arch/djgpp/config.site,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- arch/djgpp/config.site 5 Jan 2009 20:10:31 -0000 1.3 +++ arch/djgpp/config.site 15 Apr 2013 14:47:42 -0000 1.4 @@ -32,7 +32,7 @@ RANLIB=${RANLIB='ranlib'} LPR=${LPR='cat >>PRN'} DVIPRINT=${DVIPRINT='dvilj4 - >>PRN'} -PERLPATH=${PERLPATH='/usr/bin/perl'} +PERL=${PERL='/usr/bin/perl'} # Force `cp' to be used instead of "ln -s". ac_cv_prog_LN_S="cp -p" Index: contrib/mm/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/mm/Makefile.sub,v retrieving revision 2.10 retrieving revision 2.11 diff -u -b -r2.10 -r2.11 --- contrib/mm/Makefile.sub 28 Jan 2011 10:23:34 -0000 2.10 +++ contrib/mm/Makefile.sub 15 Apr 2013 14:47:42 -0000 2.11 @@ -1,4 +1,7 @@ -# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011 +# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013 +# Free Software Foundation, Inc. +# +# Last update: 15 Apr 2013 # # This file is part of groff. # @@ -67,7 +70,7 @@ mmroff: mmroff.pl -rm -f $@ - -sed -e 's;/usr/bin/perl;$(PERLPATH);' $(srcdir)/mmroff.pl >$@ + -sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@ -chmod +x $@ uninstall_sub: Index: font/devpdf/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/font/devpdf/Makefile.sub,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- font/devpdf/Makefile.sub 19 Mar 2013 03:46:02 -0000 1.6 +++ font/devpdf/Makefile.sub 15 Apr 2013 14:47:42 -0000 1.7 @@ -1,6 +1,9 @@ # Copyright (C) 2011, 2013 Free Software Foundation, Inc. +# Free Software Foundation, Inc. # Written by Deri James # +# Last update: 15 Apr 2013 +# # This file is part of groff. # # groff is free software; you can redistribute it and/or modify it under @@ -76,9 +79,9 @@ $(top_builddir)/font/devpdf/map -test -d util || $(mkinstalldirs) util $(RM) util/BuildFoundries - if test -n "$(PERLPATH)"; then \ + if test -n "$(PERL)"; then \ sed -f $(SH_DEPS_SED_SCRIPT) \ - -e "s|/usr/bin/perl|$(PERLPATH)|" \ + -e "s|/usr/bin/perl|$(PERL)|" \ -e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \ Index: src/devices/gropdf/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/devices/gropdf/Makefile.sub,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- src/devices/gropdf/Makefile.sub 29 Jan 2013 11:07:11 -0000 1.4 +++ src/devices/gropdf/Makefile.sub 15 Apr 2013 14:47:42 -0000 1.5 @@ -1,4 +1,5 @@ -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 +# Free Software Foundation, Inc. # Written by Deri James # # This file is part of groff. @@ -40,7 +41,7 @@ $(RM) $@ sed -f $(SH_DEPS_SED_SCRIPT) \ -e "s|@VERSION@|$(version)$(revision)|" \ - -e "s|@PERLPATH@|$(PERLPATH)|" \ + -e "s|@PERL@|$(PERL)|" \ -e "s|@GROFF_FONT_DIR@|$(fontpath)|" \ -e "s|@RT_SEP@|$(RT_SEP)|" $(srcdir)/gropdf.pl >$@ chmod +x $@ @@ -49,7 +50,7 @@ $(RM) $@ sed -f $(SH_DEPS_SED_SCRIPT) \ -e "s|@VERSION@|$(version)$(revision)|" \ - -e "s|@PERLPATH@|$(PERLPATH)|" $(srcdir)/pdfmom.pl >$@ + -e "s|@PERL@|$(PERL)|" $(srcdir)/pdfmom.pl >$@ chmod +x $@ install_data: Index: src/devices/gropdf/gropdf.pl =================================================================== RCS file: /cvsroot/groff/groff/src/devices/gropdf/gropdf.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- src/devices/gropdf/gropdf.pl 17 Jan 2013 12:38:16 -0000 1.12 +++ src/devices/gropdf/gropdf.pl 15 Apr 2013 14:47:42 -0000 1.13 @@ -1,10 +1,10 @@ -#!@PERLPATH@ -w +#!@PERL@ -w # # gropdf : PDF post processor for groff -# Deri James : 4th May 2009 +# Last update : 15 Apr 2013 # - -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 +# Free Software Foundation, Inc. # Written by Deri James # # This file is part of groff. Index: src/devices/gropdf/pdfmom.pl =================================================================== RCS file: /cvsroot/groff/groff/src/devices/gropdf/pdfmom.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- src/devices/gropdf/pdfmom.pl 20 Sep 2012 07:48:29 -0000 1.2 +++ src/devices/gropdf/pdfmom.pl 15 Apr 2013 14:47:42 -0000 1.3 @@ -1,10 +1,11 @@ -#!@PERLPATH@ -w +#!@PERL@ -w # # pdfmom : Frontend to run groff -mom to produce PDFs # Deri James : Friday 16 Mar 2012 # -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012,2013 +# Free Software Foundation, Inc. # Written by Deri James # # This file is part of groff. Index: src/utils/afmtodit/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/utils/afmtodit/Makefile.sub,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- src/utils/afmtodit/Makefile.sub 8 Jan 2009 08:28:28 -0000 1.8 +++ src/utils/afmtodit/Makefile.sub 15 Apr 2013 14:47:43 -0000 1.9 @@ -1,11 +1,31 @@ +# Copyright (C) 2013 +# Free Software Foundation, Inc. +# +# Last update: 15 Apr 2013 +# +# This file is part of groff. +# +# groff is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# groff is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + MAN1=afmtodit.n MOSTLYCLEANADD=afmtodit all: afmtodit afmtodit: afmtodit.pl afmtodit.tables - if test -n "$(PERLPATH)"; then \ - sed -e "s|/usr/bin/perl|$(PERLPATH)|" \ + if test -n "$(PERL)"; then \ + sed -e "s|/usr/bin/perl|$(PERL)|" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e "s|@FONTDIR@|$(fontdir)|" \ -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \ From MAILER-DAEMON Mon Apr 15 11:14:45 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URl7F-0001Ct-70 for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 11:14:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URl78-0001A3-Cc for groff-commit@gnu.org; Mon, 15 Apr 2013 11:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URl72-0005NS-UX for groff-commit@gnu.org; Mon, 15 Apr 2013 11:14:38 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:59814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URl72-0005NL-Rn for groff-commit@gnu.org; Mon, 15 Apr 2013 11:14:32 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URl72-0001Bg-2L for groff-commit@gnu.org; Mon, 15 Apr 2013 15:14:32 +0000 Date: Mon, 15 Apr 2013 15:14:32 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog m4/groff.m4 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 15:14:43 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/15 15:14:32 Modified files: . : ChangeLog m4 : groff.m4 Log message: In m4/groff.m4, replace tabs by spaces. Add double lines between definitions of AC_DEFUNs. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1409&r2=1.1410 http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.12&r2=1.13 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1409 retrieving revision 1.1410 diff -u -b -r1.1409 -r1.1410 --- ChangeLog 15 Apr 2013 14:47:41 -0000 1.1409 +++ ChangeLog 15 Apr 2013 15:14:31 -0000 1.1410 @@ -1,5 +1,10 @@ 2013-04-15 Bernd Warken + * m4/groff.m4: Replace tabs by spaces. Use a double line between + AC_DEFUNs. + +2013-04-15 Bernd Warken + In the whole `groff' system, rename autoconf variable `$PERLPATH' to `$PERL', which has the same content. But `$PERL' suits to `AX_PROG_PERL_VERSION' in m4 macro `GROFF_PERL' in `m4/groff.m4'. Index: m4/groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- m4/groff.m4 15 Apr 2013 14:46:52 -0000 1.12 +++ m4/groff.m4 15 Apr 2013 15:14:31 -0000 1.13 @@ -109,6 +109,7 @@ fi AC_SUBST([MAKEINFO])]) + # The following programs are needed for grohtml. AC_DEFUN([GROFF_HTML_PROGRAMS], @@ -147,6 +148,7 @@ AC_MSG_WARN([missing program$plural: The program$plural + $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; @@ -158,6 +160,7 @@ AC_SUBST([make_html]) AC_SUBST([make_install_html])]) + # To produce PDF docs, we need both awk and ghostscript. AC_DEFUN([GROFF_PDFDOC_PROGRAMS], @@ -191,6 +194,7 @@ AC_SUBST([make_pdfdoc]) AC_SUBST([make_install_pdfdoc])]) + # Check whether pnmtops can handle the -nosetpage option. AC_DEFUN([GROFF_PNMTOPS_NOSETPAGE], @@ -204,6 +208,7 @@ fi AC_SUBST([pnmtops_nosetpage])]) + # Check location of `gs'; allow `--with-gs=PROG' option to override. AC_DEFUN([GROFF_GHOSTSCRIPT_PATH], @@ -226,6 +231,7 @@ [ALT_GHOSTSCRIPT_PROGS="gs gswin32c gsos2"]) AC_SUBST([ALT_GHOSTSCRIPT_PROGS])]) + # Check location of `awk'; allow `--with-awk=PROG' option to override. AC_DEFUN([GROFF_AWK_PATH], @@ -237,6 +243,7 @@ [AC_CHECK_TOOLS(AWK, [$ALT_AWK_PROGS], [missing])]) test "$AWK" = "no" && AWK=missing]) + # Preferences for choice of `awk' program; allow --with-alt-awk="LIST" # to override. @@ -248,6 +255,7 @@ [ALT_AWK_PROGS="gawk mawk nawk awk"]) AC_SUBST([ALT_AWK_PROGS])]) + # GROFF_CSH_HACK(if hack present, if not present) AC_DEFUN([GROFF_CSH_HACK], @@ -270,6 +278,7 @@ fi rm -f conftest.sh]) + # From udodo!hans@relay.NL.net (Hans Zuidam) AC_DEFUN([GROFF_ISC_SYSV3], @@ -299,6 +308,7 @@ [AC_MSG_RESULT([no])]) AC_LANG_POP([C++])]) + # srand() of SunOS 4.1.3 has return type int instead of void AC_DEFUN([GROFF_SRAND], @@ -318,6 +328,7 @@ [AC_MSG_RESULT([int])]) AC_LANG_POP([C++])]) + # In April 2005, autoconf's AC_TYPE_SIGNAL is still broken. AC_DEFUN([GROFF_TYPE_SIGNAL], @@ -360,6 +371,7 @@ (`int' or `void').]) fi]) + AC_DEFUN([GROFF_SYS_NERR], [AC_LANG_PUSH([C++]) AC_MSG_CHECKING([for sys_nerr in , , or ]) @@ -428,6 +440,7 @@ [AC_MSG_RESULT([no])]) AC_LANG_POP([C++])]) + AC_DEFUN([GROFF_LIMITS_H], [AC_LANG_PUSH([C++]) AC_MSG_CHECKING([C++ ]) @@ -562,12 +575,14 @@ [AC_MSG_RESULT([no])], [AC_MSG_RESULT([no])])]) + AC_DEFUN([GROFF_BROKEN_SPOOLER_FLAGS], [AC_MSG_CHECKING([default value for grops -b option]) test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=0 AC_MSG_RESULT([$BROKEN_SPOOLER_FLAGS]) AC_SUBST([BROKEN_SPOOLER_FLAGS])]) + AC_DEFUN([GROFF_PAGE], [AC_MSG_CHECKING([default paper size]) groff_prefix=$prefix @@ -624,6 +639,7 @@ AC_MSG_RESULT([$PAGE]) AC_SUBST([PAGE])]) + AC_DEFUN([GROFF_CXX_CHECK], [AC_REQUIRE([AC_PROG_CXX]) AC_LANG_PUSH([C++]) @@ -695,6 +711,7 @@ you should install libg++)])]) AC_LANG_POP([C++])]) + AC_DEFUN([GROFF_TMAC], [AC_MSG_CHECKING([for prefix of system macro packages]) sys_tmac_prefix= @@ -760,6 +777,7 @@ AC_MSG_RESULT([$tmac_wrap]) AC_SUBST([tmac_wrap])]) + AC_DEFUN([GROFF_G], [AC_MSG_CHECKING([for existing troff installation]) if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then @@ -771,6 +789,7 @@ fi AC_SUBST([g])]) + # We need the path to install-sh to be absolute. AC_DEFUN([GROFF_INSTALL_SH], @@ -778,11 +797,13 @@ ac_dir=`cd $ac_aux_dir; pwd` ac_install_sh="$ac_dir/install-sh -c"]) + # Test whether install-info is available. AC_DEFUN([GROFF_INSTALL_INFO], [AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])]) + # At least one UNIX system, Apple Macintosh Rhapsody 5.5, # does not have -lm ... @@ -790,6 +811,7 @@ [AC_CHECK_LIB([m], [sin], [LIBM=-lm]) AC_SUBST([LIBM])]) + # ... while the MinGW implementation of GCC for Microsoft Win32 # does not seem to have -lc. @@ -797,6 +819,7 @@ [AC_CHECK_LIB([c], [main], [LIBC=-lc]) AC_SUBST([LIBC])]) + # Check for EBCDIC -- stolen from the OS390 Unix LYNX port AC_DEFUN([GROFF_EBCDIC], @@ -825,6 +848,7 @@ AC_SUBST([TTYDEVDIRS]) AC_SUBST([OTHERDEVDIRS])]) + # Check for OS/390 Unix. We test for EBCDIC also -- the Linux port (with # gcc) to OS/390 uses ASCII internally. @@ -840,6 +864,7 @@ esac fi]) + # Check whether we need a declaration for a function. # # Stolen from GNU bfd. @@ -889,6 +914,7 @@ fi AC_LANG_POP([C++])]) + # If mkstemp() isn't available, use our own mkstemp.cpp file. AC_DEFUN([GROFF_MKSTEMP], @@ -915,6 +941,7 @@ _AC_LIBOBJ([mkstemp])]) AC_LANG_POP([C++])]) + # Test whether exists, doesn't clash with , # and declares uintmax_t. Taken from the fileutils package. @@ -941,6 +968,7 @@ AC_MSG_RESULT([$groff_cv_header_inttypes_h]) AC_LANG_POP([C++])]) + # Test for working `unsigned long long'. Taken from the fileutils package. AC_DEFUN([GROFF_UNSIGNED_LONG_LONG], @@ -965,6 +993,7 @@ AC_MSG_RESULT([$groff_cv_type_unsigned_long_long]) AC_LANG_POP([C++])]) + # Define uintmax_t to `unsigned long' or `unsigned long long' # if does not exist. Taken from the fileutils package. @@ -980,6 +1009,7 @@ does not exist.]) fi]) + # Identify PATH_SEPARATOR character to use in GROFF_FONT_PATH and # GROFF_TMAC_PATH which is appropriate for the target system (POSIX=':', # MS-DOS/Win32=';'). @@ -1010,6 +1040,7 @@ AC_MSG_RESULT([$GROFF_PATH_SEPARATOR]) AC_SUBST(GROFF_PATH_SEPARATOR)]) + # Check for X11. AC_DEFUN([GROFF_X11], @@ -1070,6 +1101,7 @@ AC_SUBST([XPROGDIRS]) AC_SUBST([XLIBDIRS])]) + # Set up the `--with-appresdir' command line option. # Don't quote AS_HELP_STRING! @@ -1078,6 +1110,7 @@ AS_HELP_STRING([--with-appresdir=DIR], [X11 application resource files]))]) + # Get a default value for the application resource directory. # # We ignore the `XAPPLRES' and `XUSERFILESEARCHPATH' environment variables. @@ -1217,6 +1250,7 @@ AS_HELP_STRING([--with-grofferdir=DIR], [groffer files location]))]) + AC_DEFUN([GROFF_GROFFERDIR_DEFAULT], [if test "x$with_grofferdir" = "x"; then groffer_dir=$libdir/groff/groffer @@ -1225,10 +1259,12 @@ fi AC_SUBST([groffer_dir])]) + AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT], glilypond_dir=$libdir/groff/glilypond AC_SUBST([glilypond_dir])) + AC_DEFUN([GROFF_GROGDIR_DEFAULT], grog_dir=$libdir/groff/grog AC_SUBST([grog_dir])) From MAILER-DAEMON Mon Apr 15 16:23:22 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URpvu-0005RO-1n for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 16:23:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URpvp-0005M5-6P for groff-commit@gnu.org; Mon, 15 Apr 2013 16:23:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URpvl-0005Px-C6 for groff-commit@gnu.org; Mon, 15 Apr 2013 16:23:17 -0400 Received: from mout.gmx.net ([212.227.17.22]:49991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URpvl-0005Pm-1m for groff-commit@gnu.org; Mon, 15 Apr 2013 16:23:13 -0400 Received: from mailout-de.gmx.net ([10.1.76.17]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0M8ntS-1UFiR13112-00C9nP for ; Mon, 15 Apr 2013 22:23:11 +0200 Received: (qmail invoked by alias); 15 Apr 2013 20:23:11 -0000 Received: from 188-22-246-56.adsl.highway.telekom.at (EHLO localhost) [188.22.246.56] by mail.gmx.net (mp017) with SMTP; 15 Apr 2013 22:23:11 +0200 X-Authenticated: #54312696 X-Provags-ID: V01U2FsdGVkX1/URjtUmrzUAnSFWfKgTuct+0JchREcVnGEa23/ix S0X+OgVIr9l1Uc Date: Mon, 15 Apr 2013 22:23:09 +0200 (CEST) Message-Id: <20130415.222309.526546377.wl@gnu.org> To: groff-bernd.warken-72@web.de From: Werner LEMBERG In-Reply-To: References: X-Mailer: Mew version 6.5 on Emacs 24.3.50.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.22 Cc: groff-commit@gnu.org Subject: Re: [Groff-commit] groff ChangeLog Makefile.in aclocal.m4 arch/djg... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 20:23:21 -0000 > +# codeset.m4 serial 4 (gettext-0.18) > [...] Uh, oh, again you've commited stuff to `aclocal.m4' which shouldn't be there. Besides this, the patch looks fine. Now that you've added the file with the perl m4 stuff, you should commit regenerated `configure' and `aclocal.m4' files ASAP. Werner From MAILER-DAEMON Mon Apr 15 19:41:10 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1URt1K-0005bg-NR for mharc-groff-commit@gnu.org; Mon, 15 Apr 2013 19:41:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URt1C-0005aS-7Q for groff-commit@gnu.org; Mon, 15 Apr 2013 19:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URt16-0002rY-BR for groff-commit@gnu.org; Mon, 15 Apr 2013 19:41:02 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:55610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URt15-0002rQ-Iv for groff-commit@gnu.org; Mon, 15 Apr 2013 19:40:55 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1URt14-0005wN-Uw for groff-commit@gnu.org; Mon, 15 Apr 2013 23:40:55 +0000 Date: Mon, 15 Apr 2013 23:40:54 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog INSTALL.gen Makefile.in Makefil... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 23:41:09 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/15 23:40:54 Modified files: . : ChangeLog INSTALL.gen Makefile.in Makefile.sub aclocal.m4 configure Added files: . : INSTALL.autotools Log message: iUse suitable versions of `GNU autotools' to generate the needed configuration files. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1410&r2=1.1411 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.gen?cvsroot=groff&r1=1.7&r2=1.8 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.128&r2=1.129 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.sub?cvsroot=groff&r1=1.20&r2=1.21 http://cvs.savannah.gnu.org/viewcvs/groff/aclocal.m4?cvsroot=groff&r1=1.60&r2=1.61 http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.93&r2=1.94 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.autotools?cvsroot=groff&rev=1.1 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1410 retrieving revision 1.1411 diff -u -b -r1.1410 -r1.1411 --- ChangeLog 15 Apr 2013 15:14:31 -0000 1.1410 +++ ChangeLog 15 Apr 2013 23:40:53 -0000 1.1411 @@ -1,3 +1,15 @@ +2013-04-16 Bernd Warken + + * Makefile.sub: Add `m4/ax_compare_version.m4'. + + * aclocal.m4: Run the latest `aclocal -I m4' which generates a + suitable content in that file. + + * INSTALL.autotools: Information of the usage of `GNU autotools' + with `groff'. + + * INSTALL.gen: Move `autotool' parts to file `INSTALL.autotools'. + 2013-04-15 Bernd Warken * m4/groff.m4: Replace tabs by spaces. Use a double line between @@ -31,6 +43,17 @@ 2013-04-15 Bernd Warken + * configure.ac: Add information of the macro `GROFF_PERL'. + + * Makefile.in: Add definitions of the macro variables and their + `@...@' counterparts. + + Run `autoreconf -I m4'. + +2013-04-15 Bernd Warken +2013-04-15 Werner LEMBERG +2013-04-15 Ralph Carderoy + Add Perl test to configuration. During the run of `configure' the program is broken with error when there is no `Perl' or the `perl' program is too old. @@ -40,13 +63,6 @@ most `v5.6.1'. Define variables $PERL and $PERLPATH for the full name of the `perl' program and $PERLVERSION as the lest version. - * configure.ac: Add information of the macro `GROFF_PERL'. - - * Makefile.in: Add definitions of the macro variables and their - `@...@' counterparts. - - Run `autoreconf -I m4'. - 2013-04-13 Keith Marshall Avoid consideration of autotool cache for CVS inclusion. Index: INSTALL.gen =================================================================== RCS file: /cvsroot/groff/groff/INSTALL.gen,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- INSTALL.gen 14 Apr 2013 23:49:48 -0000 1.7 +++ INSTALL.gen 15 Apr 2013 23:40:54 -0000 1.8 @@ -51,18 +51,8 @@ version of `autoconf'. You can also use `autoreconf -I m4' which does the same as `autoconf' -together with some other internal things. You might get the following -warnings: +together with some other internal things. For more information about the usage of `GNU autotools', see the file `IKNSTALL.autotools'. - /usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted \ -definition of AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD - /usr/share/aclocal/gtkglextmm-1.2.m4:225: run info \ -'(automake)Extending aclocal' - /usr/share/aclocal/gtkglextmm-1.2.m4:225: or see \ -http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal - -Just ignore this. It is just a small bug that is known, but that was -not corrected. The simplest way to compile this package is: Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.128 retrieving revision 1.129 diff -u -b -r1.128 -r1.129 --- Makefile.in 15 Apr 2013 14:47:41 -0000 1.128 +++ Makefile.in 15 Apr 2013 23:40:54 -0000 1.129 @@ -483,6 +483,7 @@ "OBJEXT=$(OBJEXT)" \ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ + "PERL=$(PERL)" \ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/Makefile.sub,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- Makefile.sub 29 Jan 2013 11:07:11 -0000 1.20 +++ Makefile.sub 15 Apr 2013 23:40:54 -0000 1.21 @@ -37,6 +37,7 @@ conftest* M4MACROS=\ + $(srcdir)/m4/ax_compare_version.m4 \ $(srcdir)/m4/codeset.m4 \ $(srcdir)/m4/fcntl-o.m4 \ $(srcdir)/m4/glibc21.m4 \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/groff/groff/aclocal.m4,v retrieving revision 1.60 retrieving revision 1.61 diff -u -b -r1.60 -r1.61 --- aclocal.m4 15 Apr 2013 14:47:41 -0000 1.60 +++ aclocal.m4 15 Apr 2013 23:40:54 -0000 1.61 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.13.1 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,1382 +11,81 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# codeset.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET); return !cs;], - [am_cv_langinfo_codeset=yes], - [am_cv_langinfo_codeset=no]) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE([HAVE_LANGINFO_CODESET], [1], - [Define if you have and nl_langinfo(CODESET).]) - fi -]) - -# glibc21.m4 serial 4 -dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([gl_GLIBC21], - [ - AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], - [ac_cv_gnu_library_2_1], - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - [ac_cv_gnu_library_2_1=yes], - [ac_cv_gnu_library_2_1=no]) - ] - ) - AC_SUBST([GLIBC21]) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - -# iconv.m4 serial 11 (gettext-0.18.1) -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that perl supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PERL],[perl]) +# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the perl you have supports at least +# version 5.8.0. +# +# NOTE: This macro uses the $PERL variable to perform the check. +# AX_WITH_PERL can be used to set that variable prior to running this +# macro. The $PERL_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_PROG_PERL_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PERL"],[ + ax_perl_version="$1" + + AC_MSG_CHECKING([for perl version]) + changequote(<<,>>) + perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + changequote([,]) + AC_MSG_RESULT($perl_version) -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - [am_cv_func_iconv=yes]) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - [am_cv_lib_iconv=yes] - [am_cv_func_iconv=yes]) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ - dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - AC_TRY_RUN([ -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } - /* Test against Solaris 10 bug: Failures are not distinguishable from - successful returns. */ - { - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); - if (cd_ascii_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\263"; - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac]) - LIBS="$am_save_LIBS" - ]) - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - AC_DEFINE([HAVE_ICONV], [1], - [Define if you have the iconv() function and it works.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST([LIBICONV]) - AC_SUBST([LTLIBICONV]) -]) - -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to -dnl avoid warnings like -dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definition. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. -m4_define([gl_iconv_AC_DEFUN], - m4_version_prereq([2.64], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [[AC_DEFUN( - [$1], [$2])]])) -gl_iconv_AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([ - $am_cv_proto_iconv]) - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], - [Define as const if the declaration of iconv() needs const.]) - fi -]) - -# lib-ld.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL([acl_cv_path_LD], -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT([$LD]) -else - AC_MSG_RESULT([no]) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - -# lib-link.m4 serial 21 (gettext-0.18) -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ([2.54]) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - popdef([NAME]) - popdef([Name]) -]) + AC_SUBST([PERL_VERSION],[$perl_version]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. The missing-message -dnl defaults to 'no' and may contain additional hints for the user. -dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} -dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, - dnl because these -l options might require -L options that are present in - dnl LIBS. -l options benefit only from the -L options listed before it. - dnl Otherwise, add it to the front of LIBS, because it may be a static - dnl library that depends on another static library that is present in LIBS. - dnl Static libraries benefit only from the static libraries listed after - dnl it. - case " $LIB[]NAME" in - *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; - *) LIBS="$LIB[]NAME $LIBS" ;; - esac - AC_TRY_LINK([$3], [$4], - [ac_cv_lib[]Name=yes], - [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - popdef([NAME]) - popdef([Name]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl acl_libext, -dnl acl_shlibext, -dnl acl_hardcode_libdir_flag_spec, -dnl acl_hardcode_libdir_separator, -dnl acl_hardcode_direct, -dnl acl_hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE([rpath], - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_FROMPACKAGE(name, package) -dnl declares that libname comes from the given package. The configure file -dnl will then not have a --with-libname-prefix option but a -dnl --with-package-prefix option. Several libraries can come from the same -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar -dnl macro call that searches for libname. -AC_DEFUN([AC_LIB_FROMPACKAGE], -[ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_frompackage_]NAME, [$2]) - popdef([NAME]) - pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) - popdef([PACKUP]) - popdef([PACK]) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) - dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH(P_A_C_K[-prefix], -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been - dnl computed. So it has to be reset here. - HAVE_LIB[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. + AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi - popdef([P_A_C_K]) - popdef([PACKLIBS]) - popdef([PACKUP]) - popdef([PACK]) - popdef([NAME]) -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) - -# lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" + $2 + ],[ + : + $3 ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates -dnl - a variable acl_libdirstem, containing the basename of the libdir, either -dnl "lib" or "lib64" or "lib/64", -dnl - a variable acl_libdirstem2, as a secondary possible value for -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or -dnl "lib/amd64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. - dnl On glibc systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine - dnl the compiler's default mode by looking at the compiler's library search - dnl path. If at least one of its elements ends in /lib64 or points to a - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. - dnl Otherwise we use the default, namely "lib". - dnl On Solaris systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. - AC_REQUIRE([AC_CANONICAL_HOST]) - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment - dnl . - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_EGREP_CPP([sixtyfour bits], [ -#ifdef _LP64 -sixtyfour bits -#endif - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ],[ + AC_MSG_WARN([could not find the perl interpreter]) + $3 ]) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) +m4_include([m4/ax_compare_version.m4]) +m4_include([m4/codeset.m4]) +m4_include([m4/fcntl-o.m4]) +m4_include([m4/glibc21.m4]) +m4_include([m4/groff.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) +m4_include([m4/localcharset.m4]) Index: configure =================================================================== RCS file: /cvsroot/groff/groff/configure,v retrieving revision 1.93 retrieving revision 1.94 diff -u -b -r1.93 -r1.94 --- configure 14 Apr 2013 23:11:08 -0000 1.93 +++ configure 15 Apr 2013 23:40:54 -0000 1.94 @@ -5688,7 +5688,7 @@ fi - if test "$PERL" = "no"; then + if test "x$PERL" = "xno"; then as_fn_error 1 "perl binary not found" "$LINENO" 5 fi @@ -5744,7 +5744,7 @@ if test "$ax_compare_version" = "true" ; then : - PERLPATH=$PERL + true else : @@ -10462,6 +10462,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: The program$plural + $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; @@ -10471,6 +10472,7 @@ $as_echo "$as_me: WARNING: missing program$plural: The program$plural + $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; Index: INSTALL.autotools =================================================================== RCS file: INSTALL.autotools diff -N INSTALL.autotools --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ INSTALL.autotools 15 Apr 2013 23:40:54 -0000 1.1 @@ -0,0 +1,69 @@ + Copyright 2013 + Free Software Foundation, Inc. + + Last Update: 16 Apr 2013 + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + +This file contains information that supplements the generic +installation instructions in file `INSTALL.autotools'. + + +If you want to start compiling the `groff' system with an existing +script `configure' you won't need the information ion this file. + + +But if you want to use the `GNU autotools' (`aclocal', `autoreconf') +for creating the following and some more files: + + aclocal.m4 + configure + Makefile + + +To change the file `aclocal.m4', run the shell command + + $ aclocal -I m4 + + +To recreate the files `configure' and `Makefile', use the shell command + + $ autoreconf -I m4 + + +The option `-I m4' is necessary. It refers to the subdirectory `m4' +that has files with m4 macro definitions that are needed by the +`autotools'. + + +If you use an old `autoreconf' version < 2.69, there might be an +error warning like: + + /usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted \ +definition of AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD + /usr/share/aclocal/gtkglextmm-1.2.m4:225: run info \ +'(automake)Extending aclocal' + /usr/share/aclocal/gtkglextmm-1.2.m4:225: or see \ +http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal + +Just ignore this. It doesn't occur in the actual versions of `autoreconf'. + + +You may even use the shell command + + $ autoconf + +instead of `autoreconf', but that will ignore some features. So +`autoreconf' is better. + + +`automake' is not used. `autoreconf' does part of this. If you know +about creating `Makefile.am' files we are glad to have you for the +inclusion of `automake'. Take contact with the `groff Mailinglist'. + + +After the use of the `GNU autotools', the usual compilation should +work. If the run of `configure' produces error reports you have +produced errors in the `autotools' modification. From MAILER-DAEMON Tue Apr 16 15:00:59 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1USB7j-0000VT-MJ for mharc-groff-commit@gnu.org; Tue, 16 Apr 2013 15:00:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USB7c-0000FS-CP for groff-commit@gnu.org; Tue, 16 Apr 2013 15:00:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USB7Y-0006mm-E5 for groff-commit@gnu.org; Tue, 16 Apr 2013 15:00:52 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:35585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USB7Y-0006mh-9j for groff-commit@gnu.org; Tue, 16 Apr 2013 15:00:48 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1USB7X-0006zy-N6 for groff-commit@gnu.org; Tue, 16 Apr 2013 19:00:47 +0000 Date: Tue, 16 Apr 2013 19:00:47 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog INSTALL.gen Makefile.in Makefil... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2013 19:00:59 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/16 19:00:47 Modified files: . : ChangeLog INSTALL.gen Makefile.in Makefile.sub aclocal.m4 contrib/glilypond: subs.pl m4 : groff.m4 src/roff/grog : Makefile.sub Added files: . : INSTALL.CVS m4 : ax_prog_perl_version.m4 Removed files: . : INSTALL.autotools Log message: INSTALL.gen: Replace this file by the daily `git' version of `automake' `INSTALL' file. INSTALL.autotools: Remove file. INSTALL.CVS: New file, moved from `INSTALL.autotools'. m4/ax_prog_perl_version.m4: New file, taken from package `autoconf-archive-2013.04.06'. m4/groff.m4: Remove unnecessary blank line. Makefile.in: Add `$(PERLVERSION)'. aclocal.m4: Run `autoreconf -I m4' (this includes `aclocal -I m4'). This creates a suitable `aclocal.m4'. Remove generated subdirectory `autom4te.cache'. src/roff/grog/Makefile.sub: Correct `sed' command. Use `tabs' that are needed by `GNU make'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1411&r2=1.1412 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.gen?cvsroot=groff&r1=1.8&r2=1.9 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.129&r2=1.130 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.sub?cvsroot=groff&r1=1.21&r2=1.22 http://cvs.savannah.gnu.org/viewcvs/groff/aclocal.m4?cvsroot=groff&r1=1.61&r2=1.62 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.CVS?cvsroot=groff&rev=1.1 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.autotools?cvsroot=groff&r1=1.1&r2=0 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/subs.pl?cvsroot=groff&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.13&r2=1.14 http://cvs.savannah.gnu.org/viewcvs/groff/m4/ax_prog_perl_version.m4?cvsroot=groff&rev=1.1 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/Makefile.sub?cvsroot=groff&r1=1.16&r2=1.17 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1411 retrieving revision 1.1412 diff -u -b -r1.1411 -r1.1412 --- ChangeLog 15 Apr 2013 23:40:53 -0000 1.1411 +++ ChangeLog 16 Apr 2013 19:00:42 -0000 1.1412 @@ -1,5 +1,28 @@ 2013-04-16 Bernd Warken + * INSTALL.gen: Replace this file by the daily `git' version of + `automake' `INSTALL' file. + + * INSTALL.autotools: Remove file. + + * INSTALL.CVS: New file, moved from `INSTALL.autotools'. + + * m4/ax_prog_perl_version.m4: New file, taken from package + `autoconf-archive-2013.04.06'. + + * m4/groff.m4: Remove unnecessary blank line. + + * Makefile.in: Add `$(PERLVERSION)'. + + * aclocal.m4: Run `autoreconf -I m4' (this includes + `aclocal -I m4'). This creates a suitable `aclocal.m4'. Remove + generated subdirectory `autom4te.cache'. + + * src/roff/grog/Makefile.sub: Correct `sed' command. Use `tabs' + that are needed by `GNU make'. + +2013-04-16 Bernd Warken + * Makefile.sub: Add `m4/ax_compare_version.m4'. * aclocal.m4: Run the latest `aclocal -I m4' which generates a Index: INSTALL.gen =================================================================== RCS file: /cvsroot/groff/groff/INSTALL.gen,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- INSTALL.gen 15 Apr 2013 23:40:54 -0000 1.8 +++ INSTALL.gen 16 Apr 2013 19:00:44 -0000 1.9 @@ -1,10 +1,10 @@ +This file comes from GNU automake, it shouldn't be changed. + Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 - Free Software Foundation, Inc. - -Last Update: 15 Apr 2013 +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -46,13 +46,9 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' -if you want to change it or regenerate `configure' using a newer -version of `autoconf'. - - You can also use `autoreconf -I m4' which does the same as `autoconf' -together with some other internal things. For more information about the usage of `GNU autotools', see the file `IKNSTALL.autotools'. - +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.129 retrieving revision 1.130 diff -u -b -r1.129 -r1.130 --- Makefile.in 15 Apr 2013 23:40:54 -0000 1.129 +++ Makefile.in 16 Apr 2013 19:00:45 -0000 1.130 @@ -484,6 +484,7 @@ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ "PERL=$(PERL)" \ + "PERLVERSION=$(PERLVERSION)" \ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/Makefile.sub,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- Makefile.sub 15 Apr 2013 23:40:54 -0000 1.21 +++ Makefile.sub 16 Apr 2013 19:00:46 -0000 1.22 @@ -38,6 +38,7 @@ M4MACROS=\ $(srcdir)/m4/ax_compare_version.m4 \ + $(srcdir)/m4/ax_prog_perl_version.m4 \ $(srcdir)/m4/codeset.m4 \ $(srcdir)/m4/fcntl-o.m4 \ $(srcdir)/m4/glibc21.m4 \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/groff/groff/aclocal.m4,v retrieving revision 1.61 retrieving revision 1.62 diff -u -b -r1.61 -r1.62 --- aclocal.m4 15 Apr 2013 23:40:54 -0000 1.61 +++ aclocal.m4 16 Apr 2013 19:00:46 -0000 1.62 @@ -12,74 +12,8 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# Makes sure that perl supports the version indicated. If true the shell -# commands in ACTION-IF-TRUE are executed. If not the shell commands in -# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by -# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. -# -# Example: -# -# AC_PATH_PROG([PERL],[perl]) -# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) -# -# This will check to make sure that the perl you have supports at least -# version 5.8.0. -# -# NOTE: This macro uses the $PERL variable to perform the check. -# AX_WITH_PERL can be used to set that variable prior to running this -# macro. The $PERL_VERSION variable will be valorized with the detected -# version. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 11 - -AC_DEFUN([AX_PROG_PERL_VERSION],[ - AC_REQUIRE([AC_PROG_SED]) - AC_REQUIRE([AC_PROG_GREP]) - - AS_IF([test -n "$PERL"],[ - ax_perl_version="$1" - - AC_MSG_CHECKING([for perl version]) - changequote(<<,>>) - perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` - changequote([,]) - AC_MSG_RESULT($perl_version) - - AC_SUBST([PERL_VERSION],[$perl_version]) - - AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ - : - $2 - ],[ - : - $3 - ]) - ],[ - AC_MSG_WARN([could not find the perl interpreter]) - $3 - ]) -]) - m4_include([m4/ax_compare_version.m4]) +m4_include([m4/ax_prog_perl_version.m4]) m4_include([m4/codeset.m4]) m4_include([m4/fcntl-o.m4]) m4_include([m4/glibc21.m4]) Index: contrib/glilypond/subs.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/subs.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- contrib/glilypond/subs.pl 12 Apr 2013 21:45:56 -0000 1.2 +++ contrib/glilypond/subs.pl 16 Apr 2013 19:00:46 -0000 1.3 @@ -427,7 +427,7 @@ my $p = $Globals->{'prog'}; my $usage = EMPTYSTRING; - $usage = '###### usage:' . "\n" if ( $Args -> { 'verbose' } ); + $usage = '###### usage:' . "\n" if ( $Args->{'verbose'} ); $usage .= qq*Options for $p: Read a `roff' file or standard input and transform `lilypond' parts (everything between `.lilypond start' and `.lilypond end') into @@ -470,7 +470,7 @@ my $pv = &perl_version(); $usage .= "\n" . 'Perl version ' . $pv . ' needed.' if ( $pv ); - $main::stdout -> print( $usage ); + $main::stdout->print( $usage ); } # end sub usage() @@ -486,8 +486,8 @@ my $output = EMPTYSTRING; $output = "###### version:\n" if ( $Args -> { 'verbose' } ); $output .= "`" . $Globals -> { 'prog' } . "' version `" . - $Legalese -> { 'version' } . "' of `" . - $Legalese -> { 'last_update' } . "' is part of `GNU groff'" . $end; + $Legalese->{'version'} . "' of `" . + $Legalese->{'last_update'} . "' is part of `GNU groff'" . $end; $stdout -> print( $output ); } # end sub version() Index: m4/groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.13 retrieving revision 1.14 diff -u -b -r1.13 -r1.14 --- m4/groff.m4 15 Apr 2013 15:14:31 -0000 1.13 +++ m4/groff.m4 16 Apr 2013 19:00:47 -0000 1.14 @@ -148,7 +148,6 @@ AC_MSG_WARN([missing program$plural: The program$plural - $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; Index: src/roff/grog/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/grog/Makefile.sub,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- src/roff/grog/Makefile.sub 12 Apr 2013 15:14:37 -0000 1.16 +++ src/roff/grog/Makefile.sub 16 Apr 2013 19:00:47 -0000 1.17 @@ -2,9 +2,10 @@ # File position: /src/roff/grog/Makefile.sub -# Copyright (C) 1993, 2006, 2009, 2013 Free Software Foundation, Inc. +# Copyright (C) 1993, 2006, 2009, 2013 +# Free Software Foundation, Inc. -# Last update: 12 Apr 2013 +# Last update: 16 Apr 2013 # This file is part of `grog' which is part of `groff'. @@ -24,57 +25,64 @@ ######################################################################## MAN1=grog.n -MOSTLYCLEANADD=grog $(MAN1) HAVE_PERL +MOSTLYCLEANADD=grog $(MAN1) # not all make programs have $(RM) predefined. RM=rm -f all: grog $(MAN1) -GROG=$(srcdir)/perl_test.pl - +# lib .pl-files +#GROG=$(srcdir)/subs.pl +GROG= GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'` -grog: grog.pl $(SH_DEPS_SED_SCRIPT) - -$(RM) -f $@; - if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ - : >HAVE_PERL; \ - echo "Perl version works for "$@"'."; \ + +# Perl version works for all parts of `groff'. + +grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT) + -$(RM) "$@"; sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -e "s|@EGREP@|$(EGREP)|g" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/grog.pl >$@; \ - chmod +x $@; \ - else \ - echo "This program "$@" needs a newer version of Perl."; \ - exit 1; \ - fi; + $(srcdir)/grog.pl >$@; + chmod +x $@; + +.PHONY: install_data install_data: grog - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); - $(RM) $(DESTDIR)$(bindir)/grog; - $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog; - -test -d $(DESTDIR)$(grog_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(grog_dir); - for f in $(GROG_); do \ - $(RM) $(DESTDIR)$(grog_dir)/$$f; \ - done - if test -f HAVE_PERL; then \ + -test -d "$(DESTDIR)$(bindir)" || \ + $(mkinstalldirs) "$(DESTDIR)$(bindir)"; + -$(RM) "$(DESTDIR)$(bindir)/grog"; + $(INSTALL_SCRIPT) grog "$(DESTDIR)$(bindir)/grog"; + -test -d $(DESTDIR)$(grog_dir) || \ + $(mkinstalldirs) "$(DESTDIR)$(grog_dir)"; + -$(RM) "$(DESTDIR)$(grog_dir)/grog"; + $(INSTALL_SCRIPT) "$(srcdir)/grog" "$(DESTDIR)$(grog_dir)/grog"; for f in $(GROG_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \ - done; \ - fi; - - + -$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \ + $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(grog_dir)/$$f"; \ + done; +.PHONY: uninstall_data uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/grog + -$(RM) "$(DESTDIR)$(bindir)/grog"; for f in $(GROG_); do \ - $(RM) $(DESTDIR)$(grog_dir)/$$f; \ + -$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \ done; - -test -d $(DESTDIR)$(libdir)/groff/grog || \ - rmdir $(DESTDIR)$(libdir)/groff/grog; + -test -d "$(DESTDIR)$(libdir)/groff/grog" || \ + -rmdir "$(DESTDIR)$(libdir)/groff/grog"; + + +######################################################################## +# Emacs settings +######################################################################## +# +# Local Variables: +# mode: makefile +# End: Index: INSTALL.CVS =================================================================== RCS file: INSTALL.CVS diff -N INSTALL.CVS --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ INSTALL.CVS 16 Apr 2013 19:00:43 -0000 1.1 @@ -0,0 +1,69 @@ + Copyright 2013 + Free Software Foundation, Inc. + + Last Update: 16 Apr 2013 + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + +This file contains information that supplements the generic +installation instructions in file `INSTALL.autotools'. + + +If you want to start compiling the `groff' system with an existing +script `configure' you won't need the information ion this file. + + +But if you want to use the `GNU autotools' (`aclocal', `autoreconf') +for creating the following and some more files: + + aclocal.m4 + configure + Makefile + + +To change the file `aclocal.m4', run the shell command + + $ aclocal -I m4 + + +To recreate the files `configure' and `Makefile', use the shell command + + $ autoreconf -I m4 + + +The option `-I m4' is necessary. It refers to the subdirectory `m4' +that has files with m4 macro definitions that are needed by the +`autotools'. + + +If you use an old `autoreconf' version < 2.69, there might be an +error warning like: + + /usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted \ +definition of AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD + /usr/share/aclocal/gtkglextmm-1.2.m4:225: run info \ +'(automake)Extending aclocal' + /usr/share/aclocal/gtkglextmm-1.2.m4:225: or see \ +http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal + +Just ignore this. It doesn't occur in the actual versions of `autoreconf'. + + +You may even use the shell command + + $ autoconf + +instead of `autoreconf', but that will ignore some features. So +`autoreconf' is better. + + +`automake' is not used. `autoreconf' does part of this. If you know +about creating `Makefile.am' files we are glad to have you for the +inclusion of `automake'. Take contact with the `groff Mailinglist'. + + +After the use of the `GNU autotools', the usual compilation should +work. If the run of `configure' produces error reports you have +produced errors in the `autotools' modification. Index: m4/ax_prog_perl_version.m4 =================================================================== RCS file: m4/ax_prog_perl_version.m4 diff -N m4/ax_prog_perl_version.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ m4/ax_prog_perl_version.m4 16 Apr 2013 19:00:46 -0000 1.1 @@ -0,0 +1,66 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that perl supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PERL],[perl]) +# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the perl you have supports at least +# version 5.8.0. +# +# NOTE: This macro uses the $PERL variable to perform the check. +# AX_WITH_PERL can be used to set that variable prior to running this +# macro. The $PERL_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_PROG_PERL_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PERL"],[ + ax_perl_version="$1" + + AC_MSG_CHECKING([for perl version]) + changequote(<<,>>) + perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + changequote([,]) + AC_MSG_RESULT($perl_version) + + AC_SUBST([PERL_VERSION],[$perl_version]) + + AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the perl interpreter]) + $3 + ]) +]) Index: INSTALL.autotools =================================================================== RCS file: INSTALL.autotools diff -N INSTALL.autotools --- INSTALL.autotools 15 Apr 2013 23:40:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ - Copyright 2013 - Free Software Foundation, Inc. - - Last Update: 16 Apr 2013 - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. - -This file contains information that supplements the generic -installation instructions in file `INSTALL.autotools'. - - -If you want to start compiling the `groff' system with an existing -script `configure' you won't need the information ion this file. - - -But if you want to use the `GNU autotools' (`aclocal', `autoreconf') -for creating the following and some more files: - - aclocal.m4 - configure - Makefile - - -To change the file `aclocal.m4', run the shell command - - $ aclocal -I m4 - - -To recreate the files `configure' and `Makefile', use the shell command - - $ autoreconf -I m4 - - -The option `-I m4' is necessary. It refers to the subdirectory `m4' -that has files with m4 macro definitions that are needed by the -`autotools'. - - -If you use an old `autoreconf' version < 2.69, there might be an -error warning like: - - /usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted \ -definition of AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD - /usr/share/aclocal/gtkglextmm-1.2.m4:225: run info \ -'(automake)Extending aclocal' - /usr/share/aclocal/gtkglextmm-1.2.m4:225: or see \ -http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal - -Just ignore this. It doesn't occur in the actual versions of `autoreconf'. - - -You may even use the shell command - - $ autoconf - -instead of `autoreconf', but that will ignore some features. So -`autoreconf' is better. - - -`automake' is not used. `autoreconf' does part of this. If you know -about creating `Makefile.am' files we are glad to have you for the -inclusion of `automake'. Take contact with the `groff Mailinglist'. - - -After the use of the `GNU autotools', the usual compilation should -work. If the run of `configure' produces error reports you have -produced errors in the `autotools' modification. From MAILER-DAEMON Wed Apr 24 14:55:59 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UV4rH-0002SO-Nf for mharc-groff-commit@gnu.org; Wed, 24 Apr 2013 14:55:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV4r5-0002Rw-QD for groff-commit@gnu.org; Wed, 24 Apr 2013 14:55:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV4qw-00054z-IC for groff-commit@gnu.org; Wed, 24 Apr 2013 14:55:47 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:40744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV4qw-00054s-Dr for groff-commit@gnu.org; Wed, 24 Apr 2013 14:55:38 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UV4qv-0006LB-Id for groff-commit@gnu.org; Wed, 24 Apr 2013 18:55:37 +0000 Date: Wed, 24 Apr 2013 18:55:37 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/lilypond ChangeLog groff_lilypond... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 18:55:58 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/24 18:55:37 Removed files: contrib/lilypond: ChangeLog groff_lilypond.man groff_lilypond.pl Log message: Delete files in /contrib/lilypond. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/ChangeLog?cvsroot=groff&r1=1.9&r2=0 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/groff_lilypond.man?cvsroot=groff&r1=1.8&r2=0 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/groff_lilypond.pl?cvsroot=groff&r1=1.8&r2=0 Patches: Index: ChangeLog =================================================================== RCS file: ChangeLog diff -N ChangeLog --- ChangeLog 11 Mar 2013 00:45:23 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,75 +0,0 @@ -2013-03-11 Bernd Warken - - * groff_lilypond.pl: Publishing groff_lilypond version v0.6. - New options: -e|--eps_dir, -l|--license, -k|--keep_files, - -p|--prefix=..., -t|--temp_dir=... - Install --eps_dir as directory for the useful EPS files. - * groff_lilypond.man: Include the new options. Add section - SEE ALSO. - -2013-03-03 Bernd Warken - - * groff_lilypond.pl: New code with Perl references. - Publishing groff_lilypond version v0.5. - New options: --usage, -V|--Verbose|--verbose, --file_prefix=..., - -o|--output=..., --temp_dir=... - Perl >=5.10.0 needed. - * groff_lilypond.man: Include the new options. - -2013-02-23 Bernd Warken - - * groff_lilypond_pl: Remove `.lilypond include' for lilypond - regions. Within `groff' mode. it is still allowed. - * groff_lilypond.man: Update `.lilypond include'. - -2013-02-23 Bernd Warken - - New version v0.4 of groff_lilypond. - * groff_lilypond_pl: Major rewrite. - New options: --file_prefix, --temp_dir, and --license. - * groff_lilypond.man: documents the new features. - -2013-02-16 Bernd Warken - - * groff_lilypond.man: Minor corrections. - -2013-02-12 Bernd Warken - - * groff_lilypond.pl: Add deletion of unused temporary files. - -2013-02-12 Bernd Warken - - * contrib/lilypond: Version v0.3 for groff_lilypond - * groff_lilypond.pl: A new request was added for importing - lilypond files: - .lilypond include ... - The argument handling was improved. - -2013-02-11 Bernd Warken - - * contrib/lilypond: Version v0.2 for groff_lilypond - * groff_lilypond.pl: Now there are 2 modes for generationg the EPS - files: --ly2eps (the default) and --pdf2eps (that's the old mode - from version v0.1 with pdf to ps to eps). With ly2eps mode, - lilypond generates the EPS files itself, for each page one EPS - file. - * groff_lilypond.man: Corresponding updated man-page - -2013-02-10 Bernd Warken - - * contrib/lilypond: New files for adding lilypond parts into groff - files. These files will not yet be installed. - * groff_lilypond.pl: Program written in Perl, version v0.1 - * groff_lilypond.man: Corresponding man-page - -Copyright 2013 - Free Software Foundation, Inc. - -Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. - -Local Variables: -version-control: never -coding: utf-8 -End: Index: groff_lilypond.man =================================================================== RCS file: groff_lilypond.man diff -N groff_lilypond.man --- groff_lilypond.man 11 Mar 2013 00:45:24 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,661 +0,0 @@ -.TH groff_lilypond @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" -.SH NAME -groff\-lilypond \[em] integrate \f[CI]lilypond\f[] parts into \f[CI]groff\f[] -. -.\" This .SH was moved to this place in order to appease `apropos'. -. -.\" -------------------------------------------------------------------- -.\" Legalese -.\" -------------------------------------------------------------------- -. -.de authors -This file was written by Bernd Warken -.MT groff\-bernd.warken\-72@web.de -.ME . -. -Last update: 11 Mar 2013 -.. -. -. -.de copying -groff_lilypond \[em] integrate lilypond into groff files -. -.P -.EX -Source file position: /contrib/lilypond/groff_lilypond.man -Installed position: /share/man/man1/groff_lilypond.1 -.EE -. -.P -Copyright \(co 2013 -.RS -.ft CI -Free Software Foundation, Inc. -.ft R -.RE -. -.P -This file is part of -.ft CI -GNU groff\\f[R]. -. -.P -.ft CI -GNU groff -.ft R -is free software is free software: you can redistribute it and/or modify it -under the terms of the -.ft CI -GNU General Public License -.ft R -as published by the -.ft CI -Free Software Foundation\fR, either -.ft CI -version 3 -.ft R -of the -.IR License , -or -.RI ( "at your option" ) -any later version. -. -.P -.ft CI -GNU groff -.ft R -is distributed in the hope that it will be useful, but -.ft CI -WITHOUT ANY WARRANTY\fR; without even the implied warranty of -.ft CI -MERCHANTABILITY -.ft R -or -.ft CI FITNESS FOR A PARTICULAR PURPOSE\fR. -See the -.ft CI -GNU General Public License -.ft R -for more details. -. -.P -.P -You should have received a copy of the -.nh -.ft CI -GNU General Public License -.ft R -.hy -along with -.ft CI -groff\\f[R], see the files -.nh -.ft CB -COPYING -.ft R -and -.ft CB -LICENSE -.ft R -.hy -in the top directory of the -.ft CI -groff -.ft R -source package. -. -If not, see -.UR http://\\:www.gnu.org/\\:licenses/ - the -.ft CI -GNU licenses -.ft R -.UE . -. -.. -. -. -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.ds Ellipsis "\&.\|.\|.\&\" -. -. -.\" -------------------------------------------------------------------- -.\" Macro definitions -.\" -------------------------------------------------------------------- -. -.\" -------------------------------------------------------------------- -.\" .FONT ( [ ...]) -.\" -.\" Print in different fonts: R, I, B, CR, CI, CB -.\" -.de1 FONT -. if (\\n[.$] = 0) \{\ -. nop \&\f[P]\& -. return -. \} -. ds result \& -. while (\\n[.$] >= 2) \{\ -. as result \,\f[\\$1]\\$2 -. if !"\\$1"P" .as result \f[P] -. shift 2 -. \} -. if (\\n[.$] = 1) .as result \,\f[\\$1] -. nh -. nop \\*[result]\& -. hy -.. -. -. -.\" -------------------------------------------------------------------- -.SH "SYNOPSIS" -.\" -------------------------------------------------------------------- -. -.SY groff_lilypond -.OP options -.OP - -.OP -- -.OP \%filespec \*[Ellipsis] -.YS -. -. -.\" -------------------------------------------------------------------- -.SH DESCRIPTION -.\" -------------------------------------------------------------------- -. -.FONT CB groff_lilypond -transforms sheet music in the -.FONT CI lilypond -language in a -.FONT CI groff -file such that -.FONT CB groff -can display them. -. -. -.P -Without arguments or without -.I filespec -arguments, -.FONT CB groff_lilypond -reads from standard input. -. -Several files can be used; the minus character -.FONT CB \[em] -stands for standard input. -. -. -.\" -------------------------------------------------------------------- -.SH "OPTION OVERVIEW" -.\" -------------------------------------------------------------------- -. -.\" -------------------------------------------------------------------- -.SS "Breaking Options" -.\" -------------------------------------------------------------------- -.TP -.I breaking options -.RS -.P -.SY -.OP -h\~\fR|\fB\~--help\fR|\fB\~--usage -.YS -.SY -.OP -v\~\fR|\fB\~--version -.YS -.SY -.OP -l\~\fR|\fB\~--license -.YS -.RE -. -. -.TP -.I \%groff_lilypond mode options -.RS -. -.TP -.OP --pdf2eps -The program -.FONT CB groff_lilypond -generates a -.FONT CI pdf -file using -.FONT CB lilypond R . -. -Then the -.FONT CI eps -file is generated by -.FONT CB pdf2ps -and -.FONT CB ps2eps R . -. -. -.TP -.OP --ly2eps -Here the -.FONT CB lilypond -program creates -.FONT CI eps -files directly. -. -. -.RE -. -. -.TP -.I \%directories and files -.RS -. -.TP -.OP -e\fR|\fB\~--eps_dir directory_name -Normally all -.FONT CI EPS -files are sent to the temporary directory. -. -With this option, you can generate your own directory, in which all useful -.FONT CI EPS -files are send. -. -So at last, the temporary directory can be removed. -. -. -.TP -.OP -p\fR|\fB\~--prefix begin_of_name -Normally all temporary files get names that start with the -.FONT CB ly CI \*[Ellipsis] -prefix. -. -With this option, you can freely change this prefix. -. -. -.TP -.OP -k\fR|\fB\~--keep_files -Normally all temporary files without the -.FONT CI eps -files are deleted. -. -With this opton, all generated files either by the -.FONT CB lilypond -program or other format transposers are kept. -. -. -.TP -.OP -t\fR|\fB\~--temp_dir dir -With this option, you can change the directory in which the temporary -files are stored. -. -No extensions are used for this directory. -. -If the directory does not exist it will be created. -. -.RE -. -. -.TP -.I \%output -.RS -. -. -.TP -.OP -o\fR|\fB\~--output file_name -Normally all -.FONT CI groff -output is sent to -.FONT CB STDOUT R . -. -With this option that can be stored in a -.IR file . -. -. -.TP -.OP -V\~\fR|\fB\~--Verbose|\fB\~--verbose -A lot more of output is sent to STDERR. -. -. -.RE -. -. -.P -In an old version of this program, there was an additional option called -.FONT CB --file_prefix R . -. -This is now replaced by -.FONT CB --prefix -and -.FONT CB -p R . -. -. -.\" -------------------------------------------------------------------- -.SH "FINDING THE LILYPOND PARTS IN A ROFF FILE OR STANDARD INPUT" -.\" -------------------------------------------------------------------- -. -A -.FONT CI lilypond -part within a structure written in the -.FONT CI groff -language is the whole part between the marks -.EX -.FONT CB ".lilypond start" -.EE -and -.EX -.FONT CB ".lilypond end" -.EE -. -. -.P -A -.FONT CI groff -file can have several of these -.FONT CI lilypond -parts. -. -. -.P -These -.FONT CI lilypond -parts are sent into temporary files with the file name extension -.FONT CB .ly R . -. -There a 2 modes to transform these files. -. -. -.\" -------------------------------------------------------------------- -.SH "LY\-FILE INCLUSION" -.\" -------------------------------------------------------------------- -. -An additional command line for file inclusion of -.FONT CI lilypond -files is given by -.EX -.FONT CB ".lilypond include" I " file_name" -.EE -in -.FONT CI groff -files. -. -One file can be included per -.FONT CI include -command. -. -. -.P -If this command is written outside a -.FONT CI lilypond -part, one new -.FONT CB .ly R file -is created for all files in the argument, which will be transformed -afterwards when writing is done. -. -. -.P -Within a -.FONT CI lilypond -part, this inclusion is not possible. -. -So -.FONT CB ".lilypond include" -may not be used between -.FONT CB ".lilypond start" -and -.FONT CB ".lilypond end" R . -. -. -.\" -------------------------------------------------------------------- -.SH "TRANSFORMATION MODE LY2EPS" -.\" -------------------------------------------------------------------- -. -This mode is the default. -. -It can also be chosen by the option -.FONT CB --ly2eps R . -. -. -.P -In this mode, the -.FONT CB .ly -files are transformed by the -.FONT CB lilypond -program into many files of different formats, including -.FONT CI eps -files, using -.EX -.FONT CB "$ lilypond \-\-ps \-dbackend=eps \-dgs\-load\-fonts \-\-output=" I file\-name -.EE -for each -.FONT CB .ly -file. -. -The output -.I file\-name -must be provided without an extension, its directory is temporary.. -. -. -.P -There are many -.FONT CI EPS -files created. -. -One having the complete transformed -.FONT CB ly -file, named -.FONT I file\-name CB .eps R . -. -. -.P -Moreover there are -.FONT CI EPS -files for each page, named -.FONT I file\-name CB \- I digit CB .eps R . -. -. -.P -The last step to be done is replacing all -.FONT CI lilypond -parts by the collection of the corresponding -.FONT CI EPS -page files. -. -This is done by -.FONT CI groff -commands -.EX -.FONT CB ".PSPIC " CI file-name CB \- I digit CB .eps -.EE -. -. -.\" -------------------------------------------------------------------- -.SH "TRANSFORMATION MODE PDF2EPS" -.\" -------------------------------------------------------------------- -. -This mode can be chosen by the option -.FONT CB --pdf2eps R . -. -. -.P -In this mode, the -.FONT CB .ly -files are transformed by the -.FONT CB lilypond -program into -.FONT CI pdf -files, using -.EX -.FONT CB "lilypond \-\-pdf \-\-output=" I file-name -.EE -for each -.FONT CB .ly -file. -. -The -.I file-name -must be provided without the extension -.FONT CB .pdf R . -. -By this process, a file -.FONT CI file-name CB .pdf -is generated. -. -. -.P -The next step is to transform these -.FONT CI pdf -files into a -.FONT CI ps -file. -. -This is done by the -.FONT CB pdf2ps -program using -.EX -.FONT R "$ " CB "pdf2ps " CI file-name CB ".pdf " CI file-name CB ".ps" -.EE -. -. -The next step creates an -.FONT CI EPS -file from the -.FONT CI ps -file. -. -This is done by the -.FONT CB ps2eps -program using -.EX -.FONT R "$ " CB "ps2eps " CI file-name CB ".ps" -.EE -. -. -.P -By that, a file -.FONT CI file-name CB .eps -is created for each -.FONT CI lilypond -part in the -.FONT CI groff -file or standard input. -. -. -.P -The last step to be done is replacing all -.FONT CI lilypond -parts by the -.FONT CI groff -command -.EX -.FONT CB ".PSPIC " CI file-name CB .eps -.EE -. -. -.\" -------------------------------------------------------------------- -.SH "THE GENERATED NEW ROFF STRUCTURE" -.\" -------------------------------------------------------------------- -. -The new -.BR groff (@MAN7EXT@) -structure generated by -.FONT CB groff_lilypond -is sent to standard output. -. -It can either be saved in a file or piped to -.BR groff (@MAN1EXT@) -or -.BR groffer (@MAN1EXT@) -for a display. -. -. -.\" -------------------------------------------------------------------- -.SH "TEMPORARY FILES" -.\" -------------------------------------------------------------------- -. -By the transformation process, there are many temporary files -generated. -. -All of them except the -.FONT CI EPS -files are deleted when the -.FONT CB groff_lilypond -process is finished. -. -. -.P -These -.FONT CI EPS -files are stored in a temporary directory. -. -But they cannot be deleted by the transformation process because they -are needed for the display which can take a long time. -. -. -.\" -------------------------------------------------------------------- -.SH "DISPLAY" -.\" -------------------------------------------------------------------- -. -The display maps each -.FONT CI lilypond -part on a complete page, preceded and followed by a page break. -. -I do not know how to change this or what very long music sheets will -do. -. -. -.\" -------------------------------------------------------------------- -.SH "SEE ALSO" -.\" -------------------------------------------------------------------- -. -.TP -.BR groff (@MAN1EXT@) -the usage of the groff program and pointers to the documentation and -availability of the -.FONT CI groff -system. -. -The main source of information for the -.FONT CI groff -language is the -.FONT CB groff -.BR info (1) -file. -. -. -.TP -.BR groff_tmac (@MAN5EXT@) -contains documentation of the -.FONT CB .PSPIC -request. -. -. -.TP -.BR lilypond (1) -The documentation of the -.FONT CB lilypond -program. -. -The main source of information for the -.FONT CI lilypond -language is the -.FONT CB lilypond -.BR info (1) -file. -. -. -.\" -------------------------------------------------------------------- -.SH "AUTHORS" -.\" -------------------------------------------------------------------- -.authors -. -. -.\" -------------------------------------------------------------------- -.SH "COPYING" -.\" -------------------------------------------------------------------- -.copying -. -. -.\" -------------------------------------------------------------------- -.\" Emacs settings -.\" -------------------------------------------------------------------- -. -.\" Local Variables: -.\" mode: nroff -.\" End: Index: groff_lilypond.pl =================================================================== RCS file: groff_lilypond.pl diff -N groff_lilypond.pl --- groff_lilypond.pl 11 Mar 2013 00:45:24 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,1552 +0,0 @@ -#! /usr/bin/env perl - -use strict; -use 5.10.0; - -# use warnings; - - -######################################################################## -# main: global stuff -######################################################################## - -{ - package main; - use strict; - -######################################################################## -# legalese -######################################################################## - - use vars '$VERSION'; - $VERSION = 'v0.6'; # version of groff_lilypond - - $main::last_update = '11 Mar 2013'; - - ### This `$License' is the license for this file, `GPL' >= 3 - $main::License = q* -groff_lilypond - integrate `lilypond' into `groff' files - -Source file position: `/contrib/lilypond/groff_lilypond.pl' -Installed position: `/bin/groff_lilypond' - -Copyright (C) 2013 Free Software Foundation, Inc. - Written by Bernd Warken - -This file is part of `GNU groff'. - - `GNU groff' is free software: you can redistribute it and/or modify it -under the terms of the `GNU General Public License' as published by the -`Free Software Foundation', either version 3 of the License, or (at your -option) any later version. - - `GNU groff' is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `GNU -General Public License' for more details. - - You should have received a copy of the 'GNU General Public License` -along with `groff', see the files `COPYING' and `LICENSE' in the top -directory of the `groff' source package. If not, see -. -*; - -##### end legalese - - -######################################################################## -# global variables -######################################################################## - - use Cwd qw[]; - use File::Basename qw[]; - use File::Copy qw[]; - use File::HomeDir qw[]; - use File::Spec qw[]; - use File::Path qw[]; - - use Time::HiRes qw[]; - - use constant FALSE => 0; - use constant TRUE => 1; - use constant EMPTYSTRING => ''; - use constant EMPTYARRAY => (); - use constant EMPTYHASH => (); - - $main::at_version_at = '@VERSION@'; # @...@ is replaced for the installation - - # `$prog_is_installed' is TRUE if the groff package is installed, - # FALSE when in source package - $main::prog_is_installed = ( $main::at_version_at =~ /^[@]VERSION[@]$/ ) - ? FALSE : TRUE; - - $main::groff_version = $main::prog_is_installed - ? $main::at_version_at : main::EMPTYSTRING; - - { - ( my $volume, my $directory, $main::prog ) = File::Spec->splitpath($0); - } - # $main::prog is `groff_lilypond' when installed, - # `groff_lilypond.pl' when not - - - $\ = "\n"; # adds newline at each print - - - $main::fh_verbose; # file handle only for `--verbose' - $main::fh_out; # file handle for `--output' - -} # end of package `main' - -##### end global variables - - -######################################################################## -# Args: command line arguments -######################################################################## - -# command line arguments are handled in 2 runs: -# 1) split short option collections, `=' optargs, and transfer abbrevs -# 2) handle the transferred options with subs - -{ # package `Args' - - package Args; - use strict; - - - # ---------- - # variables for package `Args' - # ---------- - - $Args::eps_dir = main::EMPTYSTRING; # directory for the used EPS-files - # can be overwritten by `--eps_dir' - - # 2 possible values: - # 1) `ly' from `--ly2eps' (default) - # 2) `pdf' `--pdf2eps' - $Args::eps_func = 'ly'; - - $Args::file_prefix = 'ly'; - # names of temporary files in $main::TempDir start with this string - # can be overwritten by `--file_prefix' - - # do not delete temporary files - $Args::keep_files = main::FALSE; - - # the roff output goes normally to STDOUT, can be a file with `--output' - $Args::output = main::EMPTYSTRING; - - $Args::temp_dir = main::EMPTYSTRING; # temporary directory - # can be overwritten by `--temp_dir' - - # regulates verbose output (on STDERR), overwritten by `--verbose' - $Args::verbose = main::FALSE; - - - # ---------- - # subs for second run, for remaining long options after splitting and - # transfer - # ---------- - - my %opts_with_arg = - ( - - '--eps_dir' => sub { - $Args::eps_dir = shift; - }, - - '--output' => sub { - $Args::output = shift; - }, - - '--prefix' => sub { - $Args::file_prefix = shift; - }, - - '--temp_dir' => sub { - $Args::temp_dir = shift; - }, - - ); # end of %opts_with_arg - - - my %opts_noarg = - ( - - '--help' => sub { - &Subs::usage; - exit; - }, - - '--keep_files' => sub { - $Args::keep_files = main::TRUE; - }, - - '--license' => sub { - &Subs::license; - exit; - }, - - '--ly2eps' => sub { - $Args::eps_func = 'ly'; - }, - - '--pdf2eps' => sub { - $Args::eps_func = 'pdf'; - }, - - '--verbose' => sub { - $Args::verbose = main::TRUE; - }, - - '--version' => sub { - $Subs::version; - }, - - ); # end of %opts_noarg - - - # used variables in both runs - - my @files = main::EMPTYARRAY; - - { - #---------- - # first run for command line arguments - #---------- - - # global variables for first run - - my @splitted_args; - my $double_minus = main::FALSE; - my $arg = main::EMPTYSTRING; - my $has_arg = main::FALSE; - - - # split short option collections and transfer these to suitable - # long options from above - - my %short_opts = - ( - 'e' => '--eps_dir', - 'h' => '--help', - 'l' => '--license', - 'k' => '--keep_files', - 'o' => '--output', - 'p' => '--prefix', - 't' => '--temp_dir', - 'v' => '--version', - 'V' => '--verbose', - ); - - - # transfer long option abbreviations to the long options from above - - my @long_opts; - - $long_opts[3] = - { # option abbreviations of 3 characters - '--e' => '--eps_dir', - '--f' => '--prefix', - '--h' => '--help', - '--k' => '--keep_files', - '--o' => '--output', - '--t' => '--temp_dir', - '--u' => '--help', # '--usage' is mapped to `--help' - '--V' => '--verbose', # `--Verbose' is mapped to `--verbose' - }; - - $long_opts[4] = - { # option abbreviations of 4 characters - '--li' => '--license', - '--ly' => '--ly2eps', - '--pd' => '--pdf2eps', - '--pr' => '--prefix', - }; - - $long_opts[6] = - { # option abbreviations of 6 characters - '--verb' => '--verbose', - '--vers' => '--version', - }; - - - # subs for short splitting and replacing long abbreviations - - my %split_subs = - ( - - 'short_opt_collection' => sub { # %split_subs - - my @chars = split //, $1; # omit leading dash - CHARS: while ( @chars ) { - my $c = shift @chars; - - unless ( exists $short_opts{ $c } ) { - print STDERR "Unknown short option `-$c'."; - next CHARS; - } - - # short option exists - - # map or transfer to special long option from above - my $transopt = $short_opts{ $c }; - - if ( exists $opts_noarg{ $transopt } ) { - push @splitted_args, $transopt; - $Args::verbose = main::TRUE if ( $transopt eq '--verbose' ); - next CHARS; - } - - if ( exists $opts_with_arg{ $transopt } ) { - push @splitted_args, $transopt; - - if ( @chars ) { - # if @chars is not empty, option $transopt has argument - # in this arg, the rest of characters in @chars - shift @chars if ( $chars[0] eq '=' ); - push @splitted_args, join "", @chars; - @chars = main::EMPTYARRAY; - next SPLIT; - } - - # optarg is the next argument - $has_arg = $transopt; - next SPLIT; - } # end of if %opts_with_arg - } # end of while CHARS - }, # end of sub for short_opt_collection - - - 'long_option' => sub { # %split_subs - - my $from_arg = shift; - N: for my $n ( qw/6 4 3/ ) { - $from_arg =~ / # match $n characters - ^ - ( - .{$n} - ) - /x; - my $argn = $1; # get the first $n characters - - # no match, so luck for fewer number of chars - next N unless ( $argn ); - - next N unless ( exists $long_opts[ $n ] -> { $argn } ); - # not in $n hash, so go on to next loop for $n - - # now $n-hash has arg - - # map or transfer to special long opt from above - my $transopt = $long_opts[ $n ] -> { $argn }; - - # test on option without arg - if ( exists $opts_noarg{ $transopt } ) { # opt has no arg - push @splitted_args, $transopt; - $Args::verbose = main::TRUE if ( $transopt eq '--verbose' ); - next SPLIT; - } # end of if %opts_noarg - - # test on option with arg - if ( exists $opts_with_arg{ $transopt } ) { # opt has arg - push @splitted_args, $transopt; - - # test on optarg in arg - if ( $from_arg =~ / # optarg is in arg, has `=' - ^ - [^=]+ - = - ( - .* - ) - $ - /x ) { - push @splitted_args, $1; - next SPLIT; - } # end of if optarg in arg - - # has optarg in next arg - $has_arg = $transopt; - next SPLIT; - } # end of if %opts_with_arg - - # not with and without option, so is not permitted - print main::fh_verbose - "`$transopt' is unknown long option from `$from_arg'"; - next SPLIT; - } # end of for N - }, # end of sub for long option - ); # end of %split_subs - - - #---------- - # do split and transfer arguments - #---------- - - SPLIT: foreach (@ARGV) { - # Transform long and short options into some given long options. - # Split long opts with arg into 2 args (no `='). - # Transform short option collections into given long options. - chomp; - - if ( $has_arg ) { - push @splitted_args, $_; - $has_arg = main::EMPTYSTRING; - next SPLIT; - } - - if ( $double_minus ) { - push @files, $_; - next SPLIT; - } - - if ( $_ eq '-' ) { # file arg `-' - push @files, $_; - next SPLIT; - } - - if ( $_ eq '--' ) { # POSIX arg `--' - push @splitted_args, $_; - $double_minus = main::TRUE; - next SPLIT; - } - - if ( / # short option or collection of short options - ^ - - - ( - [^-] - .* - ) - $ - /x ) { - $split_subs{ 'short_opt_collection' } -> ( $1 ); - next SPLIT; - } # end of short option - - if ( /^--/ ) { # starts with 2 dashes, a long option - $split_subs{ 'long_option' } -> ( $_ ); - next SPLIT; - } # end of long option - - # unknown option without leading dash is a file name - push @files, $_; - next SPLIT; - } # end of foreach SPLIT - - # all args are considered - print STDERR "Option `$has_arg' needs an argument." if ( $has_arg ); - - - push @files, '-' unless ( @files ); - @ARGV = @splitted_args; - - } # end of splitting with map or transfer - - - #---------- - # open $main::fh_verbose - #---------- - - { - # install `$main::fh_verbose' - if ( $Args::verbose ) { # `--verbose' was used - # make verbose output, i.e. make `$main::fh_verbose' visible - $main::fh_verbose = *STDERR; - - } else { # `--verbose' was not used - # do not be verbose, make `$main::fh_verbose' invisible, e.g. either - # in /dev/null or in a string - - my $opened = main::FALSE; - - my $devnull = File::Spec->devnull(); - if ( -e $devnull && -w $devnull ) { - open $main::fh_verbose, ">", $devnull or - die "Could not open `$devnull': $!"; - - # `/dev/null' will now be used for verbose output - $opened = main::TRUE; - } - - unless ( $opened ) { # couldn't use `$devnull', so print into a string - my $print_to_string; - open $main::fh_verbose, ">", \ $print_to_string or - die "Could not open `\$main::fh_verbose': $!"; - - # now verbose output will go into a string, which is ignored - } - } # end if-else about verbose - - # $main::fh_verbose is now active - - { - print $main::fh_verbose "Verbose output was chosen."; - - my $s = $main::prog_is_installed ? '' : ' not'; - print $main::fh_verbose "$main::prog is$s installed."; - - print $main::fh_verbose 'The command line options are:'; - - $s = " options:"; - $s .= " `$_'" for ( @ARGV ); - print $main::fh_verbose $s; - - $s = " file names:"; - $s .= " `$_'\n" for ( @files ); - print $main::fh_verbose $s; - - } - - } # end fh_verbose - - - #---------- - # second run of command line arguments - #---------- - - { - # second run of args with new @ARGV from the formere splitting - # arguments are now splitted and transformed into special long options - my $double_minus = main::FALSE; - my $has_arg = main::FALSE; - - my $has_arg = main::FALSE; - - ARGS: for my $arg ( @ARGV ) { - - # ignore `--', file names are handled later on - last ARGS if ( $arg eq '--' ); - - if ( $has_arg ) { - unless ( exists $opts_with_arg{ $has_arg } ) { - print STDERR "`\%opts_with_args' does not have key `$has_arg'."; - next ARGS; - } - - $opts_with_arg{ $has_arg } -> ( $arg ); - $has_arg = main::FALSE; - next ARGS; - } # end of $has_arg - - if ( exists $opts_with_arg{ $arg } ) { - $has_arg = $arg; - next ARGS; - } - - if ( exists $opts_noarg{ $arg } ) { - $opts_noarg { $arg } -> (); - next ARGS; - } - - # not a suitable option - print STDERR "Wrong option `$arg'."; - next ARGS; - - } # end of for ARGS: - - - if ( $has_arg ) { # after last argument - die "Option `$has_arg' needs an argument."; - } - - } # end ot second run - - - if ( $Args::output ) { - my $out_path = &Subs::path2abs( $Args::output ); - die "Output file name `$Args::output' cannot be used." - unless ( $out_path ); - - my ( $file, $dir ); - ( $file, $dir )= File::Basename::fileparse( $out_path ) - or die "Could not handle output file path `$out_path': " . - "directory name `$dir' and file name `$file'."; - - die "Could not find output directory for `$Args::output'" unless ( $dir ); - die "Could not find output file: `$Args::output'" unless ( $file ); - - if ( -d $dir ) { - die "Could not write to output directory `$dir'." unless ( -w $dir ); - } else { - $dir = &Subs::make_dir( $dir ); - die "Could not create output directory in: `$out_path'." unless ( $dir ); - } - - # now $dir is a writable directory - - if ( -e $out_path ) { - die "Could not write to output file" unless ( -w $out_path ); - } - - open $main::fh_out, ">", $out_path or - die "could not write to output file `$out_path': $!"; - print main::fh_verbose "Output goes to file `$out_path'"; - } else { - $main::fh_out = *STDOUT; - } - - - $Args::file_prefix .= '_' . $Args::eps_func . '2eps'; - - - @ARGV = @files; - -} - -# end package `Args' - - -######################################################################## -# temporary directory .../tmp/groff/USER/lilypond/TIME -######################################################################## - -{ - package Temp; - use strict; - - # `$Cwd' stores the current directory - $Temp::cwd = Cwd::getcwd; - - $Temp::temp_dir = main::EMPTYSTRING; - - - if ( $Args::temp_dir ) { - - #---------- - # temporary directory was set by `--temp_dir' - #---------- - - my $dir = $Args::temp_dir; - - $dir = &Subs::path2abs( $dir ); - $dir = &Subs::make_dir ( $dir ) or - die "The directory `$dir' cannot be used temporarily: $!"; - - - # now `$dir' is a writable directory - - opendir( my $dh, $dir ) or - die "Could not open temporary directory `$dir': $!"; - my $file_name; - my $found = main::FALSE; - my $re = qr< - ^ - $Args::file_prefix - _ - >x; - - READDIR: while ( defined( $file_name = readdir ( $dh ) ) ) { - chomp $file_name; - if ( $file_name =~ /$re/ ) { # file name starts with $prefix_ - $found = main::TRUE; - last READDIR; - } - next; - } - - $Temp::temp_dir = $dir; - my $n = 0; - while ( $found ) { - $dir = File::Spec -> catdir( $Temp::temp_dir, ++$n ); - next if ( -e $dir ); - - $dir = &Subs::make_dir ( $dir ) or next; - - $found = main::FALSE; - last; - } - - $Temp::temp_dir = $dir; - - - } else { # $Args::temp_dir not given by `--temp_dir' - - #---------- - # temporary directory was not set - #---------- - - { # search for or create a temporary directory - - my @tempdirs = main::EMPTYARRAY; - { - my $tmpdir = File::Spec -> tmpdir(); - push @tempdirs, $tmpdir if ( $tmpdir && -d $tmpdir && -w $tmpdir ); - - my $root_dir = File::Spec -> rootdir(); # `/' in Unix - my $root_tmp = File::Spec -> catdir( $root_dir, 'tmp' ); - push @tempdirs, $root_tmp - if ( $root_tmp ne $tmpdir && -d $root_tmp && -w $root_tmp ); - - # home directory of the actual user - my $home = File::HomeDir -> my_home; - my $home_tmp = File::Spec -> catdir ( $home, 'tmp' ); - push @tempdirs, $home_tmp if ( -d $home_tmp && -w $home_tmp ); - - # `/var/tmp' in Unix - my $var_tmp = File::Spec -> catdir( '', 'var', 'tmp' ); - push @tempdirs, $var_tmp if ( -d $var_tmp && -w $var_tmp ); - } - - - my @path_extension = qw( groff ); # TEMPDIR/groff/USER/lilypond/ - { - # `$<' is UID of actual user, - # `getpwuid' gets user name in scalar context - my $user = getpwuid( $< ); - push @path_extension, $user if ( $user ); - - push @path_extension, qw( lilypond ); - } - - - TEMPS: foreach ( @tempdirs ) { - - my $dir; # final directory name in `while' loop - $dir = &Subs::path2abs ( $_ ); - next TEMPS unless ( $dir ); - - # beginning of directory name - my @dir_begin = - ( File::Spec -> splitdir( $dir ), @path_extension ); - - - my $n = 0; - my $dir_blocked = main::TRUE; - BLOCK: while ( $dir_blocked ) { - # should become the final dir name - $dir = File::Spec -> catdir ( @dir_begin, ++$n ); - next BLOCK if ( -d $dir ); - - # dir name is now free, create it, and end the blocking - my $res = &Subs::make_dir( $dir ); - die "Could not create directory: $dir" unless ( $res ); - - $dir = $res; - $dir_blocked = main::FALSE; - } - - next TEMPS unless ( -d $dir && -w $dir ); - - # $dir is now a writable directory - $Temp::temp_dir = $dir; # tmp/groff/USER/lilypond/TIME - last TEMPS; - } # end foreach tmp directories - } # end to create a temporary directory - - die "Could not find a temporary directory" unless - ( $Temp::temp_dir && -d $Temp::temp_dir && -w $Temp::temp_dir ); - - } # end temporary directory - - print $main::fh_verbose "Temporary directory: `$Temp::temp_dir'\n"; - print $main::fh_verbose "file_prefix: `$Args::file_prefix'"; - - - #---------- - # EPS directory - #---------- - - $Temp::eps_dir = main::EMPTYSTRING; - if ( $Args::eps_dir ) { # set by `--eps_dir' - my $dir = $Args::eps_dir; - my $make_dir = main::FALSE; - - $dir = &Subs::path2abs( $dir ); - - if ( -e $dir ) { - goto EMPTY unless ( -w $dir ); - - # `$dir' is writable - if ( -d $dir ) { - my $upper_dir = $dir; - - my $found = main::FALSE; - opendir( my $dh, $upper_dir ) or $found = main::TRUE; - my $re = qr< - ^ - $Args::file_prefix - _ - >x; - while ( not $found ) { - my $file_name = readdir ( $dh ); - if ( $file_name =~ /$re/ ) { # file name starts with $prefix_ - $found = main::TRUE; - last; - } - next; - } - - my $n = 0; - while ( $found ) { - $dir = File::Spec -> catdir( $upper_dir, ++$n ); - next if ( -d $dir ); - $found = main::FALSE; - } - $make_dir = main::TRUE; - $Temp::eps_dir = $dir; - } else { # `$dir' is not a dir, so unlink it to create it as dir - if ( unlink $dir ) { # could remove `$dir' - $Temp::eps_dir = $dir; - $make_dir = main::TRUE; - } else { # could not remove - print STDERR "Could not use EPS dir `$dir', use temp dir."; - } # end of unlink - } # end test of -d $dir - } else { - $make_dir = main::TRUE; - } # end of if -e $dir - - - if ( $make_dir ) { # make directory `$dir' - my $made = main::FALSE; - $dir = &Subs::make_dir ( $dir ) and $made = main::TRUE; - - if ( $made ) { - $Temp::eps_dir = $dir; - print $main::fh_verbose "Directory for useful EPS files is `$dir'."; - } else { - print main::fh_verbose "The EPS directory $dir cannot be used: $!"; - } - } else { # `--eps_dir' was not set, so take the temporary directory - $Temp::eps_dir = $Args::temp_dir; - } # end of make dir - } - - EMPTY: unless ( $Temp::eps_dir ) { - # EPS-dir not set or available, use temp dir, - # but leave $Temp::eps_dir empty - print $main::fh_verbose "Directory for useful EPS files is the " . - "temporary directory `$Temp::temp_dir'."; - } - -} # end package `Temp' - - -######################################################################## -# Read: read files or stdin -######################################################################## - -{ # read files or stdin - - package Read; - use strict; - - my $ly_number = 0; # number of lilypond file - - # `$Args::file_prefix_[0-9]' - $Read::file_numbered = main::EMPTYSTRING; - $Read::file_ly = main::EMPTYSTRING; # `$file_numbered.ly' - - my $lilypond_mode = main::FALSE; - - my $arg1; # first argument for `.lilypond' - my $arg2; # argument for `.lilypond include' - - my $path_ly; # path of ly-file - - - my $check_file = sub { # for argument of `.lilypond include' - my $file = shift; # argument is a file name - $file = &Subs::path2abs( $file ); - unless ( $file ) { - die "Line `.lilypond include' without argument"; - return ''; - } - unless ( -f $file && -r $file ) { - die "Argument `$file' in `.lilypond include' is not a readable file"; - } - - return $file; - }; # end sub &$check_file() - - - my $increase_ly_number = sub { - ++$ly_number; - $Read::file_numbered = $Args::file_prefix . '_' . $ly_number; - $Read::file_ly = $Read::file_numbered . '.ly'; - $path_ly = File::Spec -> catdir ( $Temp::temp_dir, $Read::file_ly ); - }; - - - my %eps_subs = - ( - 'ly' => \&Subs::create_ly2eps, # lilypond creates eps files - 'pdf' => \&Subs::create_pdf2eps, # lilypond creates pdf file - ); - - # about lines starting with `.lilypond' - - my $fh_write_ly; - my $fh_include_file; - my %lilypond_args = - ( - - 'start' => sub { - print $main::fh_verbose "\nline: `.lilypond start'"; - die "Line `.lilypond stop' expected." if ( $lilypond_mode ); - - $lilypond_mode = main::TRUE; - &$increase_ly_number; - - print $main::fh_verbose - "ly-file: `" . $path_ly . "'"; - - open $fh_write_ly, ">", $path_ly or - die "Cannot open file `$path_ly': $!"; - next LILYPOND; - }, - - - 'end' => sub { - print $main::fh_verbose "line: `.lilypond end'\n"; - die "Expected line `.lilypond start'." unless ( $lilypond_mode ); - - $lilypond_mode = main::FALSE; - close $fh_write_ly; - - if ( exists $eps_subs{ $Args::eps_func } ) { - $eps_subs{ $Args::eps_func } -> (); - } else { - die "Wrong argument for \%eps_subs: $Args::eps_func"; - } - next LILYPOND; - }, - - - 'include' => sub { # `.lilypond include file...' - - # this may not be used within lilypond mode - next LILYPOND if ( $lilypond_mode ); - - my $file_arg = shift; - - my $file = &$check_file( $file_arg ); - next LILYPOND unless ( $file ); - # file can be read now - - - # `$fh_write_ly' must be opened - &$increase_ly_number; - - open $fh_write_ly, ">", $path_ly or - die "Cannot open file `$path_ly': $!"; - - open $fh_include_file, "<", $file # for reading - or die "File `$file' could not be read: $!"; - foreach (<$fh_include_file>) { - chomp; - print $fh_write_ly $_; - } - close $fh_include_file; - - close $fh_write_ly; - if ( exists $eps_subs{ $Args::eps_func } ) { - $eps_subs{ $Args::eps_func } -> (); - } else { - die "Wrong argument for \$eps_subs: $Args::eps_func"; - } - - next LILYPOND; - }, # end `.lilypond include' - - ); # end definition %lilypond_args - - - LILYPOND: foreach (<>) { - chomp; - my $line = $_; - - - # now the lines with '.lilypond ...' - - if ( / - ^ - [.'] - \s* - lilypond - ( - .* - ) - $ - /x ) { # .lilypond ... - my $args = $1; - $args =~ s/ - ^ - \s* - //x; - $args =~ s/ - \s* - $ - //x; - $args =~ s/ - ^ - ( - \S* - ) - \s* - //x; - my $arg1 = $1; # `start', `end' or `include' - $args =~ s/["'`]//g; - my $arg2 = $args; # file argument for `.lilypond include' - - if ( exists $lilypond_args{ $arg1 } ) { - $lilypond_args{ $arg1 } -> ( $arg2 ); - - } else { - # not a suitable argument of `.lilypond' - print STDERR "Unknown command: `$arg1' `$arg2': `$line'"; - } - - next LILYPOND; - } # end if .lilypond - - - if ( $lilypond_mode ) { # do lilypond-mode - print $fh_write_ly $line or # see `.lilypond start' - die "could not print to \$fh_write_ly in lilypond-mode"; - next LILYPOND; - } # do lilypond-mode - - # unknown line without lilypond - unless ( / - ^ - [.'] - \s* - lilypond - /x ) { # not a `.lilypond' line - print $main::fh_out $line; - next LILYPOND; - } - - } # end foreach <> -} # end package Read - - -######################################################################## -# clean up -######################################################################## - -{ - package Clean; - use strict; - - - if ( $Args::keep_files ) { - # With --keep_files, no temporary files are removed. - print $main::fh_verbose "keep_files: `TRUE'"; - print $main::fh_verbose "No temporary files will be deleted:"; - - opendir my $dh_temp, $Temp::temp_dir or - die "Cannot open $Temp::temp_dir: $!"; - for ( sort readdir $dh_temp ) { - next if ( / # omit files starting with a dot - ^ - \. - /x ); - if ( / - ^ - $Args::file_prefix - _ - /x ) { - my $file = File::Spec -> catfile( $Temp::temp_dir, $_ ); - print $main::fh_verbose "- " . $file ; - next; - } - next; - } # end for sort readdir - closedir $dh_temp; - - } else { # keep_files is not set - # Remove all temporary files except the eps files. - - print $main::fh_verbose "keep_files: `FALSE'"; - print $main::fh_verbose - "All temporary files except *.eps will be deleted"; - - - if ( $Temp::eps_dir ) { - # EPS files are in another dir, remove temp dir - - if ( &Subs::is_subdir( $Temp::eps_dir, $Temp::temp_dir ) ) { - print $main::fh_verbose "EPS dir is subdir of temp dir, so keep both."; - } else { # remove temp dir - print $main::fh_verbose - "Try to remove temporary directory `$Temp::temp_dir':"; - if ( File::Path::remove_tree( $Temp::temp_dir ) ) { # remove succeeds - print $main::fh_verbose "...done."; - } else { # did not remove - print $main::fh_verbose "Failure to remove temporary directory."; - } # end test on remove - } # end is subdir - - } else { # no EPS dir, so keep EPS files - - opendir my $dh_temp, $Temp::temp_dir or - die "Cannot open $Temp::temp_dir: $!"; - for ( sort readdir $dh_temp ) { - next if ( / # omit files starting with a dot - ^ - \. - /x ); - next if ( / # omit EPS-files - \.eps - $ - /x ); - if ( / - ^ - $Args::file_prefix - _ - /x ) { # this includes `PREFIX_temp*' - my $file = File::Spec -> catfile( $Temp::temp_dir, $_ ); - print $main::fh_verbose "Remove " . $file; - unlink $file or print STDERR "Could not remove $file: $!"; - next; - } # end if prefix - next; - } # end for readdir temp dir - closedir $dh_temp; - } # end if-else EPS files - } # end if-else keep files - - - - - if ( $Temp::eps_dir ) { - # EPS files in $Temp::eps_dir are always kept - print $main::fh_verbose "As EPS directrory is set as `$Temp::eps_dir'" . - ", noEPS files there will be deleted:"; - - opendir my $dh_temp, $Temp::eps_dir or - die "Cannot open $Temp::eps_dir: $!"; - for ( sort readdir $dh_temp ) { - next if ( / # omit files starting with a dot - ^ - \. - /x ); - if ( / - ^ - $Args::file_prefix - _ - .* - \.eps - $ - /x ) { - my $file = File::Spec -> catfile( $Temp::eps_dir, $_ ); - print $main::fh_verbose "- " . $file ; - next; - } # end if *.eps - next; - } # end for sort readdir - closedir $dh_temp; - - } - - - - close $main::fh_out unless ( $main::fh_out =~ /STD/ ); - close $main::fh_verbose unless ( $main::fh_verbose =~ /STD/ ); - - - exit; # jump over Subs - -} # end package Clean - - -######################################################################## -# subs for using several times -######################################################################## -{ - package Subs; - use strict; - - sub create_ly2eps { # `--ly2eps' default - my $prefix = $Read::file_numbered; # with dir change to temp dir - - # `$ lilypond --ps -dbackend=eps -dgs-load-fonts \ - # output=file_without_extension file.ly' - # extensions are added automatically - my $opts = '--ps -dbackend=eps -dinclude-eps-fonts -dgs-load-fonts ' . - "--output=$prefix $prefix"; - &Subs::run_lilypond("$opts"); - - Cwd::chdir $Temp::cwd or - die "Could not change to former directory `$Temp::cwd': $!"; - - my $eps_dir = $Temp::eps_dir; - my $dir = $Temp::temp_dir; - opendir( my $dh, $dir ) or - die "could not open temporary directory `$dir': $!"; - - my $re = qr< - ^ - $prefix - - - .* - \.eps - $ - >x; - my $file; - while ( readdir( $dh ) ) { - chomp; - $file = $_; - if ( /$re/ ) { - my $file_path = File::Spec -> catfile( $dir, $file ); - if ( $eps_dir ) { - my $could_copy = main::FALSE; - File::Copy::copy ( $file_path, $eps_dir ) - and $could_copy = main::TRUE; - if ( $could_copy ) { - unlink $file_path; - $file_path = File::Spec -> catfile( $eps_dir, $_ ); - } - } - print $main::fh_out '.PSPIC ' . $file_path; - } - } # end while readdir - closedir( $dh ); - } # end sub create_ly2eps() - - - sub create_pdf2eps { # `--pdf2eps' - my $prefix = $Read::file_numbered; # with dir change to temp dir - - &Subs::run_lilypond("--pdf --output=$prefix $prefix"); - - my $file_pdf = $prefix . '.pdf'; - my $file_ps = $prefix . '.ps'; - - # pdf2ps in temp dir - my $temp_file = &Subs::next_temp_file; - print $main::fh_verbose "\n##### run of `pdf2ps'"; - # `$ pdf2ps file.pdf file.ps' - my $output = `pdf2ps $file_pdf $file_ps 2> $temp_file`; - die 'Program pdf2ps does not work.' if ( $? ); - &Subs::shell_handling ( $output, $temp_file ); - print $main::fh_verbose "##### end run of `pdf2ps'\n"; - - # ps2eps in temp dir - $temp_file = &Subs::next_temp_file; - print $main::fh_verbose "\n##### run of `ps2eps'"; - # `$ ps2eps file.ps' - $output = `ps2eps $file_ps 2> $temp_file`; - die 'Program ps2eps does not work.' if ( $? ); - &shell_handling ( $output, $temp_file ); - print $main::fh_verbose "##### end run of `ps2eps'\n"; - - # change back to former dir - Cwd::chdir $Temp::cwd or - die "Could not change to former directory `$Temp::cwd': $!"; - - # handling of .eps file - my $file_eps = $prefix . '.eps'; - my $eps_path = File::Spec -> catfile( $Temp::temp_dir, $file_eps ); - if ( $Temp::eps_dir ) { - my $has_copied = main::FALSE; - File::Copy::copy( $eps_path, $Temp::eps_dir ) - and $has_copied = main::TRUE; - if ( $has_copied ) { - unlink $eps_path; - $eps_path = File::Spec -> catfile( $Temp::eps_dir, $file_eps ); - } else { - print STDERR "Could not use EPS-directory."; - } # end Temp::eps_dir - } - # print into groff output - print $main::fh_out '.PSPIC ' . $eps_path; - } # end sub create_pdf2eps() - - - sub is_subdir { # arg1 is subdir of arg2 (is longer) - my ( $dir1, $dir2 ) = @_; - $dir1 = &Subs::path2abs( $dir1 );; - $dir2 = &Subs::path2abs( $dir2 );; - my @split1 = File::Spec -> splitdir( $dir1 ); - my @split2 = File::Spec -> splitdir( $dir2 ); - for ( @split2 ) { - next if ( $_ eq shift @split1 ); - return main::FALSE; - } - return main::TRUE; - } - - - sub license { - &version; - print STDOUT $main::License; - } # end sub license() - - - sub make_dir { # make directory or check if it exists - my $dir_arg = shift; - chomp $dir_arg; - $dir_arg =~ s/^\s*(.*)\s*$/$1/; - - unless ( $dir_arg ) { - print $main::fh_verbose "make_dir(): empty argument"; - return $main::FALSE; - } - - unless ( File::Spec->file_name_is_absolute( $dir_arg ) ) { - my $res = Cwd::realpath( $dir_arg ); - $res = File::Spec -> canonpath ( $dir_arg ) unless ( $res ); - $dir_arg = $res if ( $res ); - } - - return $dir_arg if ( -d $dir_arg && -w $dir_arg ); - - - # search thru the dir parts - my @dir_parts = File::Spec -> splitdir( $dir_arg ); - my @dir_grow; - my $dir_grow; - my $can_create = main::FALSE; # dir could be created if TRUE - - DIRPARTS: for ( @dir_parts ) { - push @dir_grow, $_; - next DIRPARTS unless ( $_ ); # empty string for root directory - - # from array to path dir string - $dir_grow = File::Spec -> catdir ( @dir_grow ); - - next DIRPARTS if ( -d $dir_grow ); - - if ( -e $dir_grow ) { # exists, but not a dir, so must be removed - die "Couldn't create dir `$dir_arg', it is blocked by `$dir_grow'." - unless ( -w $dir_grow ); - - # now it's writable, but not a dir, so it can be removed - unlink ( $dir_grow ) or - die "Couldn't remove `$dir_grow', " . - "so I cannot create dir `$dir_arg': $!"; - } - - # $dir_grow does no longer exist, so the former dir must be writable - # in order to create the directory - pop @dir_grow; - $dir_grow = File::Spec -> catdir ( @dir_grow ); - - die "`$dir_grow' is not writable, " . - "so directory `$dir_arg' can't be createdd." - unless ( -w $dir_grow ); - - # former directory is writable, so `$dir_arg' can be created - - File::Path::make_path( $dir_arg, - { - mask => oct( '0700' ), - verbose => $Args::verbose, - } - ) # `mkdir -P' - or die "Could not create directory `$dir_arg': $!"; - - last DIRPARTS; - } - - die "`$dir_arg' is not a writable directory" - unless ( -d $dir_arg && -w $dir_arg ); - - return $dir_arg; - - } # end sub make_dir() - - - sub next_temp_file { - state $n = 0; - ++$n; - my $temp_basename = $Args::file_prefix . '_temp_' . $n; - my $temp_file = File::Spec -> catfile( $Temp::temp_dir, $temp_basename ); - print $main::fh_verbose "next temporary file: `$temp_file'"; - return $temp_file; - } # end sub next_temp_file() - - - sub path2abs { - my $path = shift; - $path =~ s/ - ^ - \s* - ( - .* - ) - \s* - $ - /$1/x; - - die "path2abs(): argument is empty." unless ( $path ); - - # Perl does not support shell `~' for home dir - if ( $path =~ / - ^ - ~ - /x ) { - if ( $path eq '~' ) { # only own home - $path = File::HomeDir -> my_home; - } elsif ( $path =~ m< - ^ - ~ / - ( - .* - ) - $ - >x ) { # subdir of own home - $path = File::Spec -> catdir( $Temp::cwd, $1 ); - } elsif ( $path =~ m< - ^ - ~ - ( - [^/]+ - ) - $ - >x ) { # home of other user - $path = File::HomeDir -> users_home( $1 ); - } elsif ( $path =~ m< - ^ - ~ - ( - [^/]+ - ) - /+ - ( - .* - ) - $ - >x ) { # subdir of other home - $path = File::Spec -> - catdir( File::HomeDir -> users_home( $1 ), $2 ); - } - } - - $path = File::Spec -> rel2abs ( $path ); - - # now $path is absolute - return $path; - } - - - sub run_lilypond { - # arg is the options collection for `lilypond' to run - # either from ly or pdf - my $opts = shift; - chomp $opts; - - my $temp_file = &Subs::next_temp_file; - my $output = main::EMPTYSTRING; - - # change to temp dir - Cwd::chdir $Temp::temp_dir or - die "Could not change to temporary directory `$Temp::temp_dir': $!"; - - print $main::fh_verbose "\n##### run of `lilypond $opts'"; - $output = `lilypond $opts 2>$temp_file`; - die "Program lilypond does not work: $?" if ( $? ); - chomp $output; - &Subs::shell_handling( $output, $temp_file ); - print $main::fh_verbose "##### end run of `lilypond'\n"; - - # stay in temp dir - } # end sub run_lilypond() - - - sub shell_handling { - # Handle ``-shell-command output in a string (arg1). - # stderr goes to temporary file $TempFile. - my $out_string = shift; - my $temp_file = shift; - - chomp $out_string; - - open my $fh_string, "<", \ $out_string or - die "could not read the string `$out_string': $!"; - for ( <$fh_string> ) { - chomp; - print $main::fh_out $_; - } - close $fh_string; - - $temp_file && -f $temp_file && -r $temp_file || - die "shell_handling(): $temp_file is not a readable file."; - open my $fh_temp, "<", $temp_file or - die "shell_handling(): could not read temporary file $temp_file: $!"; - for ( <$fh_temp> ) { - chomp; - print $main::fh_verbose $_; - } - close $fh_temp; - - unlink $temp_file unless ( $Args::keep_files ); - } # end sub shell_handling() - - - sub usage { # for `--help' - my $p = $main::prog; - my $usage = -qq*$p: -Read a `roff' file or standard input and transform `lilypond' parts -(everything between `.lilypond start' and `.lilypond end') into -temporary `EPS'-files that can be read by groff using `.PSPIC'. - -There is also a command `.lilypond include ' that can -include a complete `lilypond' file into the `groff' document. - - -# Breaking options: -$p -h|--help|--usage # usage -$p -v|--version # version information -$p --license # the license is GPL >= 3 - - -# Normal options: -$p [options] [--] [filename ...] - -There are 2 options for influencing the way how the `EPS' files for the -`roff' display are generated: ---ly2eps `lilypond' generates `EPS' files directly (default) ---pdf2eps `lilypond' generates a `PDF' file that is transformed - --k|--keep_files do not delete any temporary files - --V|--Verbose|--verbose print much information to STDERR - -Options with an argument: --e|--eps_dir=... use a directory for the EPS files --o|--output=... sent output in the groff language into file ... --p|--prefix=... start for the names of temporary files --t|--temp_dir=... provide the directory for temporary files. - -The set directories are created when they do not exist. - -In a former version of $p, there was an additional option `--file_+prefix', -this is now replaced by `--prefix'. - -Perl >=5.10.0 needed.*; - print STDOUT $usage; - } # end sub usage() - - - sub version { # for `--version' - my $end; - if ( $main::groff_version ) { - $end = " version $main::groff_version"; - } else { - $end = '.'; - } - - my $output = -qq*`$main::prog' version `$main::VERSION' of `$main::last_update' is part -of `GNU groff'$end*; - - print STDOUT $output; - } # end sub version() - - -} # end package `Subs' - - -######################################################################## -### Emacs settings -# Local Variables: -# mode: CPerl -# End: From MAILER-DAEMON Wed Apr 24 15:09:37 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UV54T-0004zL-3j for mharc-groff-commit@gnu.org; Wed, 24 Apr 2013 15:09:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV54N-0004xf-EW for groff-commit@gnu.org; Wed, 24 Apr 2013 15:09:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV54I-0001Y7-Fs for groff-commit@gnu.org; Wed, 24 Apr 2013 15:09:31 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:42355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV54I-0001XE-CY for groff-commit@gnu.org; Wed, 24 Apr 2013 15:09:26 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UV54H-00077N-SQ for groff-commit@gnu.org; Wed, 24 Apr 2013 19:09:25 +0000 Date: Wed, 24 Apr 2013 19:09:25 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 19:09:36 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/24 19:09:25 Modified files: contrib/glilypond: ChangeLog Makefile.sub Log message: glilypond: remove Perl test. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.7&r2=1.8 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.2&r2=1.3 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- ChangeLog 12 Apr 2013 22:30:44 -0000 1.7 +++ ChangeLog 24 Apr 2013 19:09:25 -0000 1.8 @@ -1,3 +1,7 @@ +2013-04-24 Bernd Warken + + * Makefile.sub: Remove Perl test. + 2013-04-12 Bernd Warken * glilypond.pl: Fix END for early exit of `--version'. Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- Makefile.sub 12 Apr 2013 21:07:39 -0000 1.2 +++ Makefile.sub 24 Apr 2013 19:09:25 -0000 1.3 @@ -7,7 +7,7 @@ # Written by Werner Lemberg and # Bernd Warken . -# Last update: 12 Apr 2013 +# Last update: 24 Apr 2013 # This file is part of `glilypond' which is part of `groff'. @@ -45,9 +45,6 @@ # TODO: Add perl check to configure script. glilypond: $(GLILYPOND) - if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ - : >HAVE_PERL; \ - echo "Perl version works for "$@"'."; \ sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ @@ -55,35 +52,29 @@ -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ $(srcdir)/glilypond.pl >$@; \ - chmod +x $@; \ - else \ - echo "This program "$@" needs a newer version of Perl."; \ - fi - + chmod +x $@ install_data: glilypond - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/glilypond - $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond + -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); \ + $(RM) $(DESTDIR)$(bindir)/glilypond; \ + $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond; \ -test -d $(DESTDIR)$(glilypond_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) + || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir); \ for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done; - if test -f HAVE_PERL; then \ + done; \ for f in $(GLILYPOND_); do \ $(INSTALL_SCRIPT) $(srcdir)/$$f \ $(DESTDIR)$(glilypond_dir)/$$f; \ - done; \ - fi; + done uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/glilypond + $(RM) $(DESTDIR)$(bindir)/glilypond; \ for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done; - test -d $(DESTDIR)$(libdir)/groff/glilypond && \ - rmdir $(DESTDIR)$(libdir)/groff/glilypond + done; \ + test -d $(DESTDIR)$(libdir)/groff/glilypond \ + && rmdir $(DESTDIR)$(libdir)/groff/glilypond ######################################################################## # Emacs settings From MAILER-DAEMON Wed Apr 24 17:23:46 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UV7AI-0003w4-9E for mharc-groff-commit@gnu.org; Wed, 24 Apr 2013 17:23:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV7AF-0003uw-BE for groff-commit@gnu.org; Wed, 24 Apr 2013 17:23:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV7AD-0008Su-5V for groff-commit@gnu.org; Wed, 24 Apr 2013 17:23:43 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:57507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV7AD-0008Sm-1C for groff-commit@gnu.org; Wed, 24 Apr 2013 17:23:41 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UV7AB-0006bZ-V0 for groff-commit@gnu.org; Wed, 24 Apr 2013 21:23:40 +0000 Date: Wed, 24 Apr 2013 21:23:39 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog Makefile.sub ... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 21:23:45 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/24 21:23:39 Modified files: contrib/glilypond: ChangeLog Makefile.sub README.txt args.pl glilypond.pl oop_fh.pl subs.pl Removed files: contrib/glilypond: perl_test.pl Log message: args.pl, oop_fh.pl: Remove 1st line calling `perl'. subs.pl: Remove 1st line calling `perl'. Remove sub &perl_version'. Adjust sub `&usage'. glilypond.pl: Keep 1st line, which will be reset by running `make'. Remove all parts of Perl testing. perl_test.pl: Remove this file. README.txt: Add information about needed Perl version. Makefile.sub: Corrections for removing Perl test. Use `$<'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.8&r2=1.9 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.3&r2=1.4 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/README.txt?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/args.pl?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.3&r2=1.4 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/oop_fh.pl?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/subs.pl?cvsroot=groff&r1=1.3&r2=1.4 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/perl_test.pl?cvsroot=groff&r1=1.2&r2=0 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- ChangeLog 24 Apr 2013 19:09:25 -0000 1.8 +++ ChangeLog 24 Apr 2013 21:23:38 -0000 1.9 @@ -1,5 +1,21 @@ 2013-04-24 Bernd Warken + * args.pl, oop_fh.pl: Remove 1st line calling `perl'. + + * subs.pl: Remove 1st line calling `perl'. Remove sub + `&perl_version'. Adjust sub `&usage'. + + * glilypond.pl: Keep 1st line, which will be reset by running + `make'. Remove all parts of Perl testing. + + * perl_test.pl: Remove this file. + + * README.txt: Add information about needed Perl version. + + * Makefile.sub: Corrections for removing Perl test. Use `$<'. + +2013-04-24 Bernd Warken + * Makefile.sub: Remove Perl test. 2013-04-12 Bernd Warken Index: Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- Makefile.sub 24 Apr 2013 19:09:25 -0000 1.3 +++ Makefile.sub 24 Apr 2013 21:23:38 -0000 1.4 @@ -28,7 +28,7 @@ MAN1=glilypond.n -MOSTLYCLEANADD=glilypond HAVE_PERL $(MAN1) +MOSTLYCLEANADD=glilypond $(MAN1) # not all make programs have $(RM) predefined. RM=rm -f @@ -38,8 +38,7 @@ GLILYPOND=$(srcdir)/glilypond.pl \ $(srcdir)/subs.pl \ $(srcdir)/oop_fh.pl \ - $(srcdir)/args.pl \ - $(srcdir)/perl_test.pl + $(srcdir)/args.pl GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'` @@ -51,28 +50,28 @@ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ - $(srcdir)/glilypond.pl >$@; \ + $(srcdir)/glilypond.pl >$@ chmod +x $@ install_data: glilypond - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(bindir)/glilypond; \ - $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond; \ + -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) + $(RM) $(DESTDIR)$(bindir)/$< + $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/$< -test -d $(DESTDIR)$(glilypond_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir); \ + || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done; \ + done for f in $(GLILYPOND_); do \ $(INSTALL_SCRIPT) $(srcdir)/$$f \ $(DESTDIR)$(glilypond_dir)/$$f; \ done uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/glilypond; \ + $(RM) $(DESTDIR)$(bindir)/glilypond; for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done; \ + done test -d $(DESTDIR)$(libdir)/groff/glilypond \ && rmdir $(DESTDIR)$(libdir)/groff/glilypond Index: README.txt =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- README.txt 29 Mar 2013 11:41:21 -0000 1.1 +++ README.txt 24 Apr 2013 21:23:38 -0000 1.2 @@ -3,7 +3,7 @@ Written by Bernd Warken - Last update: 28 Mar 2013 + Last update: 24 Apr 2013 Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -11,6 +11,13 @@ This file is part of `glilypond', which is part of `groff'. + +######################################################################## + +In order to run `glilypond', your system must have installed Perl of at +least version `v5.6'. + + ######################################################################## In order to have this program installed by `make', the creation of a Index: args.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/args.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- args.pl 29 Mar 2013 11:41:21 -0000 1.1 +++ args.pl 24 Apr 2013 21:23:38 -0000 1.2 @@ -1,4 +1,3 @@ -#! /usr/bin/env perl my $License = q* ######################################################################## # Legalese Index: glilypond.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- glilypond.pl 12 Apr 2013 22:30:44 -0000 1.3 +++ glilypond.pl 24 Apr 2013 21:23:39 -0000 1.4 @@ -88,8 +88,6 @@ { 'before_make' => FALSE, 'groff_version' => EMPTYSTRING, - 'perl_test_file' => EMPTYSTRING, - 'perl_version' => EMPTYSTRING, 'prog' => EMPTYSTRING, }; @@ -135,14 +133,6 @@ unshift(@INC, $glilypond_libdir); - # test perl on suitable version - $file_test_pl = File::Spec->catfile($glilypond_libdir, - 'perl_test.pl'); - die "$file_test_pl does not exist;" unless -f "$file_test_pl"; - do "$file_test_pl" or die "Perl test: $@"; - - $Globals->{'perl_test_file'} = $file_test_pl; - umask 0077; # octal output: `printf "%03o", umask;' } Index: oop_fh.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/oop_fh.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- oop_fh.pl 29 Mar 2013 11:41:21 -0000 1.1 +++ oop_fh.pl 24 Apr 2013 21:23:39 -0000 1.2 @@ -1,4 +1,3 @@ -#! /usr/bin/env perl my $License = q* ######################################################################## # Legalese Index: subs.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/subs.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- subs.pl 16 Apr 2013 19:00:46 -0000 1.3 +++ subs.pl 24 Apr 2013 21:23:39 -0000 1.4 @@ -1,4 +1,3 @@ -#! /usr/bin/env perl my $License = q* ######################################################################## # Legalese @@ -12,7 +11,7 @@ Copyright (C) 2013 Free Software Foundation, Inc. Written by Bernd Warken -Last update: 12 Apr 2013 + Last update: 24 Apr 2013 This file is part of `glilypond', which is part of `GNU groff'. @@ -325,36 +324,6 @@ } # end sub path2abs() -sub perl_version { - our ( $Globals, $Args ); - - my $pv = $Globals->{'perl_version'}; - return $pv if ( $pv ); - - my $fh = new FH_READ_FILE( $Globals->{'perl_test_file'} ); - $fh->open(); - - while ( defined( $_ = $fh->read_line() ) ) { - next unless ( / - ^ - \s* - require - \s+ - ( - [v0-9.]+ - ) - /x ); - $pv = $1; # Perl version - $fh->close(); - $Globals->{'perl_version'} = $pv; - return $pv; - } - - $fh->close(); - return 'unknown version for Perl'; -} # end sub perl_version() - - sub run_lilypond { # arg is the options collection for `lilypond' to run # either from ly or pdf @@ -467,9 +436,6 @@ # --keep_files -k: do not delete any temporary files # --file_prefix=... -p: start for the names of temporary files - my $pv = &perl_version(); - $usage .= "\n" . 'Perl version ' . $pv . ' needed.' if ( $pv ); - $main::stdout->print( $usage ); } # end sub usage() Index: perl_test.pl =================================================================== RCS file: perl_test.pl diff -N perl_test.pl --- perl_test.pl 12 Apr 2013 21:45:56 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -#! /usr/bin/env perl - -# glilypond - transform `lilypond' parts into `groff' language - -# Source file position: /contrib/groffer/perl/perl_test.sh -# Installed position: /lib/groff/groffer/perl_test.sh - -# Copyright (C) 2013 -# Free Software Foundation, Inc. -# Written by Bernd Warken . - -# Last update: 12 Apr 2013 - -# This file is part of `glilypond', which is part of `groff'. - -# `groff' is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# `groff' is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -######################################################################## - -# This file tests whether perl has a suitable version. It is used by -# glilypond.pl and Makefile.sub. - -# former: require v5.9.4; # for `state' in `subs.pl' -require v5.6; # analogously to `groffer' - -######################################################################## -### Emacs settings -# Local Variables: -# mode: CPerl -# End: From MAILER-DAEMON Wed Apr 24 20:21:26 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UV9wE-0004Lx-4h for mharc-groff-commit@gnu.org; Wed, 24 Apr 2013 20:21:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV9w8-0004LP-OB for groff-commit@gnu.org; Wed, 24 Apr 2013 20:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV9w3-0000vR-K1 for groff-commit@gnu.org; Wed, 24 Apr 2013 20:21:20 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:58999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV9w3-0000vM-Fg for groff-commit@gnu.org; Wed, 24 Apr 2013 20:21:15 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UV9w2-00083O-QU for groff-commit@gnu.org; Thu, 25 Apr 2013 00:21:14 +0000 Date: Thu, 25 Apr 2013 00:21:14 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/contrib/glilypond ChangeLog args.pl glily... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 00:21:25 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/25 00:21:14 Modified files: contrib/glilypond: ChangeLog args.pl glilypond.man glilypond.pl oop_fh.pl subs.pl Log message: Public `glilypond' version `v1.1'. args.pl, sub.pl, glilypond.man: Change option `-v' to mean `--verbose' instead of former `--version' such as many GNU programs do. Correct sub `&usage()' and man-page. args.pl, glilypond.pl, oop_fh.pl, subs.pl: Remove spaces in ` -> ', some `( ... )', and some `{ ... }' places for better readability of the Perl source code. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.9&r2=1.10 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/args.pl?cvsroot=groff&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.man?cvsroot=groff&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/oop_fh.pl?cvsroot=groff&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/subs.pl?cvsroot=groff&r1=1.4&r2=1.5 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- ChangeLog 24 Apr 2013 21:23:38 -0000 1.9 +++ ChangeLog 25 Apr 2013 00:21:14 -0000 1.10 @@ -1,9 +1,21 @@ 2013-04-24 Bernd Warken + Public `glilypond' version `v1.1'. + + * args.pl, sub.pl, glilypond.man: Change option `-v' to mean + `--verbose' instead of former `--version' such as many GNU + programs do. Correct sub `&usage()' and man-page. + + * args.pl, glilypond.pl, oop_fh.pl, subs.pl: Remove spaces in + ` -> ', some `( ... )', and some `{ ... }' places for better + readability of the Perl source code. + +2013-04-24 Bernd Warken + * args.pl, oop_fh.pl: Remove 1st line calling `perl'. * subs.pl: Remove 1st line calling `perl'. Remove sub - `&perl_version'. Adjust sub `&usage'. + `&perl_version()'. Adjust sub `&usage()'. * glilypond.pl: Keep 1st line, which will be reset by running `make'. Remove all parts of Perl testing. Index: args.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/args.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- args.pl 24 Apr 2013 21:23:38 -0000 1.2 +++ args.pl 25 Apr 2013 00:21:14 -0000 1.3 @@ -1,8 +1,8 @@ -my $License = q* ######################################################################## # Legalese ######################################################################## +my $License = q* groff_lilypond - integrate `lilypond' into `groff' files Source file position: `/contrib/lilypond/groff_lilypond.pl' @@ -11,7 +11,7 @@ Copyright (C) 2013 Free Software Foundation, Inc. Written by Bernd Warken -Last update: 26 Mar 2013 +Last update: 25 Apr 2013 This file is part of `GNU groff'. @@ -51,19 +51,19 @@ ( '--eps_dir' => sub { - $Args -> { 'eps_dir' } = shift; + $Args->{'eps_dir'} = shift; }, '--output' => sub { - $Args -> { 'output' } = shift; + $Args->{'output'} = shift; }, '--prefix' => sub { - $Args -> { 'prefix' } = shift; + $Args->{'prefix'} = shift; }, '--temp_dir' => sub { - $Args -> { 'temp_dir' } = shift; + $Args->{'temp_dir'} = shift; }, ); # end of %opts_with_arg @@ -78,7 +78,7 @@ }, '--keep_all' => sub { - $Args -> { 'keep_all' } = TRUE; + $Args->{'keep_all'} = TRUE; }, '--license' => sub { @@ -87,15 +87,15 @@ }, '--ly2eps' => sub { - $Args -> { 'eps_func' } = 'ly'; + $Args->{'eps_func'} = 'ly'; }, '--pdf2eps' => sub { - $Args -> { 'eps_func' } = 'pdf'; + $Args->{'eps_func'} = 'pdf'; }, '--verbose' => sub { - $Args -> { 'verbose' } = TRUE; + $Args->{'verbose'} = TRUE; }, '--version' => sub { @@ -123,8 +123,9 @@ my $has_arg = FALSE; -# split short option collections and transfer these to suitable -# long options from above +# Split short option collections and transfer these to suitable long +# options from above. Note that `-v' now means `--verbose' in version +# `v1.1', earlier versions had `--version' for `-v'. my %short_opts = ( @@ -136,7 +137,7 @@ 'o' => '--output', 'p' => '--prefix', 't' => '--temp_dir', - 'v' => '--version', + 'v' => '--verbose', 'V' => '--verbose', ); @@ -183,23 +184,23 @@ CHARS: while ( @chars ) { my $c = shift @chars; - unless ( exists $short_opts{ $c } ) { - $stderr -> print( "Unknown short option `-$c'." ); + unless ( exists $short_opts{$c} ) { + $stderr->print( "Unknown short option `-$c'." ); next CHARS; } # short option exists # map or transfer to special long option from above - my $transopt = $short_opts{ $c }; + my $transopt = $short_opts{$c}; - if ( exists $opts_noarg{ $transopt } ) { + if ( exists $opts_noarg{$transopt} ) { push @splitted_args, $transopt; - $Args -> { 'verbose' } = TRUE if ( $transopt eq '--verbose' ); + $Args->{'verbose'} = TRUE if ( $transopt eq '--verbose' ); next CHARS; } - if ( exists $opts_with_arg{ $transopt } ) { + if ( exists $opts_with_arg{$transopt} ) { push @splitted_args, $transopt; if ( @chars ) { @@ -240,25 +241,25 @@ # no match, so luck for fewer number of chars next N unless ( $argn ); - next N unless ( exists $long_opts[ $n ] -> { $argn } ); + next N unless ( exists $long_opts[$n]->{$argn} ); # not in $n hash, so go on to next loop for $n # now $n-hash has arg # map or transfer to special long opt from above - my $transopt = $long_opts[ $n ] -> { $argn }; + my $transopt = $long_opts[$n]->{$argn}; # test on option without arg - if ( exists $opts_noarg{ $transopt } ) { # opt has no arg + if ( exists $opts_noarg{$transopt} ) { # opt has no arg $stderr->print( 'Option ' . $transopt . 'has no argument: ' . - $from_arg . '.') if ( defined($optarg) ); + $from_arg . '.' ) if ( defined($optarg) ); push @splitted_args, $transopt; - $Args -> { 'verbose' } = TRUE if ( $transopt eq '--verbose' ); + $Args->{'verbose'} = TRUE if ( $transopt eq '--verbose' ); return TRUE; # use `next SPLIT' afterwards } # end of if %opts_noarg # test on option with arg - if ( exists $opts_with_arg{ $transopt } ) { # opt has arg + if ( exists $opts_with_arg{$transopt} ) { # opt has arg push @splitted_args, $transopt; # test on optarg in arg @@ -273,7 +274,7 @@ } # end of if %opts_with_arg # not with and without option, so is not permitted - $stderr -> print( "`" . $transopt . + $stderr->print( "`" . $transopt . "' is unknown long option from `" . $from_arg . "'" ); return TRUE; # use `next SPLIT' afterwards } # end of for N @@ -323,12 +324,12 @@ ) $ /x ) { - $split_short -> ( $1 ); + $split_short->($1); next SPLIT; } # end of short option if ( /^--/ ) { # starts with 2 dashes, a long option - $split_long -> ( $_ ); + $split_long->($_); next SPLIT; } # end of long option @@ -338,7 +339,7 @@ } # end of foreach SPLIT # all args are considered - $stderr -> print( "Option `$has_arg' needs an argument." ) + $stderr->print( "Option `$has_arg' needs an argument." ) if ( $has_arg ); @@ -352,45 +353,48 @@ # open or ignore verbose output #---------- sub install_verbose { - if ( $Args -> { 'verbose' } ) { # `--verbose' was used + if ( $Args->{'verbose'} ) { # `--verbose' was used # make verbose output into $v - my $s = $v -> get(); # get content of string so far as array ref, close + my $s = $v->get(); # get content of string so far as array ref, close $v = new FH_STDERR(); # make verbose output into STDERR if ( $s ) { for ( @$s ) { # print the file content into new verbose output - $v -> print( $_ ); + $v->print($_); } } # verbose output is now active (into STDERR) + $v->print( "Option `-v' means `--verbose'." ); + $v->print( "Version information is printed by option `--version'." ); + $v->print( "#" x 72 ); } else { # `--verbose' was not used # do not be verbose, make verbose invisible - $v -> close(); # close and ignore the string content + $v->close(); # close and ignore the string content $v = new FH_NULL(); # this is either into /dev/null or in an ignored string } # end if-else about verbose - # `$v -> print' works now in any case + # `$v->print' works now in any case - $v -> print( "Verbose output was chosen." ); + $v->print( "Verbose output was chosen." ); - my $s = $Globals -> { 'prog_is_installed' } ? '' : ' not'; - $v -> print( $Globals -> { 'prog' } . " is" . $s . + my $s = $Globals->{'prog_is_installed'} ? '' : ' not'; + $v->print( $Globals->{'prog'} . " is" . $s . " installed." ); - $v -> print( 'The command line options are:' ); + $v->print( 'The command line options are:' ); $s = " options:"; $s .= " `" . $_ . "'" for ( @ARGV ); - $v -> print( $s ); + $v->print( $s ); $s = " file names:"; $s .= " `" . $_ . "'\n" for ( @files ); - $v -> print( $s ); + $v->print( $s ); } # end install_verbose() @@ -410,29 +414,29 @@ last ARGS if ( $arg eq '--' ); if ( $has_arg ) { - unless ( exists $opts_with_arg{ $has_arg } ) { - $stderr -> print( "`\%opts_with_args' does not have key `" . + unless ( exists $opts_with_arg{$has_arg} ) { + $stderr->print( "`\%opts_with_args' does not have key `" . $has_arg . "'." ); next ARGS; } - $opts_with_arg{ $has_arg } -> ( $arg ); + $opts_with_arg{$has_arg}->($arg); $has_arg = FALSE; next ARGS; } # end of $has_arg - if ( exists $opts_with_arg{ $arg } ) { + if ( exists $opts_with_arg{$arg} ) { $has_arg = $arg; next ARGS; } - if ( exists $opts_noarg{ $arg } ) { - $opts_noarg { $arg } -> (); + if ( exists $opts_noarg{$arg} ) { + $opts_noarg{$arg}->(); next ARGS; } # not a suitable option - $stderr -> print( "Wrong option `" . $arg . "'." ); + $stderr->print( "Wrong option `" . $arg . "'." ); next ARGS; } # end of for ARGS: @@ -448,26 +452,26 @@ sub handle_args { # handling the output of args - if ( $Args -> { 'output' } ) { # `--output' was set in the arguments - my $out_path = &path2abs( $Args -> { 'output' } ); - die "Output file name `$Args -> { 'output' } cannot be used." + if ( $Args->{'output'} ) { # `--output' was set in the arguments + my $out_path = &path2abs($Args->{'output'}); + die "Output file name $Args->{'output'} cannot be used." unless ( $out_path ); my ( $file, $dir ); - ( $file, $dir ) = File::Basename::fileparse( $out_path ) + ( $file, $dir ) = File::Basename::fileparse($out_path) or die "Could not handle output file path `" . $out_path . "': " . "directory name `" . $dir . "' and file name `" . $file . "'."; - die "Could not find output directory for `" . $Args -> { 'output' } . "'" + die "Could not find output directory for `" . $Args->{'output'} . "'" unless ( $dir ); - die "Could not find output file: `" . $Args -> { 'output' } . + die "Could not find output file: `" . $Args->{'output'} . "'" unless ( $file ); if ( -d $dir ) { die "Could not write to output directory `" . $dir . "'." unless ( -w $dir ); } else { - $dir = &make_dir( $dir ); + $dir = &make_dir($dir); die "Could not create output directory in: `" . $out_path . "'." unless ( $dir ); } @@ -480,13 +484,13 @@ } $out = new FH_FILE( $out_path ); - $v -> print( "Output goes to file `" . $out_path . "'." ); + $v->print( "Output goes to file `" . $out_path . "'." ); } else { # `--output' was not set $out = new FH_STDOUT(); } # no $out is the right behavior for standard output -# $Args -> { 'prefix' } .= '_' . $Args -> { 'eps_func' } . '2eps'; +# $Args->{'prefix'} .= '_' . $Args->{'eps_func'} . '2eps'; @ARGV = @files; } Index: glilypond.man =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.man,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- glilypond.man 29 Mar 2013 11:41:21 -0000 1.1 +++ glilypond.man 25 Apr 2013 00:21:14 -0000 1.2 @@ -13,7 +13,7 @@ .MT groff\-bernd.warken\-72@web.de .ME . . -Last update: 24 Mar 2013 +Last update: 25 Apr 2013 .. . . @@ -93,7 +93,7 @@ .\" like .OP, but with 1st arg split and and optional final character .\" Example: `.OP+ -p | --prefix ly .' gets `[-t|--prefix ly].' .\" Example: `.OP+ -h | --help | --usage' gets `[-h|--help|--usage]' -.\" Example: `.OP+ -v | --version "" ,' gets `[-v|--version],' +.\" Example: `.OP+ -v | --verbose "" ,' gets `[-v|--verbose],' .\" .de1 OP+ . if ( \\n[.$] == 0 ) \{\ @@ -167,7 +167,7 @@ .OP+ -? | -h | --help | --usage .YS .SY -.OP+ -v | --version +.OP+ --version .YS .SY .OP+ -l | --license @@ -275,7 +275,7 @@ . . .TP -.OP+ -V | --verbose +.OP+ -v | -V | --verbose A lot more of information is sent to STDERR. . . @@ -325,7 +325,7 @@ and .FONT CB \-V without option argument, followed by the short option -.FONT \-e +.FONT CB \-e with option argument that is the following part of the argument .FONT CB some_dir R . . @@ -390,13 +390,13 @@ . .P On the other hand, the option -.FONT \-\-version +.FONT CB \-\-version cannot be abbreviated further than -.FONT \-\-vers +.FONT CB \-\-vers because there is also the .FONT CI "long option " CB \-\-verbose that can be abbreviated up to -.FONT \-\-verb R . +.FONT CB \-\-verb R . . . .P @@ -419,7 +419,7 @@ . .P For example, the -.FONT CI long option +.FONT CI "long option" .FONT CB \-\-keep_all can as well be written as .FONT CB \-\-Keep_All Index: glilypond.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- glilypond.pl 24 Apr 2013 21:23:39 -0000 1.4 +++ glilypond.pl 25 Apr 2013 00:21:14 -0000 1.5 @@ -14,8 +14,8 @@ our $Legalese; { - use constant VERSION => 'v1.0'; # version of glilypond - use constant LASTUPDATE => '12 Apr 2013'; # date of last update + use constant VERSION => 'v1.1'; # version of glilypond + use constant LASTUPDATE => '25 Apr 2013'; # date of last update ### This constant `LICENSE' is the license for this file `GPL' >= 3 use constant LICENSE => q* @@ -227,16 +227,16 @@ { # `Temp' - if ( $Args -> { 'temp_dir' } ) { + if ( $Args->{'temp_dir'} ) { #---------- # temporary directory was set by `--temp_dir' #---------- - my $dir = $Args -> { 'temp_dir' }; + my $dir = $Args->{'temp_dir'}; - $dir = &path2abs( $dir ); - $dir = &make_dir ( $dir ) or + $dir = &path2abs($dir); + $dir = &make_dir($dir) or die "The directory `$dir' cannot be used temporarily: $!"; @@ -246,14 +246,14 @@ die "Could not open temporary directory `$dir': $!"; my $file_name; my $found = FALSE; - my $prefix = $Args -> { 'prefix' }; + my $prefix = $Args->{'prefix'}; my $re = qr< ^ $prefix _ >x; - READDIR: while ( defined( $file_name = readdir ( $dh ) ) ) { + READDIR: while ( defined($file_name = readdir($dh)) ) { chomp $file_name; if ( $file_name =~ /$re/ ) { # file name starts with $prefix_ $found = TRUE; @@ -262,22 +262,22 @@ next; } - $Temp -> { 'temp_dir' } = $dir; + $Temp->{'temp_dir'} = $dir; my $n = 0; while ( $found ) { - $dir = File::Spec -> catdir( $Temp -> { 'temp_dir' }, ++$n ); + $dir = File::Spec->catdir( $Temp->{'temp_dir'}, ++$n ); next if ( -e $dir ); - $dir = &make_dir ( $dir ) or next; + $dir = &make_dir($dir) or next; $found = FALSE; last; } - $Temp -> { 'temp_dir' } = $dir; + $Temp->{'temp_dir'} = $dir; - } else { # $Args -> { 'temp_dir' } not given by `--temp_dir' + } else { # $Args->{'temp_dir'} not given by `--temp_dir' #---------- # temporary directory was not set @@ -287,21 +287,21 @@ my @tempdirs = EMPTYARRAY; { - my $tmpdir = File::Spec -> tmpdir(); + my $tmpdir = File::Spec->tmpdir(); push @tempdirs, $tmpdir if ( $tmpdir && -d $tmpdir && -w $tmpdir ); - my $root_dir = File::Spec -> rootdir(); # `/' in Unix - my $root_tmp = File::Spec -> catdir( $root_dir, 'tmp' ); + my $root_dir = File::Spec->rootdir(); # `/' in Unix + my $root_tmp = File::Spec->catdir($root_dir, 'tmp'); push @tempdirs, $root_tmp if ( $root_tmp ne $tmpdir && -d $root_tmp && -w $root_tmp ); # home directory of the actual user - my $home = File::HomeDir -> my_home; - my $home_tmp = File::Spec -> catdir ( $home, 'tmp' ); + my $home = File::HomeDir->my_home; + my $home_tmp = File::Spec->catdir($home, 'tmp'); push @tempdirs, $home_tmp if ( -d $home_tmp && -w $home_tmp ); # `/var/tmp' in Unix - my $var_tmp = File::Spec -> catdir( '', 'var', 'tmp' ); + my $var_tmp = File::Spec->catdir('', 'var', 'tmp'); push @tempdirs, $var_tmp if ( -d $var_tmp && -w $var_tmp ); } @@ -310,7 +310,7 @@ { # `$<' is UID of actual user, # `getpwuid' gets user name in scalar context - my $user = getpwuid( $< ); + my $user = getpwuid($<); push @path_extension, $user if ( $user ); push @path_extension, qw( lilypond ); @@ -320,19 +320,19 @@ TEMPS: foreach ( @tempdirs ) { my $dir; # final directory name in `while' loop - $dir = &path2abs ( $_ ); + $dir = &path2abs($_); next TEMPS unless ( $dir ); # beginning of directory name my @dir_begin = - ( File::Spec -> splitdir( $dir ), @path_extension ); + ( File::Spec->splitdir($dir), @path_extension ); my $n = 0; my $dir_blocked = TRUE; BLOCK: while ( $dir_blocked ) { # should become the final dir name - $dir = File::Spec -> catdir ( @dir_begin, ++$n ); + $dir = File::Spec->catdir(@dir_begin, ++$n); next BLOCK if ( -d $dir ); # dir name is now free, create it, and end the blocking @@ -346,19 +346,19 @@ next TEMPS unless ( -d $dir && -w $dir ); # $dir is now a writable directory - $Temp -> { 'temp_dir' } = $dir; # tmp/groff/USER/lilypond/TIME + $Temp->{'temp_dir'} = $dir; # tmp/groff/USER/lilypond/TIME last TEMPS; } # end foreach tmp directories } # end to create a temporary directory die "Could not find a temporary directory" unless - ( $Temp -> { 'temp_dir' } && -d $Temp -> { 'temp_dir' } && - -w $Temp -> { 'temp_dir' } ); + ( $Temp->{'temp_dir'} && -d $Temp->{'temp_dir'} && + -w $Temp->{'temp_dir'} ); } # end temporary directory - $v -> print( "Temporary directory: `" . $Temp -> { 'temp_dir' } . "'\n" ); - $v -> print( "file_prefix: `" . $Args -> { 'prefix' } . "'" ); + $v->print( "Temporary directory: `" . $Temp->{'temp_dir'} . "'\n" ); + $v->print( "file_prefix: `" . $Args->{'prefix'} . "'" ); #---------- @@ -366,10 +366,10 @@ #---------- my $make_dir = FALSE; - if ( $Args -> { 'eps_dir' } ) { # set by `--eps_dir' - my $dir = $Args -> { 'eps_dir' }; + if ( $Args->{'eps_dir'} ) { # set by `--eps_dir' + my $dir = $Args->{'eps_dir'}; - $dir = &path2abs( $dir ); + $dir = &path2abs($dir); if ( -e $dir ) { goto EMPTY unless ( -w $dir ); @@ -380,14 +380,14 @@ my $found = FALSE; opendir( my $dh, $upper_dir ) or $found = TRUE; - my $prefix = $Args -> { 'prefix' }; + my $prefix = $Args->{'prefix'}; my $re = qr< ^ $prefix _ >x; while ( not $found ) { - my $file_name = readdir ( $dh ); + my $file_name = readdir($dh); if ( $file_name =~ /$re/ ) { # file name starts with $prefix_ $found = TRUE; last; @@ -397,18 +397,18 @@ my $n = 0; while ( $found ) { - $dir = File::Spec -> catdir( $upper_dir, ++$n ); + $dir = File::Spec->catdir($upper_dir, ++$n); next if ( -d $dir ); $found = FALSE; } $make_dir = TRUE; - $Temp -> { 'eps_dir' } = $dir; + $Temp->{'eps_dir'} = $dir; } else { # `$dir' is not a dir, so unlink it to create it as dir if ( unlink $dir ) { # could remove `$dir' - $Temp -> { 'eps_dir' } = $dir; + $Temp->{'eps_dir'} = $dir; $make_dir = TRUE; } else { # could not remove - stderr -> print( "Could not use EPS dir `" . $dir . + stderr->print( "Could not use EPS dir `" . $dir . "', use temp dir." ); } # end of unlink } # end test of -d $dir @@ -419,24 +419,24 @@ if ( $make_dir ) { # make directory `$dir' my $made = FALSE; - $dir = &make_dir ( $dir ) and $made = TRUE; + $dir = &make_dir($dir) and $made = TRUE; if ( $made ) { - $Temp -> { 'eps_dir' } = $dir; - $v -> print( "Directory for useful EPS files is `" . $dir . "'." ); + $Temp->{'eps_dir'} = $dir; + $v->print( "Directory for useful EPS files is `" . $dir . "'." ); } else { - $v -> print( "The EPS directory `" . $dir . "' cannot be used: $!" ); + $v->print( "The EPS directory `" . $dir . "' cannot be used: $!" ); } } else { # `--eps_dir' was not set, so take the temporary directory - $Temp -> { 'eps_dir' } = $Args -> { 'temp_dir' }; + $Temp->{'eps_dir'} = $Args->{'temp_dir'}; } # end of make dir } - EMPTY: unless ( $Temp -> { 'eps_dir' } ) { + EMPTY: unless ( $Temp->{'eps_dir'} ) { # EPS-dir not set or available, use temp dir, - # but leave $Temp -> { '}eps_dir' } empty - $v -> print( "Directory for useful EPS files is the " . - "temporary directory `" . $Temp -> { 'temp_dir' } . "'." ); + # but leave $Temp->{'}eps_dir'} empty + $v->print( "Directory for useful EPS files is the " . + "temporary directory `" . $Temp->{'temp_dir'} . "'." ); } } # end `Temp' @@ -456,7 +456,7 @@ my $ly_number = 0; # number of lilypond file - # `$Args -> { 'prefix' }_[0-9]' + # `$Args->{'prefix'}_[0-9]' my $lilypond_mode = FALSE; @@ -468,7 +468,7 @@ my $check_file = sub { # for argument of `.lilypond include' my $file = shift; # argument is a file name - $file = &path2abs( $file ); + $file = &path2abs($file); unless ( $file ) { die "Line `.lilypond include' without argument"; return ''; @@ -483,10 +483,9 @@ my $increase_ly_number = sub { ++$ly_number; - $Read -> { 'file_numbered' } = $Args -> { 'prefix' } . '_' . $ly_number; - $Read -> { 'file_ly' } = $Read -> { 'file_numbered' } . '.ly'; - $path_ly = File::Spec -> catdir ( $Temp -> { 'temp_dir' }, - $Read -> { 'file_ly' } ); + $Read->{'file_numbered'} = $Args->{'prefix'} . '_' . $ly_number; + $Read->{'file_ly'} = $Read->{'file_numbered'} . '.ly'; + $path_ly = File::Spec->catdir($Temp->{'temp_dir'}, $Read->{'file_ly'} ); }; @@ -504,29 +503,29 @@ ( 'start' => sub { - $v -> print( "\nline: `.lilypond start'" ); + $v->print( "\nline: `.lilypond start'" ); die "Line `.lilypond stop' expected." if ( $lilypond_mode ); $lilypond_mode = TRUE; &$increase_ly_number; - $v -> print( "ly-file: `" . $path_ly . "'" ); + $v->print( "ly-file: `" . $path_ly . "'" ); - $ly = new FH_FILE( $path_ly ); + $ly = new FH_FILE($path_ly); }, 'end' => sub { - $v -> print( "line: `.lilypond end'\n" ); + $v->print( "line: `.lilypond end'\n" ); die "Expected line `.lilypond start'." unless ( $lilypond_mode ); $lilypond_mode = FALSE; - $ly -> close(); + $ly->close(); - if ( exists $eps_subs{ $Args -> { 'eps_func' } } ) { - $eps_subs{ $Args -> { 'eps_func' } } -> (); + if ( exists $eps_subs{ $Args->{'eps_func'} } ) { + $eps_subs{ $Args->{'eps_func'} }->(); } else { - die "Wrong argument for \%eps_subs: " . $Args -> { 'eps_func' } . "'"; + die "Wrong argument for \%eps_subs: " . $Args->{'eps_func'} . "'"; } }, @@ -538,7 +537,7 @@ my $file_arg = shift; - my $file = &$check_file( $file_arg ); + my $file = &$check_file($file_arg); next LILYPOND unless ( $file ); # file can be read now @@ -546,21 +545,20 @@ # `$fh_write_ly' must be opened &$increase_ly_number; - $ly = new FH_FILE( $path_ly ); + $ly = new FH_FILE($path_ly); - my $include = new FH_READ_FILE( $file ); - my $res = $include -> read-all(); # is a refernce to an array + my $include = new FH_READ_FILE($file); + my $res = $include->read-all(); # is a refernce to an array foreach ( @$res ) { chomp; - $ly -> print( $_ ); + $ly->print($_); } - $ly -> close(); + $ly->close(); - if ( exists $eps_subs{ $Args -> { 'eps_func' } } ) { - $eps_subs{ $Args -> { 'eps_func' } } -> (); + if ( exists $eps_subs{ $Args->{'eps_func'} } ) { + $eps_subs{ $Args->{'eps_func'} }->(); } else { - die "Wrong argument for \$eps_subs: `" . - $Args -> { 'eps_func' } . "'"; + die "Wrong argument for \$eps_subs: `" . $Args->{'eps_func'} . "'"; } }, # end `.lilypond include' @@ -604,12 +602,12 @@ $args =~ s/["'`]//g; my $arg2 = $args; # file argument for `.lilypond include' - if ( exists $lilypond_args{ $arg1 } ) { - $lilypond_args{ $arg1 } -> ( $arg2 ); + if ( exists $lilypond_args{$arg1} ) { + $lilypond_args{$arg1}->($arg2); next; } else { # not a suitable argument of `.lilypond' - $stderr -> print( "Unknown command: `$arg1' `$arg2': `$line'" ); + $stderr->print( "Unknown command: `$arg1' `$arg2': `$line'" ); } next LILYPOND; @@ -618,7 +616,7 @@ if ( $lilypond_mode ) { # do lilypond-mode # see `.lilypond start' - $ly -> print( $line ); + $ly->print( $line ); next LILYPOND; } # do lilypond-mode @@ -629,7 +627,7 @@ \s* lilypond /x ) { # not a `.lilypond' line - $out -> print( $line ); + $out->print($line); next LILYPOND; } @@ -643,15 +641,15 @@ END { - exit unless ( defined($Temp -> { 'temp_dir' })); + exit unless ( defined($Temp->{'temp_dir'}) ); - if ( $Args -> { 'keep_all' } ) { + if ( $Args->{'keep_all'} ) { # With --keep_all, no temporary files are removed. - $v -> print( "keep_all: `TRUE'" ); - $v -> print( "No temporary files will be deleted:" ); + $v->print( "keep_all: `TRUE'" ); + $v->print( "No temporary files will be deleted:" ); - opendir my $dh_temp, $Temp -> { 'temp_dir' } or - die "Cannot open " . $Temp -> { 'temp_dir' } . ": $!"; + opendir my $dh_temp, $Temp->{'temp_dir'} or + die "Cannot open " . $Temp->{'temp_dir'} . ": $!"; for ( sort readdir $dh_temp ) { next if ( / # omit files starting with a dot ^ @@ -659,11 +657,11 @@ /x ); if ( / ^ - $Args -> { 'prefix' } + $Args->{'prefix'} _ /x ) { - my $file = File::Spec -> catfile( $Temp -> { 'temp_dir' }, $_ ); - $v -> print( "- " . $file ); + my $file = File::Spec->catfile( $Temp->{'temp_dir'}, $_ ); + $v->print( "- " . $file ); next; } next; @@ -673,30 +671,30 @@ } else { # keep_all is not set # Remove all temporary files except the eps files. - $v -> print( "keep_all: `FALSE'" ); - $v -> print( "All temporary files except *.eps will be deleted" ); + $v->print( "keep_all: `FALSE'" ); + $v->print( "All temporary files except *.eps will be deleted" ); - if ( $Temp -> { 'eps_dir' } ) { + if ( $Temp->{'eps_dir'} ) { # EPS files are in another dir, remove temp dir - if ( &is_subdir( $Temp -> { 'eps_dir' }, $Temp -> { 'temp_dir' } ) ) { - $v -> print( "EPS dir is subdir of temp dir, so keep both." ); + if ( &is_subdir( $Temp->{'eps_dir'}, $Temp->{'temp_dir'} ) ) { + $v->print( "EPS dir is subdir of temp dir, so keep both." ); } else { # remove temp dir - $v -> print( "Try to remove temporary directory `" . - $Temp -> { 'temp_dir' } ."':" ); - if ( File::Path::remove_tree( $Temp -> { 'temp_dir' } ) ) { + $v->print( "Try to remove temporary directory `" . + $Temp->{'temp_dir'} ."':" ); + if ( File::Path::remove_tree($Temp->{'temp_dir'}) ) { # remove succeeds - $v -> print( "...done." ); + $v->print( "...done." ); } else { # did not remove - $v -> print( "Failure to remove temporary directory." ); + $v->print( "Failure to remove temporary directory." ); } # end test on remove } # end is subdir } else { # no EPS dir, so keep EPS files - opendir my $dh_temp, $Temp -> { 'temp_dir' } or - die "Cannot open " . $Temp -> { 'temp_dir' } . ": $!"; + opendir my $dh_temp, $Temp->{'temp_dir'} or + die "Cannot open " . $Temp->{'temp_dir'} . ": $!"; for ( sort readdir $dh_temp ) { next if ( / # omit files starting with a dot ^ @@ -708,12 +706,12 @@ /x ); if ( / ^ - $Args -> { 'prefix' } + $Args->{'prefix'} _ /x ) { # this includes `PREFIX_temp*' - my $file = File::Spec -> catfile( $Temp -> { 'temp_dir' }, $_ ); - $v -> print( "Remove `" . $file . "'" ); - unlink $file or $stderr -> print( "Could not remove `$file': $!" ); + my $file = File::Spec->catfile( $Temp->{'temp_dir'}, $_ ); + $v->print( "Remove `" . $file . "'" ); + unlink $file or $stderr->print( "Could not remove `$file': $!" ); next; } # end if prefix next; @@ -723,13 +721,13 @@ } # end if-else keep files - if ( $Temp -> { 'eps_dir' } ) { - # EPS files in $Temp -> { 'eps_dir' } are always kept - $v -> print( "As EPS directrory is set as `" . - $Temp -> { 'eps_dir' } . "', no EPS files there will be deleted." ); + if ( $Temp->{'eps_dir'} ) { + # EPS files in $Temp->{'eps_dir'} are always kept + $v->print( "As EPS directrory is set as `" . + $Temp->{'eps_dir'} . "', no EPS files there will be deleted." ); - opendir my $dh_temp, $Temp -> { 'eps_dir' } or - die "Cannot open `" . $Temp -> { 'eps_dir' } . ": $!"; + opendir my $dh_temp, $Temp->{'eps_dir'} or + die "Cannot open `" . $Temp->{'eps_dir'} . ": $!"; for ( sort readdir $dh_temp ) { next if ( / # omit files starting with a dot ^ @@ -737,14 +735,14 @@ /x ); if ( / ^ - $Args -> { 'prefix' } + $Args->{'prefix'} _ .* \.eps $ /x ) { - my $file = File::Spec -> catfile( $Temp -> { 'eps_dir' }, $_ ); - $v -> print( "- " . $file ); + my $file = File::Spec->catfile( $Temp->{'eps_dir'}, $_ ); + $v->print( "- " . $file ); next; } # end if *.eps next; Index: oop_fh.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/oop_fh.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- oop_fh.pl 24 Apr 2013 21:23:39 -0000 1.2 +++ oop_fh.pl 25 Apr 2013 00:21:14 -0000 1.3 @@ -9,7 +9,7 @@ Copyright (C) 2013 Free Software Foundation, Inc. Written by Bernd Warken -Last update: 17 Mar 2013 +Last update: 25 Apr 2013 This file is part of `glilypond', which is part of `GNU groff'. @@ -67,7 +67,7 @@ sub print { my $self = shift; for ( @_ ) { - print { $self -> { 'fh' } } $_; + print { $self->{'fh'} } $_; } } @@ -126,32 +126,32 @@ sub DESTROY { my $self = shift; - $self -> close(); + $self->close(); } sub open { my $self = shift; - my $file = $self -> { 'file' }; + my $file = $self->{'file'}; if ( $file && -e $file ) { die "file $file is not writable" unless ( -w $file ); die "$file is a directory" if ( -d $file ); } - open $self -> { 'fh' }, ">", $self -> { 'file' } + open $self->{'fh'}, ">", $self->{'file'} or die "could not open file `$file' for writing: $!"; - $self -> { 'opened' } = main::TRUE; + $self->{'opened'} = main::TRUE; } sub close { my $self = shift; - close $self -> { 'fh' } if ( $self -> { 'opened' } ); - $self -> { 'opened' } = main::FALSE; + close $self->{'fh'} if ( $self->{'opened'} ); + $self->{'opened'} = main::FALSE; } sub print { my $self = shift; - $self -> open() unless ( $self -> { 'opened' } ); + $self->open() unless ( $self->{'opened'} ); for ( @_ ) { - print { $self -> { 'fh' } } $_; + print { $self->{'fh'} } $_; } } @@ -178,16 +178,16 @@ sub open { my $self = shift; - open $self->{'fh'}, ">", \ $self -> { 'string' } + open $self->{'fh'}, ">", \ $self->{'string'} or die "could not open string for writing: $!"; - $self -> { 'opened' } = main::TRUE; + $self->{'opened'} = main::TRUE; } sub get { # get string, move to array ref, close, and return array ref my $self = shift; - return '' unless ( $self -> { 'opened' } ); - my $a = &string2array( $self -> { 'string' } ); - $self -> close(); + return '' unless ( $self->{'opened'} ); + my $a = &string2array( $self->{'string'} ); + $self->close(); return $a; } @@ -204,7 +204,7 @@ use File::Spec; - my $devnull = File::Spec -> devnull(); + my $devnull = File::Spec->devnull(); $devnull = '' unless ( -e $devnull && -w $devnull ); sub new { @@ -260,7 +260,7 @@ sub close { my $self = shift; close $self->{'fh'} if ( $self->{'opened'} ); - $self -> { 'opened' } = main::FALSE; + $self->{'opened'} = main::FALSE; } sub read_line { @@ -270,7 +270,7 @@ $self->open() unless ( $self->{'opened'} ); my $res; - if ( defined ( $res = CORE::readline( $self->{'fh'} ) ) ) { + if ( defined($res = CORE::readline($self->{'fh'}) ) ) { chomp $res; return $res; } else { @@ -284,7 +284,7 @@ # Close the read handle at the end. # Return array reference. my $self = shift; - $self -> open() unless ( $self->{'opened'} ); + $self->open() unless ( $self->{'opened'} ); my $res = []; my $line; Index: subs.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/subs.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- subs.pl 24 Apr 2013 21:23:39 -0000 1.4 +++ subs.pl 25 Apr 2013 00:21:14 -0000 1.5 @@ -11,7 +11,7 @@ Copyright (C) 2013 Free Software Foundation, Inc. Written by Bernd Warken - Last update: 24 Apr 2013 + Last update: 25 Apr 2013 This file is part of `glilypond', which is part of `GNU groff'. @@ -50,7 +50,7 @@ sub create_ly2eps { # `--ly2eps' default our ( $out, $Read, $Temp ); - my $prefix = $Read -> { 'file_numbered' }; # with dir change to temp dir + my $prefix = $Read->{'file_numbered'}; # with dir change to temp dir # `$ lilypond --ps -dbackend=eps -dgs-load-fonts \ # output=file_without_extension file.ly' @@ -59,12 +59,12 @@ "--output=$prefix $prefix"; &run_lilypond("$opts"); - Cwd::chdir $Temp -> { 'cwd' } or + Cwd::chdir $Temp->{'cwd'} or die "Could not change to former directory `" . - $Temp -> { 'cwd' } . "': $!"; + $Temp->{'cwd'} . "': $!"; - my $eps_dir = $Temp -> { 'eps_dir' }; - my $dir = $Temp -> { 'temp_dir' }; + my $eps_dir = $Temp->{'eps_dir'}; + my $dir = $Temp->{'temp_dir'}; opendir( my $dh, $dir ) or die "could not open temporary directory `$dir': $!"; @@ -81,17 +81,17 @@ chomp; $file = $_; if ( /$re/ ) { - my $file_path = File::Spec -> catfile( $dir, $file ); + my $file_path = File::Spec->catfile($dir, $file); if ( $eps_dir ) { my $could_copy = FALSE; - File::Copy::copy ( $file_path, $eps_dir ) + File::Copy::copy($file_path, $eps_dir) and $could_copy = TRUE; if ( $could_copy ) { unlink $file_path; - $file_path = File::Spec -> catfile( $eps_dir, $_ ); + $file_path = File::Spec->catfile($eps_dir, $_); } } - $out -> print( '.PSPIC ' . $file_path ); + $out->print( '.PSPIC ' . $file_path ); } } # end while readdir closedir( $dh ); @@ -101,7 +101,7 @@ sub create_pdf2eps { # `--pdf2eps' our ( $v, $stdout, $stderr, $out, $Read, $Temp ); - my $prefix = $Read -> { 'file_numbered' }; # with dir change to temp dir + my $prefix = $Read->{'file_numbered'}; # with dir change to temp dir &run_lilypond("--pdf --output=$prefix $prefix"); @@ -110,43 +110,43 @@ # pdf2ps in temp dir my $temp_file = &next_temp_file; - $v -> print( "\n##### run of `pdf2ps'" ); + $v->print( "\n##### run of `pdf2ps'" ); # `$ pdf2ps file.pdf file.ps' my $output = `pdf2ps $file_pdf $file_ps 2> $temp_file`; die 'Program pdf2ps does not work.' if ( $? ); - &shell_handling ( $output, $temp_file ); - $v -> print( "##### end run of `pdf2ps'\n" ); + &shell_handling($output, $temp_file); + $v->print( "##### end run of `pdf2ps'\n" ); # ps2eps in temp dir $temp_file = &next_temp_file; - $v -> print( "\n##### run of `ps2eps'" ); + $v->print( "\n##### run of `ps2eps'" ); # `$ ps2eps file.ps' $output = `ps2eps $file_ps 2> $temp_file`; die 'Program ps2eps does not work.' if ( $? ); - &shell_handling ( $output, $temp_file ); - $v -> print( "##### end run of `ps2eps'\n" ); + &shell_handling($output, $temp_file); + $v->print( "##### end run of `ps2eps'\n" ); # change back to former dir - Cwd::chdir $Temp -> { 'cwd' } or + Cwd::chdir $Temp->{'cwd'} or die "Could not change to former directory `" . - $Temp -> { 'cwd' } . "': $!"; + $Temp->{'cwd'} . "': $!"; # handling of .eps file my $file_eps = $prefix . '.eps'; - my $eps_path = File::Spec -> catfile( $Temp -> { 'temp_dir' }, $file_eps ); - if ( $Temp -> { 'eps_dir' } ) { + my $eps_path = File::Spec->catfile($Temp->{'temp_dir'}, $file_eps); + if ( $Temp->{'eps_dir'} ) { my $has_copied = FALSE; - File::Copy::copy( $eps_path, $Temp -> { 'eps_dir' } ) + File::Copy::copy( $eps_path, $Temp->{'eps_dir'} ) and $has_copied = TRUE; if ( $has_copied ) { unlink $eps_path; - $eps_path = File::Spec -> catfile( $Temp -> { 'eps_dir' }, $file_eps ); + $eps_path = File::Spec->catfile( $Temp->{'eps_dir'}, $file_eps ); } else { - $stderr -> print( "Could not use EPS-directory." ); - } # end Temp -> { 'eps_dir' } + $stderr->print( "Could not use EPS-directory." ); + } # end Temp->{'eps_dir'} } # print into groff output - $out -> print( '.PSPIC ' . $eps_path ); + $out->print( '.PSPIC ' . $eps_path ); } # end sub create_pdf2eps() @@ -154,8 +154,8 @@ my ( $dir1, $dir2 ) = @_; $dir1 = &path2abs( $dir1 );; $dir2 = &path2abs( $dir2 );; - my @split1 = File::Spec -> splitdir( $dir1 ); - my @split2 = File::Spec -> splitdir( $dir2 ); + my @split1 = File::Spec->splitdir($dir1); + my @split2 = File::Spec->splitdir($dir2); for ( @split2 ) { next if ( $_ eq shift @split1 ); return FALSE; @@ -167,7 +167,7 @@ sub license { our ( $Legalese, $stdout ); &version; - $stdout -> print( $Legalese -> { 'license' } ); + $stdout->print( $Legalese->{'license'} ); } # end sub license() @@ -179,13 +179,13 @@ $dir_arg =~ s/^\s*(.*)\s*$/$1/; unless ( $dir_arg ) { - $v -> print( "make_dir(): empty argument" ); + $v->print( "make_dir(): empty argument" ); return FALSE; } - unless ( File::Spec->file_name_is_absolute( $dir_arg ) ) { - my $res = Cwd::realpath( $dir_arg ); - $res = File::Spec -> canonpath ( $dir_arg ) unless ( $res ); + unless ( File::Spec->file_name_is_absolute($dir_arg) ) { + my $res = Cwd::realpath($dir_arg); + $res = File::Spec->canonpath($dir_arg) unless ( $res ); $dir_arg = $res if ( $res ); } @@ -193,7 +193,7 @@ # search thru the dir parts - my @dir_parts = File::Spec -> splitdir( $dir_arg ); + my @dir_parts = File::Spec->splitdir($dir_arg); my @dir_grow; my $dir_grow; my $can_create = FALSE; # dir could be created if TRUE @@ -203,7 +203,7 @@ next DIRPARTS unless ( $_ ); # empty string for root directory # from array to path dir string - $dir_grow = File::Spec -> catdir ( @dir_grow ); + $dir_grow = File::Spec->catdir(@dir_grow); next DIRPARTS if ( -d $dir_grow ); @@ -220,7 +220,7 @@ # $dir_grow does no longer exist, so the former dir must be writable # in order to create the directory pop @dir_grow; - $dir_grow = File::Spec -> catdir ( @dir_grow ); + $dir_grow = File::Spec->catdir(@dir_grow); die "`$dir_grow' is not writable, " . "so directory `$dir_arg' can't be createdd." @@ -230,8 +230,8 @@ File::Path::make_path( $dir_arg, { - mask => oct( '0700' ), - verbose => $Args -> { 'verbose' }, + mask => oct('0700'), + verbose => $Args->{'verbose'}, } ) # `mkdir -P' or die "Could not create directory `$dir_arg': $!"; @@ -251,10 +251,10 @@ sub next_temp_file { our ( $Temp, $v, $Args ); ++$number; - my $temp_basename = $Args -> { 'prefix' } . '_temp_' . $number; - my $temp_file = File::Spec -> catfile( $Temp -> { 'temp_dir' } , + my $temp_basename = $Args->{'prefix'} . '_temp_' . $number; + my $temp_file = File::Spec->catfile( $Temp->{'temp_dir'} , $temp_basename ); - $v -> print( "next temporary file: `$temp_file'" ); + $v->print( "next temporary file: `$temp_file'" ); return $temp_file; } # end sub next_temp_file() @@ -281,7 +281,7 @@ ~ /x ) { if ( $path eq '~' ) { # only own home - $path = File::HomeDir -> my_home; + $path = File::HomeDir->my_home; } elsif ( $path =~ m< ^ ~ / @@ -290,7 +290,7 @@ ) $ >x ) { # subdir of own home - $path = File::Spec -> catdir( $Temp -> { 'cwd' }, $1 ); + $path = File::Spec->catdir( $Temp->{'cwd'}, $1 ); } elsif ( $path =~ m< ^ ~ @@ -299,7 +299,7 @@ ) $ >x ) { # home of other user - $path = File::HomeDir -> users_home( $1 ); + $path = File::HomeDir->users_home($1); } elsif ( $path =~ m< ^ ~ @@ -312,12 +312,12 @@ ) $ >x ) { # subdir of other home - $path = File::Spec -> - catdir( File::HomeDir -> users_home( $1 ), $2 ); + $path = File::Spec-> + catdir( File::HomeDir->users_home($1), $2 ); } } - $path = File::Spec -> rel2abs ( $path ); + $path = File::Spec->rel2abs($path); # now $path is absolute return $path; @@ -337,17 +337,17 @@ my $output = EMPTYSTRING; # change to temp dir - Cwd::chdir $Temp -> { 'temp_dir' } or + Cwd::chdir $Temp->{'temp_dir'} or die "Could not change to temporary directory `" . - $Temp -> { 'temp_dir' } . "': $!"; + $Temp->{'temp_dir'} . "': $!"; - $v -> print( "\n##### run of `lilypond " . $opts . "'" ); + $v->print( "\n##### run of `lilypond " . $opts . "'" ); $output = `lilypond $opts 2>$temp_file`; die "Program lilypond does not work, see `$temp_file': $?" if ( $? ); chomp $output; - &shell_handling( $output, $temp_file ); - $v -> print( "##### end run of `lilypond'\n" ); + &shell_handling($output, $temp_file); + $v->print( "##### end run of `lilypond'\n" ); # stay in temp dir } # end sub run_lilypond() @@ -362,21 +362,21 @@ my $out_string = shift; my $temp_file = shift; - my $a = &string2array( $out_string ); # array ref + my $a = &string2array($out_string); # array ref for ( @$a ) { - $out -> print( $_ ); + $out->print( $_ ); } $temp_file && -f $temp_file && -r $temp_file || die "shell_handling(): $temp_file is not a readable file."; - my $temp = new FH_READ_FILE( $temp_file ); - my $res = $temp -> read_all(); + my $temp = new FH_READ_FILE($temp_file); + my $res = $temp->read_all(); for ( @$res ) { chomp; - $v -> print( $_ ); + $v->print($_); } - unlink $temp_file unless ( $Args -> { 'keep_all' } ); + unlink $temp_file unless ( $Args->{'keep_all'} ); } # end sub shell_handling() @@ -408,7 +408,7 @@ # Breaking options: $p -?|-h|--help|--usage # usage -$p -v|--version # version information +$p --version # version information $p --license # the license is GPL >= 3 @@ -421,7 +421,7 @@ --pdf2eps `lilypond' generates a `PDF' file that is transformed -k|--keep_all do not delete any temporary files --V|--verbose print much information to STDERR +-v|--verbose print much information to STDERR Options with an argument: -e|--eps_dir=... use a directory for the EPS files @@ -443,19 +443,19 @@ sub version { # for `--version' our ( $Globals, $Legalese, $stdout, $Args ); my $end; - if ( $Globals -> { 'groff_version' } ) { - $end = " version $Globals -> { 'groff_version' }"; + if ( $Globals->{'groff_version'} ) { + $end = " version $Globals->{'groff_version'}"; } else { $end = '.'; } my $output = EMPTYSTRING; - $output = "###### version:\n" if ( $Args -> { 'verbose' } ); - $output .= "`" . $Globals -> { 'prog' } . "' version `" . + $output = "###### version:\n" if ( $Args->{'verbose'} ); + $output .= "`" . $Globals->{'prog'} . "' version `" . $Legalese->{'version'} . "' of `" . $Legalese->{'last_update'} . "' is part of `GNU groff'" . $end; - $stdout -> print( $output ); + $stdout->print($output); } # end sub version() From MAILER-DAEMON Thu Apr 25 18:36:30 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UVUmD-0003tW-VZ for mharc-groff-commit@gnu.org; Thu, 25 Apr 2013 18:36:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVUmB-0003sg-2I for groff-commit@gnu.org; Thu, 25 Apr 2013 18:36:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVUm9-0002A1-Nn for groff-commit@gnu.org; Thu, 25 Apr 2013 18:36:27 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:35257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVUm9-00029x-KB for groff-commit@gnu.org; Thu, 25 Apr 2013 18:36:25 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UVUm9-0002XM-3M for groff-commit@gnu.org; Thu, 25 Apr 2013 22:36:25 +0000 Date: Thu, 25 Apr 2013 22:36:25 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff/src/roff/groff read_groff_options.pl X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 22:36:28 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/25 22:36:25 Added files: src/roff/groff : read_groff_options.pl Log message: Add file /src/roff/groff/read_groff_options.pl CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/read_groff_options.pl?cvsroot=groff&rev=1.1 Patches: Index: read_groff_options.pl =================================================================== RCS file: read_groff_options.pl diff -N read_groff_options.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ read_groff_options.pl 25 Apr 2013 22:36:24 -0000 1.1 @@ -0,0 +1,165 @@ +#! /usr/bin/env perl + +use strict; +use warnings; +use diagnostics; + + +######################################################################## +# Legalese +######################################################################## + +use constant LASTUPDATE => '25 Apr 2013'; # date of last update + +### The following constants `LICENSE[12]' are the license for this +### file using `GPL' >= 3 + +use constant LICENSE1 => q* +read_groff_options.pl - generate lines with the `groff' options. + +Source file position: /src/roff/groff/read_groff_options.pl +*; + +use constant LICENSE2 => q* +Copyright (C) 2013 + Free Software Foundation, Inc. + Written by Bernd Warken . + +This file is part of `groff'. + + `GNU groff' is free software: you can redistribute it and/or modify it +under the terms of the `GNU General Public License' as published by the +`Free Software Foundation', either version 3 of the License, or (at your +option) any later version. + + `GNU groff' is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `GNU +General Public License' for more details. + + You should have received a copy of the 'GNU General Public License` +along with `groff', see the files `COPYING' and `LICENSE' in the top +directory of the `groff' source package. If not, see +.*; + + +use constant DOCUMENTATION => q* + This file is not installed, but is used to generate output +containing information of the `groff' options, which are read from the +function `synopsis' of the file `groff.cpp' in +`/src/roff/groff/'. The output is something like: + +groff_noarg: CENRSUVXZabceghijklpstvz +groff_witharg: DFIKLMPTWdfmnorw +*; + + +##### end legalese + +$\ = "\n"; # adds newline at each print +$/ = "\n"; # newline separates input +$| = 1; # flush after each print or write command + + +my $file = undef; +{ + use constant FALSE => 0; + use constant TRUE => 1; + + use File::Spec qw[]; + + my $arg = shift; + my $cpp = 'groff.cpp'; + + if ( defined($arg) ) { + if ( -d $arg ) { + $file = File::Spec->catfile($arg, $cpp); + $file = undef unless ( -f $file );; + } + if ( -f $arg && $arg =~ /groff.cpp$/ ) { + $file = $arg; + } + } else { # no argument + if ( -f $cpp ) { + $file = $cpp; + } + } + die "read_groff_options.pl: needs a directory with $cpp as argument: $!." + unless ( defined($file) ); + +} + +# $file is cpp-file + +my @lines = (); +{ + open(FH, '<', $file); + my $start_synopsis = FALSE; + foreach ( ) { + chomp; + if ( /^void\s+synopsis\(/ ) { + $start_synopsis = TRUE; + next; + } + if ( $start_synopsis ) { + if ( /\[-/ ) { + s/\\n//g; + push @lines, $_; + $start_synopsis = FALSE; + } + next; + } + if ( @lines ) { + if ( /\[-/ ) { + s/\\n//g; + push @lines, $_; + next; + } else { + last; + } + } + next; + } +} + +{ + my $noarg = ''; + my $witharg = ''; + my $first = shift @lines; + chomp $first; + $first =~ s/^[^-]*-(\w+)\]\s*//; + $noarg = $1; + unshift @lines, $first; + + foreach ( @lines ) { + my $s = $_; + while ( $s =~ /-/ ) { + $s =~ s/^[^-]*-(\w)\w+]//; + $witharg .= $1; + } + } + + sub sort_opts { + my @opts = split '', shift; + @opts = sort @opts; + return join '', @opts; + } + + my $res = &sort_opts($noarg); + print 'groff_noarg: ' . $res; + + $res = &sort_opts($witharg); + print 'groff_witharg: ' . $res; +} + +print ''; +print '#' x 30 . ' License ' . '#' x 30; +print q* +groff_options.info - 2 lines with the `groff' options. + +This file is generated by the run of `make' in the `groff' source by +the file /src/roff/groff/read_groff_options.pl. + +This file `groff_options.info' is installed in the `groff libdir'.*; + +print LICENSE2; From MAILER-DAEMON Thu Apr 25 18:38:04 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UVUnk-000453-Nu for mharc-groff-commit@gnu.org; Thu, 25 Apr 2013 18:38:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVUng-00043k-9h for groff-commit@gnu.org; Thu, 25 Apr 2013 18:38:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVUnf-0002hf-0J for groff-commit@gnu.org; Thu, 25 Apr 2013 18:38:00 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:37775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVUne-0002hZ-T1 for groff-commit@gnu.org; Thu, 25 Apr 2013 18:37:58 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UVUne-0002aN-DI for groff-commit@gnu.org; Thu, 25 Apr 2013 22:37:58 +0000 Date: Thu, 25 Apr 2013 22:37:58 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog contrib/glilypond/ChangeLog con... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 22:38:03 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/25 22:37:58 Modified files: . : ChangeLog contrib/glilypond: ChangeLog Makefile.sub src/roff/groff : Makefile.sub Log message: src/roff/groff/read_groff_options.pl: Reads `groff' options from `groff.cpp' and writes them into the file `groff_options.info'. src/roff/groff/Makefile.sub: Have the generated file `groff_options.info' be installed into the `groff libdir'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1412&r2=1.1413 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.10&r2=1.11 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.5&r2=1.6 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1412 retrieving revision 1.1413 diff -u -b -r1.1412 -r1.1413 --- ChangeLog 16 Apr 2013 19:00:42 -0000 1.1412 +++ ChangeLog 25 Apr 2013 22:37:57 -0000 1.1413 @@ -1,3 +1,11 @@ +2013-04-26 Bernd Warken + + * src/roff/groff/read_groff_options.pl: Reads `groff' options from + `groff.cpp' and writes them into the file `groff_options.info'. + + * src/roff/groff/Makefile.sub: Have the generated file + `groff_options.info' be installed into the `groff libdir'. + 2013-04-16 Bernd Warken * INSTALL.gen: Replace this file by the daily `git' version of Index: contrib/glilypond/ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- contrib/glilypond/ChangeLog 25 Apr 2013 00:21:14 -0000 1.10 +++ contrib/glilypond/ChangeLog 25 Apr 2013 22:37:57 -0000 1.11 @@ -1,3 +1,7 @@ +2013-04-25 Bernd Warken + + * Makefile.sub: minor corrections. + 2013-04-24 Bernd Warken Public `glilypond' version `v1.1'. Index: contrib/glilypond/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- contrib/glilypond/Makefile.sub 24 Apr 2013 21:23:38 -0000 1.4 +++ contrib/glilypond/Makefile.sub 25 Apr 2013 22:37:58 -0000 1.5 @@ -7,7 +7,7 @@ # Written by Werner Lemberg and # Bernd Warken . -# Last update: 24 Apr 2013 +# Last update: 25 Apr 2013 # This file is part of `glilypond' which is part of `groff'. @@ -72,8 +72,8 @@ for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ done - test -d $(DESTDIR)$(libdir)/groff/glilypond \ - && rmdir $(DESTDIR)$(libdir)/groff/glilypond + -test -d $(DESTDIR)$(libdir)/groff/glilypond \ + && -rmdir $(DESTDIR)$(libdir)/groff/glilypond ######################################################################## # Emacs settings Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- src/roff/groff/Makefile.sub 31 Jan 2011 10:18:17 -0000 1.5 +++ src/roff/groff/Makefile.sub 25 Apr 2013 22:37:58 -0000 1.6 @@ -1,3 +1,31 @@ +# Makefile.sub for `glilypond' (integration into the `groff' source tree) + +# File position: /contrib/lilypond/Makefile.sub + +# Copyright (C) 1993, 2013 +# Free Software Foundation, Inc. +# Rewritten by Werner Lemberg and +# Bernd Warken . + +# Last update: 25 Apr 2013 + +# This file is part of `glilypond' which is part of `groff'. + +# `groff' is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# `groff' is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +######################################################################## + PROG=groff$(EXEEXT) MAN1=groff.n XLIBS=$(LIBGROFF) $(LIBGNU) @@ -6,3 +34,32 @@ CCSRCS=$(srcdir)/groff.cpp CSRCS=$(srcdir)/pipeline.c HDRS=$(srcdir)/pipeline.h + +MOSTLYCLEANADD=groff_options.info + +RM=rm -f + +all: groff_options.info + +groff_options.info: read_groff_options.pl + ./$< > $@ + +install_data: groff_options.info + -test -d $(DESTDIR)$(libdir)/groff \ + || $(mkinstalldirs) $(DESTDIR)$(libdir)/groff + $(RM) $(DESTDIR)$(libdir)/groff/$< + $(INSTALL_SCRIPT) $< $(DESTDIR)$(libdir)/groff + +uninstall_sub: + $(RM) $(DESTDIR)$(libdir)/groff/groff_options.info + -test -d $(DESTDIR)$(libdir)/groff \ + && -rmdir $(DESTDIR)$(libdir)/groff + + +######################################################################## +# Emacs settings +######################################################################## +# +# Local Variables: +# mode: makefile +# End: From MAILER-DAEMON Thu Apr 25 19:48:26 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UVVtq-00054s-Mn for mharc-groff-commit@gnu.org; Thu, 25 Apr 2013 19:48:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVVtl-0004yb-UU for groff-commit@gnu.org; Thu, 25 Apr 2013 19:48:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVVtj-0006HF-KA for groff-commit@gnu.org; Thu, 25 Apr 2013 19:48:21 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:52343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVVtj-0006H7-GZ for groff-commit@gnu.org; Thu, 25 Apr 2013 19:48:19 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UVVti-0006Sp-Ob for groff-commit@gnu.org; Thu, 25 Apr 2013 23:48:18 +0000 Date: Thu, 25 Apr 2013 23:48:18 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog INSTALL.gen FOR-RELEASE X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 23:48:25 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/25 23:48:18 Modified files: . : ChangeLog INSTALL.gen Added files: . : FOR-RELEASE Log message: INSTALL.gen: Restore an older version from `2006' in `groff-1.21'. FOR-RELEASE: New file which describes how to prepare `groff' for a new release. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1413&r2=1.1414 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.gen?cvsroot=groff&r1=1.9&r2=1.10 http://cvs.savannah.gnu.org/viewcvs/groff/FOR-RELEASE?cvsroot=groff&rev=1.1 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1413 retrieving revision 1.1414 diff -u -b -r1.1413 -r1.1414 --- ChangeLog 25 Apr 2013 22:37:57 -0000 1.1413 +++ ChangeLog 25 Apr 2013 23:48:18 -0000 1.1414 @@ -1,5 +1,13 @@ 2013-04-26 Bernd Warken + * INSTALL.gen: Restore an older version from `2006' in + `groff-1.21'. + + * FOR-RELEASE: New file which describes how to prepare `groff' for + a new release. + +2013-04-26 Bernd Warken + * src/roff/groff/read_groff_options.pl: Reads `groff' options from `groff.cpp' and writes them into the file `groff_options.info'. Index: INSTALL.gen =================================================================== RCS file: /cvsroot/groff/groff/INSTALL.gen,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- INSTALL.gen 16 Apr 2013 19:00:44 -0000 1.9 +++ INSTALL.gen 25 Apr 2013 23:48:18 -0000 1.10 @@ -1,27 +1,19 @@ -This file comes from GNU automake, it shouldn't be changed. - Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should +Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -50,7 +42,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. - The simplest way to compile this package is: +The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -61,22 +53,12 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. + the package. 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. + documentation. - 6. You can remove the program binaries and object files from the + 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -85,22 +67,12 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -113,41 +85,25 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +source code in the directory that `configure' is in and in `..'. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - Installation Names ================== - By default, `make install' installs the package's commands under +By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -158,47 +114,16 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= +you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -210,58 +135,14 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -269,8 +150,7 @@ where SYSTEM can have one of these forms: - OS - KERNEL-OS + OS KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -288,9 +168,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -299,7 +179,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -311,27 +191,18 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +an Autoconf bug. Until the bug is fixed you can use this workaround: - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + Print a summary of the options to `configure', and exit. `--version' `-V' @@ -358,15 +229,6 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. + Index: FOR-RELEASE =================================================================== RCS file: FOR-RELEASE diff -N FOR-RELEASE --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ FOR-RELEASE 25 Apr 2013 23:48:18 -0000 1.1 @@ -0,0 +1,16 @@ + Copyright 2013 + Free Software Foundation, Inc. + + Last Update: 26 Apr 2013 + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + +This file describes how to prepare `groff' for a new release. + + +######################################################################## + +The file `INSTALL.gen' shall *never* be changed manually! It is a +generic file provided from GNU (normally called `INSTALL'). From MAILER-DAEMON Fri Apr 26 02:21:41 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UVc2P-0002pd-G2 for mharc-groff-commit@gnu.org; Fri, 26 Apr 2013 02:21:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVc2M-0002pS-7s for groff-commit@gnu.org; Fri, 26 Apr 2013 02:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVc2J-0003dM-LQ for groff-commit@gnu.org; Fri, 26 Apr 2013 02:21:38 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:57899) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVc2J-0003dI-Gw for groff-commit@gnu.org; Fri, 26 Apr 2013 02:21:35 -0400 Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UVc2I-0003tA-Q4 for groff-commit@gnu.org; Fri, 26 Apr 2013 06:21:34 +0000 Date: Fri, 26 Apr 2013 06:21:34 +0000 Message-Id: To: groff-commit@gnu.org From: Werner LEMBERG X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog INSTALL.gen configure src/roff/... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 06:21:40 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Werner LEMBERG 13/04/26 06:21:34 Modified files: . : ChangeLog INSTALL.gen configure src/roff/groff : Makefile.sub Log message: Various minor fixes. * INSTALL.gen: Take the newest version from the `gnulib' repository. * configure: Regenerated. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1414&r2=1.1415 http://cvs.savannah.gnu.org/viewcvs/groff/INSTALL.gen?cvsroot=groff&r1=1.10&r2=1.11 http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.94&r2=1.95 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.6&r2=1.7 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1414 retrieving revision 1.1415 diff -u -b -r1.1414 -r1.1415 --- ChangeLog 25 Apr 2013 23:48:18 -0000 1.1414 +++ ChangeLog 26 Apr 2013 06:21:33 -0000 1.1415 @@ -1,3 +1,11 @@ +2013-04-26 Werner LEMBERG + + Various minor fixes. + + * INSTALL.gen: Take the newest version from the `gnulib' repository. + + * configure: Regenerated. + 2013-04-26 Bernd Warken * INSTALL.gen: Restore an older version from `2006' in Index: INSTALL.gen =================================================================== RCS file: /cvsroot/groff/groff/INSTALL.gen,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- INSTALL.gen 25 Apr 2013 23:48:18 -0000 1.10 +++ INSTALL.gen 26 Apr 2013 06:21:34 -0000 1.11 @@ -1,19 +1,25 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,12 +83,22 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -85,25 +111,41 @@ Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -114,16 +156,47 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -135,14 +208,58 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -150,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -168,9 +286,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -179,7 +297,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -191,18 +309,27 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -229,6 +356,15 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - Index: configure =================================================================== RCS file: /cvsroot/groff/groff/configure,v retrieving revision 1.94 retrieving revision 1.95 diff -u -b -r1.94 -r1.95 --- configure 15 Apr 2013 23:40:54 -0000 1.94 +++ configure 26 Apr 2013 06:21:34 -0000 1.95 @@ -10462,7 +10462,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: The program$plural - $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; @@ -10472,7 +10471,6 @@ $as_echo "$as_me: WARNING: missing program$plural: The program$plural - $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- src/roff/groff/Makefile.sub 25 Apr 2013 22:37:58 -0000 1.6 +++ src/roff/groff/Makefile.sub 26 Apr 2013 06:21:34 -0000 1.7 @@ -1,15 +1,11 @@ -# Makefile.sub for `glilypond' (integration into the `groff' source tree) +# Makefile.sub for `groff' -# File position: /contrib/lilypond/Makefile.sub +# File position: /src/roff/groff/Makefile.sub -# Copyright (C) 1993, 2013 +# Copyright (C) 1993-2013 # Free Software Foundation, Inc. -# Rewritten by Werner Lemberg and -# Bernd Warken . -# Last update: 25 Apr 2013 - -# This file is part of `glilypond' which is part of `groff'. +# Last update: 26 Apr 2013 # `groff' is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by From MAILER-DAEMON Fri Apr 26 19:33:29 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UVs8v-0001YC-DD for mharc-groff-commit@gnu.org; Fri, 26 Apr 2013 19:33:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVs8r-0001Y5-8H for groff-commit@gnu.org; Fri, 26 Apr 2013 19:33:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVs8p-0000Gn-FW for groff-commit@gnu.org; Fri, 26 Apr 2013 19:33:24 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:33128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVs8p-0000Gh-BP for groff-commit@gnu.org; Fri, 26 Apr 2013 19:33:23 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UVs8o-0008M7-QK for groff-commit@gnu.org; Fri, 26 Apr 2013 23:33:22 +0000 Date: Fri, 26 Apr 2013 23:33:22 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub src... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 23:33:27 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/26 23:33:22 Modified files: . : ChangeLog src/roff/groff : Makefile.sub Removed files: src/roff/groff : read_groff_options.pl Log message: src/roff/groff: `read_groff_options.pl' is no longer needed. `Makefile.sub': Get `groff' options from `getopt' in `groff.cpp'. Store it in a new file `groff_options.txt', which is installed in `groff libdir'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1415&r2=1.1416 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.7&r2=1.8 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/read_groff_options.pl?cvsroot=groff&r1=1.1&r2=0 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1415 retrieving revision 1.1416 diff -u -b -r1.1415 -r1.1416 --- ChangeLog 26 Apr 2013 06:21:33 -0000 1.1415 +++ ChangeLog 26 Apr 2013 23:33:22 -0000 1.1416 @@ -1,3 +1,12 @@ +2013-04-26 Bernd Warken + + * src/roff/groff/read_groff_options.pl: Remove this file. It's + no longer needed. + + * src/roff/groff/Makefile.sub: Get the `groff' options from the use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'. + Store this information in a new file `groff_options.txt', which + is copied to `groff libdir' during the installation. + 2013-04-26 Werner LEMBERG Various minor fixes. Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- src/roff/groff/Makefile.sub 26 Apr 2013 06:21:34 -0000 1.7 +++ src/roff/groff/Makefile.sub 26 Apr 2013 23:33:22 -0000 1.8 @@ -31,25 +31,28 @@ CSRCS=$(srcdir)/pipeline.c HDRS=$(srcdir)/pipeline.h -MOSTLYCLEANADD=groff_options.info +MOSTLYCLEANADD=groff_options.txt RM=rm -f -all: groff_options.info +all: groff_options.txt -groff_options.info: read_groff_options.pl - ./$< > $@ - -install_data: groff_options.info - -test -d $(DESTDIR)$(libdir)/groff \ - || $(mkinstalldirs) $(DESTDIR)$(libdir)/groff - $(RM) $(DESTDIR)$(libdir)/groff/$< - $(INSTALL_SCRIPT) $< $(DESTDIR)$(libdir)/groff +groff_options.txt: groff.cpp + $(EGREP) -A2 -e 'getopt' $< \ + | sed -n -e '/"/p' \ + | sed -e 's/^[^"\]*"//' \ + | sed -e 's/"[^"]*$$//' > $@ + +install_data: groff_options.txt + -test -d $(DESTDIR)$(libprogramdir) \ + || $(mkinstalldirs) $(DESTDIR)$(libprogramdir) + $(RM) $(DESTDIR)$(libprogramdir)/$< + $(INSTALL_SCRIPT) $< $(DESTDIR)$(libprogramdir) uninstall_sub: - $(RM) $(DESTDIR)$(libdir)/groff/groff_options.info - -test -d $(DESTDIR)$(libdir)/groff \ - && -rmdir $(DESTDIR)$(libdir)/groff + $(RM) $(DESTDIR)$(libprogramdir)/groff_options.txt + -test -d $(DESTDIR)$(libprogramdir) \ + && -rmdir $(DESTDIR)$(libprogramdir) ######################################################################## Index: src/roff/groff/read_groff_options.pl =================================================================== RCS file: src/roff/groff/read_groff_options.pl diff -N src/roff/groff/read_groff_options.pl --- src/roff/groff/read_groff_options.pl 25 Apr 2013 22:36:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,165 +0,0 @@ -#! /usr/bin/env perl - -use strict; -use warnings; -use diagnostics; - - -######################################################################## -# Legalese -######################################################################## - -use constant LASTUPDATE => '25 Apr 2013'; # date of last update - -### The following constants `LICENSE[12]' are the license for this -### file using `GPL' >= 3 - -use constant LICENSE1 => q* -read_groff_options.pl - generate lines with the `groff' options. - -Source file position: /src/roff/groff/read_groff_options.pl -*; - -use constant LICENSE2 => q* -Copyright (C) 2013 - Free Software Foundation, Inc. - Written by Bernd Warken . - -This file is part of `groff'. - - `GNU groff' is free software: you can redistribute it and/or modify it -under the terms of the `GNU General Public License' as published by the -`Free Software Foundation', either version 3 of the License, or (at your -option) any later version. - - `GNU groff' is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `GNU -General Public License' for more details. - - You should have received a copy of the 'GNU General Public License` -along with `groff', see the files `COPYING' and `LICENSE' in the top -directory of the `groff' source package. If not, see -.*; - - -use constant DOCUMENTATION => q* - This file is not installed, but is used to generate output -containing information of the `groff' options, which are read from the -function `synopsis' of the file `groff.cpp' in -`/src/roff/groff/'. The output is something like: - -groff_noarg: CENRSUVXZabceghijklpstvz -groff_witharg: DFIKLMPTWdfmnorw -*; - - -##### end legalese - -$\ = "\n"; # adds newline at each print -$/ = "\n"; # newline separates input -$| = 1; # flush after each print or write command - - -my $file = undef; -{ - use constant FALSE => 0; - use constant TRUE => 1; - - use File::Spec qw[]; - - my $arg = shift; - my $cpp = 'groff.cpp'; - - if ( defined($arg) ) { - if ( -d $arg ) { - $file = File::Spec->catfile($arg, $cpp); - $file = undef unless ( -f $file );; - } - if ( -f $arg && $arg =~ /groff.cpp$/ ) { - $file = $arg; - } - } else { # no argument - if ( -f $cpp ) { - $file = $cpp; - } - } - die "read_groff_options.pl: needs a directory with $cpp as argument: $!." - unless ( defined($file) ); - -} - -# $file is cpp-file - -my @lines = (); -{ - open(FH, '<', $file); - my $start_synopsis = FALSE; - foreach ( ) { - chomp; - if ( /^void\s+synopsis\(/ ) { - $start_synopsis = TRUE; - next; - } - if ( $start_synopsis ) { - if ( /\[-/ ) { - s/\\n//g; - push @lines, $_; - $start_synopsis = FALSE; - } - next; - } - if ( @lines ) { - if ( /\[-/ ) { - s/\\n//g; - push @lines, $_; - next; - } else { - last; - } - } - next; - } -} - -{ - my $noarg = ''; - my $witharg = ''; - my $first = shift @lines; - chomp $first; - $first =~ s/^[^-]*-(\w+)\]\s*//; - $noarg = $1; - unshift @lines, $first; - - foreach ( @lines ) { - my $s = $_; - while ( $s =~ /-/ ) { - $s =~ s/^[^-]*-(\w)\w+]//; - $witharg .= $1; - } - } - - sub sort_opts { - my @opts = split '', shift; - @opts = sort @opts; - return join '', @opts; - } - - my $res = &sort_opts($noarg); - print 'groff_noarg: ' . $res; - - $res = &sort_opts($witharg); - print 'groff_witharg: ' . $res; -} - -print ''; -print '#' x 30 . ' License ' . '#' x 30; -print q* -groff_options.info - 2 lines with the `groff' options. - -This file is generated by the run of `make' in the `groff' source by -the file /src/roff/groff/read_groff_options.pl. - -This file `groff_options.info' is installed in the `groff libdir'.*; - -print LICENSE2; From MAILER-DAEMON Sat Apr 27 21:28:13 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UWGPV-0001th-8e for mharc-groff-commit@gnu.org; Sat, 27 Apr 2013 21:28:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWGPR-0001sK-Vb for groff-commit@gnu.org; Sat, 27 Apr 2013 21:28:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWGPQ-0007TG-PX for groff-commit@gnu.org; Sat, 27 Apr 2013 21:28:09 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:59936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWGPQ-0007TC-MD for groff-commit@gnu.org; Sat, 27 Apr 2013 21:28:08 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UWGPQ-0001ei-6Q for groff-commit@gnu.org; Sun, 28 Apr 2013 01:28:08 +0000 Date: Sun, 28 Apr 2013 01:28:08 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 01:28:12 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/28 01:28:08 Modified files: . : ChangeLog src/roff/groff : Makefile.sub Log message: src/roff/groff/Makefile.sub: Use `make' variables to get `groff' options from `getopt' in `groff.cpp'. Create 2 files `groff_opts_no_arg.txt' and `groff_opts_with_arg.txt'. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1416&r2=1.1417 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.8&r2=1.9 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1416 retrieving revision 1.1417 diff -u -b -r1.1416 -r1.1417 --- ChangeLog 26 Apr 2013 23:33:22 -0000 1.1416 +++ ChangeLog 28 Apr 2013 01:28:07 -0000 1.1417 @@ -1,3 +1,10 @@ +2013-04-28 Bernd Warken +2013-04-28 Werner LEMBERG + + * src/roff/groff/Makefile.sub: Use `make' variables to get + `groff' options from `getopt' in `groff.cpp'. Create 2 files + `groff_opts_no_arg.txt' and `groff_opts_with_arg.txt'. + 2013-04-26 Bernd Warken * src/roff/groff/read_groff_options.pl: Remove this file. It's @@ -11,7 +18,8 @@ Various minor fixes. - * INSTALL.gen: Take the newest version from the `gnulib' repository. + * INSTALL.gen: Take the newest version from the `gnulib' + repository. * configure: Regenerated. @@ -20,13 +28,13 @@ * INSTALL.gen: Restore an older version from `2006' in `groff-1.21'. - * FOR-RELEASE: New file which describes how to prepare `groff' for - a new release. + * FOR-RELEASE: New file which describes how to prepare `groff' + for a new release. 2013-04-26 Bernd Warken - * src/roff/groff/read_groff_options.pl: Reads `groff' options from - `groff.cpp' and writes them into the file `groff_options.info'. + * src/roff/groff/read_groff_options.pl: Reads `groff' options from `groff.cpp' and writes them into the file + `groff_options.info'. * src/roff/groff/Makefile.sub: Have the generated file `groff_options.info' be installed into the `groff libdir'. Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- src/roff/groff/Makefile.sub 26 Apr 2013 23:33:22 -0000 1.8 +++ src/roff/groff/Makefile.sub 28 Apr 2013 01:28:07 -0000 1.9 @@ -5,7 +5,7 @@ # Copyright (C) 1993-2013 # Free Software Foundation, Inc. -# Last update: 26 Apr 2013 +# Last update: 28 Apr 2013 # `groff' is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -31,26 +31,52 @@ CSRCS=$(srcdir)/pipeline.c HDRS=$(srcdir)/pipeline.h -MOSTLYCLEANADD=groff_options.txt +GROFF_OPTS_OUTPUT := groff_opts_no_arg.txt \ + groff_opts_with_arg.txt + +MOSTLYCLEANADD := $(GROFF_OPTS_OUTPUT) RM=rm -f -all: groff_options.txt +OPTS := $(shell $(EGREP) -e ':.*:.*:' groff.cpp \ + | sed -e 's/[ \t",]//g') + +OPTS_NO_ARG := $(shell echo $(OPTS) \ + | sed -e 's/[a-zA-Z]://g') + +OPTS_WITH_ARG := $(shell echo $(OPTS) \ + | sed "s/[$(OPTS_NO_ARG):]//g") + +show: + @echo opts: $(OPTS) + @echo no: $(OPTS_NO_ARG) + @echo optarg: $(OPTS_WITH_ARG) + +.PHONY: all +all: groff.cpp $(GROFF_OPTS_OUTPUT) + +groff_opts_no_arg.txt: + $(RM) $@ + echo $(OPTS_NO_ARG) > $@ -groff_options.txt: groff.cpp - $(EGREP) -A2 -e 'getopt' $< \ - | sed -n -e '/"/p' \ - | sed -e 's/^[^"\]*"//' \ - | sed -e 's/"[^"]*$$//' > $@ +groff_opts_with_arg.txt: + $(RM) $@ + echo $(OPTS_WITH_ARG) > $@ -install_data: groff_options.txt +.PHONY: install_data +install_data: $(GROFF_OPTS_OUTPUT) -test -d $(DESTDIR)$(libprogramdir) \ || $(mkinstalldirs) $(DESTDIR)$(libprogramdir) - $(RM) $(DESTDIR)$(libprogramdir)/$< - $(INSTALL_SCRIPT) $< $(DESTDIR)$(libprogramdir) + for f in $(GROFF_OPTS_OUTPUT); do \ + $(RM) $(DESTDIR)$(libprogramdir)/$$f; \ + $(INSTALL_SCRIPT) $$f $(DESTDIR)$(libprogramdir); \ + done +.PHONY: uninstall_data uninstall_sub: - $(RM) $(DESTDIR)$(libprogramdir)/groff_options.txt + for f in $(GROFF_OPTS_OUTPUT); do \ + $(RM) $(DESTDIR)$(libprogramdir)/$$f; \ + done -test -d $(DESTDIR)$(libprogramdir) \ && -rmdir $(DESTDIR)$(libprogramdir) From MAILER-DAEMON Sun Apr 28 11:52:57 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UWTuL-0007iV-NM for mharc-groff-commit@gnu.org; Sun, 28 Apr 2013 11:52:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWTuJ-0007fq-L5 for groff-commit@gnu.org; Sun, 28 Apr 2013 11:52:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWTuH-0003cN-4S for groff-commit@gnu.org; Sun, 28 Apr 2013 11:52:55 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:45381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWTuH-0003cI-0w for groff-commit@gnu.org; Sun, 28 Apr 2013 11:52:53 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UWTuF-0001vc-R2 for groff-commit@gnu.org; Sun, 28 Apr 2013 15:52:51 +0000 Date: Sun, 28 Apr 2013 15:52:51 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 15:52:56 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/28 15:52:51 Modified files: . : ChangeLog src/roff/groff : Makefile.sub Log message: src/roff/groff/Makefile.sub: Make this file a compatible Makefile. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1417&r2=1.1418 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.9&r2=1.10 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1417 retrieving revision 1.1418 diff -u -b -r1.1417 -r1.1418 --- ChangeLog 28 Apr 2013 01:28:07 -0000 1.1417 +++ ChangeLog 28 Apr 2013 15:52:51 -0000 1.1418 @@ -1,4 +1,8 @@ 2013-04-28 Bernd Warken + + * src/roff/groff/Makefile.sub: Make this Makefile compatible. + +2013-04-28 Bernd Warken 2013-04-28 Werner LEMBERG * src/roff/groff/Makefile.sub: Use `make' variables to get Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- src/roff/groff/Makefile.sub 28 Apr 2013 01:28:07 -0000 1.9 +++ src/roff/groff/Makefile.sub 28 Apr 2013 15:52:51 -0000 1.10 @@ -5,6 +5,9 @@ # Copyright (C) 1993-2013 # Free Software Foundation, Inc. +# Rewritten by Bernd Warken and +# Werner LEMBERG + # Last update: 28 Apr 2013 # `groff' is free software; you can redistribute it and/or modify it @@ -31,37 +34,35 @@ CSRCS=$(srcdir)/pipeline.c HDRS=$(srcdir)/pipeline.h -GROFF_OPTS_OUTPUT := groff_opts_no_arg.txt \ +GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \ groff_opts_with_arg.txt -MOSTLYCLEANADD := $(GROFF_OPTS_OUTPUT) +MOSTLYCLEANADD=$(GROFF_OPTS_OUTPUT) RM=rm -f -OPTS := $(shell $(EGREP) -e ':.*:.*:' groff.cpp \ - | sed -e 's/[ \t",]//g') - -OPTS_NO_ARG := $(shell echo $(OPTS) \ - | sed -e 's/[a-zA-Z]://g') - -OPTS_WITH_ARG := $(shell echo $(OPTS) \ - | sed "s/[$(OPTS_NO_ARG):]//g") +opts=`$(EGREP) -e ':.*:.*:' groff.cpp \ + | sed -e 's/[ \t",]//g')` -show: - @echo opts: $(OPTS) - @echo no: $(OPTS_NO_ARG) - @echo optarg: $(OPTS_WITH_ARG) +opts_no_arg=`cat groff_opts_no_arg.txt` .PHONY: all all: groff.cpp $(GROFF_OPTS_OUTPUT) -groff_opts_no_arg.txt: - $(RM) $@ - echo $(OPTS_NO_ARG) > $@ - -groff_opts_with_arg.txt: - $(RM) $@ - echo $(OPTS_WITH_ARG) > $@ +groff_opts_no_arg.txt: groff.cpp + @$(RM) $@ + @echo groff options: $(opts) + @echo $(opts) \ + | sed -e 's/[a-zA-Z]://g' > $@ + @echo -n 'no arg: ' + @cat $@ + +groff_opts_with_arg.txt: groff_opts_no_arg.txt + @$(RM) $@ + @echo $(opts) \ + | sed "s/[$(opts_no_arg):]//g" > $@ + @echo -n 'with arg: ' + @cat $@ .PHONY: install_data install_data: $(GROFF_OPTS_OUTPUT) From MAILER-DAEMON Mon Apr 29 15:14:01 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UWtWT-0000qE-H2 for mharc-groff-commit@gnu.org; Mon, 29 Apr 2013 15:14:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWtWP-0000jL-6c for groff-commit@gnu.org; Mon, 29 Apr 2013 15:14:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWtWN-0007TX-MD for groff-commit@gnu.org; Mon, 29 Apr 2013 15:13:57 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:34354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWtWN-0007TQ-Hk for groff-commit@gnu.org; Mon, 29 Apr 2013 15:13:55 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UWtWM-0007AW-UH for groff-commit@gnu.org; Mon, 29 Apr 2013 19:13:54 +0000 Date: Mon, 29 Apr 2013 19:13:54 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Apr 2013 19:14:00 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/29 19:13:54 Modified files: . : ChangeLog src/roff/groff : Makefile.sub Log message: src/roff/groff/Makefile.sub: Replace some variables by shell commands. Improve the output for the `make' runs. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1418&r2=1.1419 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.10&r2=1.11 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1418 retrieving revision 1.1419 diff -u -b -r1.1418 -r1.1419 --- ChangeLog 28 Apr 2013 15:52:51 -0000 1.1418 +++ ChangeLog 29 Apr 2013 19:13:54 -0000 1.1419 @@ -1,3 +1,8 @@ +2013-04-29 Bernd Warken + + * src/roff/groff/Makefile.sub: Replace some variables by shell + commands. Improve the output for the `make' runs. + 2013-04-28 Bernd Warken * src/roff/groff/Makefile.sub: Make this Makefile compatible. @@ -14,7 +19,8 @@ * src/roff/groff/read_groff_options.pl: Remove this file. It's no longer needed. - * src/roff/groff/Makefile.sub: Get the `groff' options from the use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'. + * src/roff/groff/Makefile.sub: Get the `groff' options from the + use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'. Store this information in a new file `groff_options.txt', which is copied to `groff libdir' during the installation. Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- src/roff/groff/Makefile.sub 28 Apr 2013 15:52:51 -0000 1.10 +++ src/roff/groff/Makefile.sub 29 Apr 2013 19:13:54 -0000 1.11 @@ -37,30 +37,31 @@ GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \ groff_opts_with_arg.txt -MOSTLYCLEANADD=$(GROFF_OPTS_OUTPUT) +MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT) RM=rm -f - -opts=`$(EGREP) -e ':.*:.*:' groff.cpp \ - | sed -e 's/[ \t",]//g')` - -opts_no_arg=`cat groff_opts_no_arg.txt` +EGREP=egrep .PHONY: all -all: groff.cpp $(GROFF_OPTS_OUTPUT) +all: groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT) + +groff_opts.tmp: groff.cpp + @$(EGREP) -e ':.*:.*:' $< \ + | sed -e 's/[ \t",]//g' > $@ + @echo -n 'groff options: ' + @cat $@ -groff_opts_no_arg.txt: groff.cpp +groff_opts_no_arg.txt: groff_opts.tmp @$(RM) $@ - @echo groff options: $(opts) - @echo $(opts) \ + @cat $< \ | sed -e 's/[a-zA-Z]://g' > $@ @echo -n 'no arg: ' @cat $@ groff_opts_with_arg.txt: groff_opts_no_arg.txt @$(RM) $@ - @echo $(opts) \ - | sed "s/[$(opts_no_arg):]//g" > $@ + @cat groff_opts.tmp \ + | sed "s/[`cat $<`:]//g" > $@ @echo -n 'with arg: ' @cat $@ From MAILER-DAEMON Mon Apr 29 20:40:47 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UWych-0006SN-7v for mharc-groff-commit@gnu.org; Mon, 29 Apr 2013 20:40:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWycd-0006Q5-3z for groff-commit@gnu.org; Mon, 29 Apr 2013 20:40:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWycb-0000ot-1U for groff-commit@gnu.org; Mon, 29 Apr 2013 20:40:43 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:39554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWyca-0000on-Tx for groff-commit@gnu.org; Mon, 29 Apr 2013 20:40:40 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UWyca-00084h-Cc for groff-commit@gnu.org; Tue, 30 Apr 2013 00:40:40 +0000 Date: Tue, 30 Apr 2013 00:40:40 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog Makefile.in configure configure... X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2013 00:40:46 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/30 00:40:40 Modified files: . : ChangeLog Makefile.in configure configure.ac contrib/glilypond: Makefile.sub glilypond.pl m4 : groff.m4 src/roff/groff : Makefile.sub Log message: Makefile.in, m4/groff.m4: Add `@libprogramdir@' and `$libprogramdir' (usually `/usr/local/lib/groff'). Change `$libdir/groff' into $libprogramdir for several `groff' programs. Run `autoreconf -I m4'. src/roff/groff/MAkefile.sub: Add $(DESTDIR) and $(srcdir) in order to support installation outside of source code. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1419&r2=1.1420 http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.130&r2=1.131 http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.95&r2=1.96 http://cvs.savannah.gnu.org/viewcvs/groff/configure.ac?cvsroot=groff&r1=1.53&r2=1.54 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.5&r2=1.6 http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.5&r2=1.6 http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.14&r2=1.15 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.11&r2=1.12 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1419 retrieving revision 1.1420 diff -u -b -r1.1419 -r1.1420 --- ChangeLog 29 Apr 2013 19:13:54 -0000 1.1419 +++ ChangeLog 30 Apr 2013 00:40:33 -0000 1.1420 @@ -1,3 +1,16 @@ +2013-04-30 Bernd Warken + + * Makefile.in, m4/groff.m4: Add `@libprogramdir@' and + `$libprogramdir' (usually `/usr/local/lib/groff'). Change + `$libdir/groff' into $libprogramdir for several `groff' programs. + Run `autoreconf -I m4'. + + * src/roff/groff/MAkefile.sub: Add $(DESTDIR) and $(srcdir) in + order to support installation outside of source code. + + * contrib/glilypond/Makefile.sub, contrib/glilypond/glilypond.pl: + Correct the install directories. + 2013-04-29 Bernd Warken * src/roff/groff/Makefile.sub: Replace some variables by shell Index: Makefile.in =================================================================== RCS file: /cvsroot/groff/groff/Makefile.in,v retrieving revision 1.130 retrieving revision 1.131 diff -u -b -r1.130 -r1.131 --- Makefile.in 16 Apr 2013 19:00:45 -0000 1.130 +++ Makefile.in 30 Apr 2013 00:40:35 -0000 1.131 @@ -2,7 +2,7 @@ # Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # -# Last update: 28 Mar 2013 +# Last update: 30 Apr 2013 # # This file is part of groff. # @@ -190,6 +190,7 @@ # gxditview. appresdir=@appresdir@ +libprogramdir=@libprogramdir@ groffer_dir=@groffer_dir@ glilypond_dir=@glilypond_dir@ grog_dir=@grog_dir@ Index: configure =================================================================== RCS file: /cvsroot/groff/groff/configure,v retrieving revision 1.95 retrieving revision 1.96 diff -u -b -r1.95 -r1.96 --- configure 26 Apr 2013 06:21:34 -0000 1.95 +++ configure 30 Apr 2013 00:40:36 -0000 1.96 @@ -744,7 +744,8 @@ PATH_SEPARATOR SHELL grog_dir -glilypond_dir' +glilypond_dir +libprogramdir' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -5519,6 +5520,8 @@ fi fi +libprogramdir=$libdir/groff + # Check whether --with-grofferdir was given. if test "${with_grofferdir+set}" = set; then : @@ -5526,14 +5529,14 @@ fi if test "x$with_grofferdir" = "x"; then - groffer_dir=$libdir/groff/groffer + groffer_dir=$libprogramdir/groffer else groffer_dir=$with_grofferdir fi -glilypond_dir=$libdir/groff/glilypond +glilypond_dir=$libprogramdir/glilypond -grog_dir=$libdir/groff/grog +grog_dir=$libprogramdir/grog { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } Index: configure.ac =================================================================== RCS file: /cvsroot/groff/groff/configure.ac,v retrieving revision 1.53 retrieving revision 1.54 diff -u -b -r1.53 -r1.54 --- configure.ac 14 Apr 2013 23:11:10 -0000 1.53 +++ configure.ac 30 Apr 2013 00:40:38 -0000 1.54 @@ -60,6 +60,7 @@ GROFF_X11 GROFF_APPRESDIR_OPTION GROFF_APPRESDIR_DEFAULT +GROFF_LIBPROGRAMDIR_DEFAULT GROFF_GROFFERDIR_OPTION GROFF_GROFFERDIR_DEFAULT GROFF_GLILYPONDDIR_DEFAULT Index: contrib/glilypond/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- contrib/glilypond/Makefile.sub 25 Apr 2013 22:37:58 -0000 1.5 +++ contrib/glilypond/Makefile.sub 30 Apr 2013 00:40:39 -0000 1.6 @@ -35,45 +35,47 @@ all: glilypond -GLILYPOND=$(srcdir)/glilypond.pl \ - $(srcdir)/subs.pl \ + +# files going to lib directory `$(glilypond_dir)' + +GLILYPOND_LIB=$(srcdir)/subs.pl \ $(srcdir)/oop_fh.pl \ $(srcdir)/args.pl -GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'` +GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'` + + +# create perl executable `glilypond', being stored into `bindir' -# TODO: Add perl check to configure script. -glilypond: $(GLILYPOND) +glilypond: $(srcdir)/glilypond.pl sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ - -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ $(srcdir)/glilypond.pl >$@ chmod +x $@ -install_data: glilypond - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) + +install_data: glilypond $(GLILYPOND_LIB) + -test -d $(DESTDIR)$(bindir) \ + || $(mkinstalldirs) $(DESTDIR)$(bindir) $(RM) $(DESTDIR)$(bindir)/$< $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/$< -test -d $(DESTDIR)$(glilypond_dir) \ || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ + $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f; \ done - for f in $(GLILYPOND_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f \ - $(DESTDIR)$(glilypond_dir)/$$f; \ - done + uninstall_sub: $(RM) $(DESTDIR)$(bindir)/glilypond; for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ done - -test -d $(DESTDIR)$(libdir)/groff/glilypond \ - && -rmdir $(DESTDIR)$(libdir)/groff/glilypond + -rmdir $(DESTDIR)$(glilypond_dir) ######################################################################## # Emacs settings Index: contrib/glilypond/glilypond.pl =================================================================== RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- contrib/glilypond/glilypond.pl 25 Apr 2013 00:21:14 -0000 1.5 +++ contrib/glilypond/glilypond.pl 30 Apr 2013 00:40:39 -0000 1.6 @@ -111,23 +111,16 @@ $Globals->{'before_make'} = TRUE if '@VERSION@' eq "${at}VERSION${at}"; } - my %at_at; my $file_test_pl; my $glilypond_libdir; if ( $Globals->{'before_make'} ) { # in source, not yet installed my $glilypond_dir = $FindBin::Bin; $glilypond_dir = Cwd::realpath($glilypond_dir); - $at_at{'BINDIR'} = $glilypond_dir; - $at_at{'G'} = ''; - $at_at{'LIBDIR'} = ''; $glilypond_libdir = $glilypond_dir; } else { # already installed $Globals->{'groff_version'} = '@VERSION@'; - $at_at{'BINDIR'} = '@BINDIR@'; - $at_at{'G'} = '@g@'; - $at_at{'LIBDIR'} = '@libdir@'; $glilypond_libdir = '@glilypond_dir@'; } Index: m4/groff.m4 =================================================================== RCS file: /cvsroot/groff/groff/m4/groff.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- m4/groff.m4 16 Apr 2013 19:00:47 -0000 1.14 +++ m4/groff.m4 30 Apr 2013 00:40:39 -0000 1.15 @@ -1252,18 +1252,23 @@ AC_DEFUN([GROFF_GROFFERDIR_DEFAULT], [if test "x$with_grofferdir" = "x"; then - groffer_dir=$libdir/groff/groffer + groffer_dir=$libprogramdir/groffer else groffer_dir=$with_grofferdir fi AC_SUBST([groffer_dir])]) +AC_DEFUN([GROFF_LIBPROGRAMDIR_DEFAULT], + libprogramdir=$libdir/groff + AC_SUBST([libprogramdir])) + + AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT], - glilypond_dir=$libdir/groff/glilypond + glilypond_dir=$libprogramdir/glilypond AC_SUBST([glilypond_dir])) AC_DEFUN([GROFF_GROGDIR_DEFAULT], - grog_dir=$libdir/groff/grog + grog_dir=$libprogramdir/grog AC_SUBST([grog_dir])) Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- src/roff/groff/Makefile.sub 29 Apr 2013 19:13:54 -0000 1.11 +++ src/roff/groff/Makefile.sub 30 Apr 2013 00:40:40 -0000 1.12 @@ -40,12 +40,11 @@ MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT) RM=rm -f -EGREP=egrep .PHONY: all -all: groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT) +all: $(CCSRCS) groff_opts.tmp $(GROFF_OPTS_OUTPUT) -groff_opts.tmp: groff.cpp +groff_opts.tmp: $(CCSRCS) @$(EGREP) -e ':.*:.*:' $< \ | sed -e 's/[ \t",]//g' > $@ @echo -n 'groff options: ' From MAILER-DAEMON Tue Apr 30 12:15:59 2013 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UXDDj-00055s-RV for mharc-groff-commit@gnu.org; Tue, 30 Apr 2013 12:15:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXDDd-00053x-GW for groff-commit@gnu.org; Tue, 30 Apr 2013 12:15:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXDDY-0003xn-Jl for groff-commit@gnu.org; Tue, 30 Apr 2013 12:15:53 -0400 Received: from vcs.savannah.gnu.org ([140.186.70.72]:33404) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXDDY-0003xh-DC for groff-commit@gnu.org; Tue, 30 Apr 2013 12:15:48 -0400 Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72) (envelope-from ) id 1UXDDT-00082b-MR for groff-commit@gnu.org; Tue, 30 Apr 2013 16:15:45 +0000 Date: Tue, 30 Apr 2013 16:15:44 +0000 Message-Id: To: groff-commit@gnu.org From: Bernd Warken X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.72 Subject: [Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2013 16:15:59 -0000 CVSROOT: /cvsroot/groff Module name: groff Changes by: Bernd Warken 13/04/30 16:15:43 Modified files: . : ChangeLog src/roff/groff : Makefile.sub Log message: src/roff/groff/Makefile.sub: Use $(GREP) instead of `egrep'. Don't use `$(CCSRCS)' any more as prerequisits.. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1420&r2=1.1421 http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.12&r2=1.13 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/groff/groff/ChangeLog,v retrieving revision 1.1420 retrieving revision 1.1421 diff -u -b -r1.1420 -r1.1421 --- ChangeLog 30 Apr 2013 00:40:33 -0000 1.1420 +++ ChangeLog 30 Apr 2013 16:15:35 -0000 1.1421 @@ -1,5 +1,10 @@ 2013-04-30 Bernd Warken + * src/roff/groff/Makefile.sub: Replace `egrep' by `$(GREP)'. + commands. Don't use $(CCSRCS) any more. + +2013-04-30 Bernd Warken + * Makefile.in, m4/groff.m4: Add `@libprogramdir@' and `$libprogramdir' (usually `/usr/local/lib/groff'). Change `$libdir/groff' into $libprogramdir for several `groff' programs. Index: src/roff/groff/Makefile.sub =================================================================== RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- src/roff/groff/Makefile.sub 30 Apr 2013 00:40:40 -0000 1.12 +++ src/roff/groff/Makefile.sub 30 Apr 2013 16:15:41 -0000 1.13 @@ -42,10 +42,10 @@ RM=rm -f .PHONY: all -all: $(CCSRCS) groff_opts.tmp $(GROFF_OPTS_OUTPUT) +all: $(srcdir)/groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT) -groff_opts.tmp: $(CCSRCS) - @$(EGREP) -e ':.*:.*:' $< \ +groff_opts.tmp: $(srcdir)/cpp + @$(GREP) -e ':.*:.*:' $< \ | sed -e 's/[ \t",]//g' > $@ @echo -n 'groff options: ' @cat $@