diff -Naur wfdb-10.3.2/INSTALL wfdb-10.3.3/INSTALL --- wfdb-10.3.2/INSTALL Wed Jun 19 22:07:30 2002 +++ wfdb-10.3.3/INSTALL Wed Mar 19 12:08:33 2003 @@ -1,15 +1,22 @@ file: INSTALL G. Moody 30 January 2000 - Last revised: 19 June 2002 + Last revised: 19 March 2003 WFDB Software Package installation notes -These notes are included here for those who may not have ready access to the -World Wide Web. For those who do, please visit PhysioNet, where quick-start -guides including installation notes for popular operating systems are available -(see http://www.physionet.org/physiotools/wfdb.shtml). +These notes are infrequently updated, but are included here for those who may +not have ready access to the World Wide Web. For those who do, please visit +PhysioNet, where up-to-date quick-start guides including installation notes +for popular operating systems are available (find a guide for your platform in +http://www.physionet.org/physiotools/wfdb.shtml). +This file contains separate sets of notes for UNIX and GNU/Linux, Mac OS/X, +and MS-Windows, followed by brief notes on other ports. + +Once you have successfully compiled and installed the WFDB Software Package, +you will find a great deal of information about using it on PhysioNet; begin +by looking in http://www.physionet.org/physiotools/manuals.shtml. _______________________________________________________________________________ -Under UNIX or Linux: +Under UNIX or GNU/Linux: 1. Install the World Wide Web Consortium's libwww library (you will need both the library itself and the developer's package; download them from @@ -20,9 +27,10 @@ 2. WAVE is an optional part of the WFDB Software Package. If the XView toolkit is available for your system, installing WAVE is highly recommended. - Otherwise, go on to step 3; after completing the WFDB software package + Otherwise, go on to step 3; after completing the WFDB Software Package installation, you may wish to try GTKWave (an experimental version of WAVE - that uses the GTK+ GUI, which is available for many other versions of Unix). + that uses the GTK+ GUI, which is available for many versions of Unix; see + http://www.physionet.org/physiotools/beta/gtkwave/ for more information.) Install the XView library (see http://www.physionet.org/physiotools/xview/) if you want to use WAVE, and be sure that the directory that contains the @@ -45,13 +53,59 @@ WFDBROOT so that the files are installed in a directory that you own (you will be given a chance to do this when running 'configure'). -4. If for any reason you wish to uninstall the WFDB Software Package, type: +4. [Optional but recommended] In this directory, test the installation by + typing: + make check + If there are any errors, look in the checkpkg directory for details. + + If libwww and XView are installed, you can also test WAVE with the command: + wave -r mitdb/200 -a atr + If WAVE opens with a blank (solid white) signal window, you may need to + enable backing store in your X server. If you use XFree86 as your X server, + you can insert the line + Option "backingstore" + in the Device section of your XF86Config (or XF86Config-4), or run the + server with the option "+bs" to obtain the same result. + +5. If for any reason you wish to uninstall the WFDB Software Package, type: make uninstall from this directory. You will need root permissions to uninstall unless you changed WFDBROOT before installing the package. _______________________________________________________________________________ +Under Mac OS/X (Darwin): + +The WFDB Software Package has been successfully compiled under Mac OS/X 10.2 +(Darwin 6.0.1). It should also work under 10.1, but this has not been tested. + +1. Install Mac OS/X Developer Tools (requires root permissions). This + software can be downloaded from http://developer.apple.com/macosx/). This + software is also available on a CD-ROM included with Mac OS/X. + +2. [Optional but recommended, requires root permissions] Install XDarwin. + This port of the X Window System (server, clients, and libraries) is needed + if you wish to use plt together with the WFDB Software Package, or if you + wish to compile WAVE or GTKWave (but see the next item below). XDarwin + binaries are available from Fink, http://fink.sourceforge.net/; sources are + available from http://www.xdarwin.org/. + +3. [Optional, requires root permissions] Install XView. At this time, an + incomplete port of XView to Darwin is available from the GNU-Darwin project + (http://gnu-darwin.sourceforge.net/). You may wish to see if a complete + XView port is available; if so, it should be possible to compile WAVE under + Mac OS/X as part of the installation of the WFDB Software Package. + * You will not be able to compile or use WAVE unless you have installed + XView, but none of the other applications require XView. + * Add /usr/X11R6/bin (or the directory containing textedit, if you have a + non-standard installation of XView) to your PATH before attempting to + compile WAVE. + +Once you have completed these steps, follow the instructions above for +installing the WFDB Software Package under UNIX or GNU/Linux. + +_______________________________________________________________________________ + Under MS-Windows: 1. If you have not already done so, install the Cygwin development environment @@ -63,39 +117,44 @@ See the notes near the end of this section for information contributed by users about using proprietary compilers. -2. Download http://www.physionet.org/physiotools/binaries/windows/bin/which.exe - and put it into a directory in your PATH. (This utility is needed by - 'configure' in a later step. The sources for which.exe are available within - http://www.physionet.org/physiotools/utilities/.) - -3. Open a Cygwin terminal window (the Cygwin installer will have added this to +2. Open a Cygwin terminal window (the Cygwin installer will have added this to your MS-Windows start menu). Check that 'which' and 'gcc' are accessible by typing the command: which gcc The output of this command should be: /usr/bin/gcc - If you don't see this output, repeat steps 1 and 2 above as necessary to - correct the problem before continuing. + If you don't see this output, rerun the Cygwin installer and manually select + the necessary packages to correct the problem before continuing. -4. Install the World Wide Web Consortium's libwww library (you will need both +3. Install the World Wide Web Consortium's libwww library (you will need both the library itself and the developer's package; download them from http://www.physionet.org/physiotools/libwww/, or from the W3C's web site at http://www.w3.org/Library). You may skip this step if you don't want support for reading input files from remote web and FTP servers. See README.NETFILES for further information about this option. -5. In this directory (the top-level directory of the WFDB software package, +4. In this directory (the top-level directory of the WFDB software package, containing the file you are now reading), type: ./configure make install -6. If for any reason you wish to uninstall the WFDB Software Package, type: +5. [Optional but recommended] In this directory, test the installation by + typing: + make check + If there are any errors, look in the checkpkg directory for details. + +6. After completing these steps, you may wish to install GTKWave (an + experimental version of WAVE that uses the GTK+ GUI, which is available for + MS-Windows; see http://www.physionet.org/physiotools/beta/gtkwave/ for + more information.) + +7. If for any reason you wish to uninstall the WFDB Software Package, type: make uninstall from this directory. ............................................................................... -Using proprietary compilers +Using proprietary compilers under MS-DOS/MS-Windows IMPORTANT: Although you may be able to compile the WFDB software package using a proprietary compiler, this is NOT SUPPORTED. Cygwin 'gcc' is free, @@ -103,7 +162,7 @@ If, despite the above, you feel that you must use a proprietary compiler, this section contains notes contributed by other users who have done so. - The developers of the WFDB software package do not use any of these + The developers of the WFDB Software Package do not use any of these compilers, so you are on your own if you choose to use one of them. Between 1985 and 1995, previous versions of this software were compiled @@ -131,7 +190,7 @@ _______________________________________________________________________________ -Under MacOS or other operating systems +Under MacOS 9 and earlier, or other operating systems Sorry, but you are on your own here. Previous versions of the WFDB library and some of the applications have been compiled successfully by Macintosh @@ -139,17 +198,19 @@ highly portable C and should not be difficult to port to any environment where an ANSI/ISO or K&R C compiler and the standard C library are available. -Several users have reported that the WFDB library and the applications in the -'app' directory can be compiled successfully using cc (gcc) under MacOS/X -(Darwin). +Often vendors of proprietary compilers and operating systems provide little or +no documentation about how to build libraries (especially shared/dynamically +linked libraries), although there may be clear and simple instructions for +compiling C programs that use the vendor's own libraries only. If this +describes your situation, you may find it easiest to compile the WFDB library +sources as ordinary source files together with the programs that use the WFDB +library functions. This approach won't yield the benefits of reduced +compilation time and reduced executable size available on platforms that +support shared libraries, but it should allow you to compile and run the WFDB +software with a minimum of difficulty. If you find that changes are necessary in order to compile this software -successfully, please send details to the author (george@mit.edu) so that -others can benefit from your experience. Contributions of working binaries -are welcome, but please write first before sending them to me. Thanks! - -_______________________________________________________________________________ - -Once you have successfully compiled and installed the WFDB Software Package, -you will find a great deal of information about using it on PhysioNet; begin -looking in http://www.physionet.org/physiotools/wfdb-books.shtml. +successfully on your platform, please send details to the author +(george@mit.edu) so that others can benefit from your experience. +Contributions of working binaries are welcome, but please write first before +sending them to me. Thanks! diff -Naur wfdb-10.3.2/Makefile wfdb-10.3.3/Makefile --- wfdb-10.3.2/Makefile Mon Feb 24 00:53:28 2003 +++ wfdb-10.3.3/Makefile Wed Mar 19 17:33:37 2003 @@ -39,12 +39,12 @@ # create source archives, type `make tarballs'; or to make a binary archive, # type `make bin-tarball'. Making archives requires PGP, gzip, and GNU tar). # file: version.def G. Moody 24 May 2000 -# Last revised: 23 February 2003 +# Last revised: 19 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 2 +RELEASE = 3 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -61,13 +61,13 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.2 -LONGDATE = 24 February 2003 -SHORTDATE = FEBRUARY 2003 +PACKAGE = wfdb-10.3.3 +LONGDATE = 19 March 2003 +SHORTDATE = MARCH 2003 # _____________________________________________________________________________ # file: linux.def G. Moody 31 May 2000 -# Last revised: 23 February 2003 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Linux # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -119,6 +119,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/share/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/NEWS wfdb-10.3.3/NEWS --- wfdb-10.3.2/NEWS Wed Feb 19 22:44:49 2003 +++ wfdb-10.3.3/NEWS Wed Mar 19 12:10:21 2003 @@ -1,3 +1,9 @@ +10.3.3: + Fixed man page installation bug; thanks to Joe Mietus for the bug + report. + + Updated INSTALL (installation notes). + 10.3.2: New applications wav2mit and mit2wav create WFDB-format records from files in the widely-used .wav audio format and vice versa. diff -Naur wfdb-10.3.2/app/Makefile wfdb-10.3.3/app/Makefile --- wfdb-10.3.2/app/Makefile Mon Feb 24 00:53:28 2003 +++ wfdb-10.3.3/app/Makefile Wed Mar 19 17:33:37 2003 @@ -33,12 +33,12 @@ # type `make listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 23 February 2003 +# Last revised: 19 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 2 +RELEASE = 3 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -55,13 +55,13 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.2 -LONGDATE = 24 February 2003 -SHORTDATE = FEBRUARY 2003 +PACKAGE = wfdb-10.3.3 +LONGDATE = 19 March 2003 +SHORTDATE = MARCH 2003 # _____________________________________________________________________________ # file: linux.def G. Moody 31 May 2000 -# Last revised: 23 February 2003 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Linux # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -113,6 +113,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/share/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/checkpkg/Makefile wfdb-10.3.3/checkpkg/Makefile --- wfdb-10.3.2/checkpkg/Makefile Mon Feb 24 00:53:28 2003 +++ wfdb-10.3.3/checkpkg/Makefile Wed Mar 19 17:33:37 2003 @@ -31,12 +31,12 @@ # directory). To print a set of source listings, type `make listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 23 February 2003 +# Last revised: 19 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 2 +RELEASE = 3 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -53,13 +53,13 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.2 -LONGDATE = 24 February 2003 -SHORTDATE = FEBRUARY 2003 +PACKAGE = wfdb-10.3.3 +LONGDATE = 19 March 2003 +SHORTDATE = MARCH 2003 # _____________________________________________________________________________ # file: linux.def G. Moody 31 May 2000 -# Last revised: 23 February 2003 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Linux # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -111,6 +111,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/share/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/cygwin.def wfdb-10.3.3/conf/cygwin.def --- wfdb-10.3.2/conf/cygwin.def Wed Dec 18 14:33:17 2002 +++ wfdb-10.3.3/conf/cygwin.def Wed Mar 19 18:03:31 2003 @@ -1,5 +1,5 @@ # file: cygwin.def G. Moody 6 June 2000 -# Last revised: 18 December 2002 +# Last revised: 4 March 2003 # # This file contains default 'make' definitions for compiling the WFDB Software # Package under MS Windows using the free Cygwin/gcc ANSI C compiler, available @@ -50,12 +50,16 @@ INCDIR = $(WFDBROOT)/include # INFODIR is the GNU info directory (optional, needed to `make info'). -INFODIR = /usr/info +INFODIR = $(WFDBROOT)/info # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man + # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. PSPDIR = /usr/lib/ps @@ -141,7 +145,7 @@ SETLPERMISSIONS = chmod 644 # SETXPERMISSIONS is the command needed to make the applications accessible. -SETXPERMISSIONS = ../conf/exechmod 755 +SETXPERMISSIONS = chmod 755 # STRIP is the command used to compact the compiled binaries by removing their # symbol tables. 'exestrip' is a script that appends the '.exe' suffix to the diff -Naur wfdb-10.3.2/conf/darwin.def wfdb-10.3.3/conf/darwin.def --- wfdb-10.3.2/conf/darwin.def Wed Dec 18 14:31:44 2002 +++ wfdb-10.3.3/conf/darwin.def Tue Mar 4 15:33:14 2003 @@ -1,5 +1,5 @@ # file: darwin.def G. Moody and I. Henry 14 November 2002 -# Last revised: 18 December 2002 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Darwin # # Based on 'freebsd.def'. @@ -48,11 +48,15 @@ INCDIR = $(WFDBROOT)/include # INFODIR is the GNU info directory (optional, needed to `make info'). -INFODIR = /usr/local/info +INFODIR = $(WFDBROOT)/info # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/freebsd.def wfdb-10.3.3/conf/freebsd.def --- wfdb-10.3.2/conf/freebsd.def Wed Dec 18 14:32:10 2002 +++ wfdb-10.3.3/conf/freebsd.def Tue Mar 4 15:37:31 2003 @@ -1,5 +1,5 @@ # file: freebsd.def G. Moody 5 March 2002 -# Last revised: 18 December 2002 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under FreeBSD # # Based on 'linux.def', with edits for FreeBSD thanks to Giuseppe Pagnoni. @@ -48,11 +48,15 @@ INCDIR = $(WFDBROOT)/include # INFODIR is the GNU info directory (optional, needed to `make info'). -INFODIR = /usr/local/info +INFODIR = $(WFDBROOT)/info # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/generic.def wfdb-10.3.3/conf/generic.def --- wfdb-10.3.2/conf/generic.def Wed Dec 18 14:32:29 2002 +++ wfdb-10.3.3/conf/generic.def Tue Mar 4 15:34:53 2003 @@ -1,5 +1,5 @@ # file: generic.def G. Moody 31 May 2000 -# Last revised: 18 December 2002 +# Last revised: 4 March 2003 # This file contains default 'make' definitions for compiling the WFDB Software # Package under versions of UNIX that are not otherwise recognized by # 'configure'. @@ -67,6 +67,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/hpux.def wfdb-10.3.3/conf/hpux.def --- wfdb-10.3.2/conf/hpux.def Wed Dec 18 14:33:39 2002 +++ wfdb-10.3.3/conf/hpux.def Tue Mar 4 15:34:11 2003 @@ -1,5 +1,5 @@ # file: hpux.def G. Moody 31 May 2000 -# Last revised: 18 December 2001 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB library under HP-UX # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -59,6 +59,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/linux.def wfdb-10.3.3/conf/linux.def --- wfdb-10.3.2/conf/linux.def Sun Feb 23 22:54:19 2003 +++ wfdb-10.3.3/conf/linux.def Tue Mar 4 15:32:57 2003 @@ -1,5 +1,5 @@ # file: linux.def G. Moody 31 May 2000 -# Last revised: 23 February 2003 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Linux # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -51,6 +51,10 @@ # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/share/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/solaris.def wfdb-10.3.3/conf/solaris.def --- wfdb-10.3.2/conf/solaris.def Wed Dec 18 14:34:11 2002 +++ wfdb-10.3.3/conf/solaris.def Tue Mar 4 15:39:59 2003 @@ -1,5 +1,5 @@ # file: solaris.def G. Moody 31 May 2000 -# Last revised: 18 December 2002 +# Last revised: 4 March 2003 # 'make' definitions for compiling the WFDB Software Package under Solaris # Choose a value for WFDBROOT to determine where the WFDB Software Package will @@ -51,11 +51,15 @@ # applications). # INFODIR is the GNU info directory (optional, needed to `make info'). -INFODIR = /usr/local/info +INFODIR = $(WFDBROOT)/info # LIBDIR specifies the name of a directory in which to install the WFDB # library. LIBDIR = $(WFDBROOT)/lib + +# MANDIR is the root of the man page directory tree. On most systems, this is +# something like /usr/man or /usr/local/man (type 'man man' to find out). +MANDIR = $(WFDBROOT)/man # PSPDIR specifies the name of a directory in which to install the PostScript # prolog (*.pro) files from the 'app' directory. diff -Naur wfdb-10.3.2/conf/version.def wfdb-10.3.3/conf/version.def --- wfdb-10.3.2/conf/version.def Sun Feb 23 11:42:48 2003 +++ wfdb-10.3.3/conf/version.def Wed Mar 19 12:09:16 2003 @@ -1,10 +1,10 @@ # file: version.def G. Moody 24 May 2000 -# Last revised: 23 February 2003 +# Last revised: 19 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 2 +RELEASE = 3 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official diff -Naur wfdb-10.3.2/configure wfdb-10.3.3/configure --- wfdb-10.3.2/configure Wed Dec 18 14:47:50 2002 +++ wfdb-10.3.3/configure Wed Mar 19 13:48:24 2003 @@ -1,6 +1,6 @@ #! /bin/sh # file: configure G. Moody 24 May 2000 -# Last revised: 18 December 2002 +# Last revised: 19 March 2003 # Configuration script for the WFDB Software Package # This script was not generated using 'autoconf'. If you can implement @@ -19,6 +19,7 @@ do case $i in --dynamic) LIBTYPE=dynamic ;; + --mandir=*) MANDIR=`echo $i | sed 's/[-a-zA-Z0-9]*=//'` ;; --prefix=*) DIR=`echo $i | sed 's/[-a-zA-Z0-9]*=//'` ;; --shared) LIBTYPE=dynamic ;; --static) LIBTYPE=static ;; @@ -30,6 +31,7 @@ --dynamic make a shared (dynamically linkable) WFDB library if possible [default] --help print this message + --mandir=MANDIR install man pages in MANDIR --prefix=PREFIX install files in PREFIX [default: $DIR] --shared (same as --dynamic) --static make a static WFDB library (do not make a shared @@ -109,7 +111,7 @@ echo echo "The WFDB library may be compiled as a static library or as a" echo "dynamically loaded (shared) library (the default). Type S for a" - conf/prompt "static library, or D for a dynamically loaded library: " " " + conf/prompt "static library, or D for a dynamically loaded library:" read LIBTYPE fi else @@ -136,7 +138,7 @@ echo "libraries only may cause compilation to fail if your" echo "system does not have a complete set of static libraries." echo "Type S to link to static libraries only, or D to link to" - conf/prompt "dynamically loaded libraries where available: " "" + conf/prompt "dynamically loaded libraries where available:" read SYSLIBS fi case x$SYSLIBS in @@ -153,12 +155,23 @@ fi echo -conf/prompt "Looking for the C compiler ..." "" -if ( which gcc 2>&1 | grep "no \|not " >/dev/null ) +conf/prompt "Looking for the C compiler ..." +WCC=`which gcc 2>&1` +if [ "x$WCC" = "x" ] then - if (which cc 2>&1 | grep "no \|not " >/dev/null ) + WCC="no gcc" +fi +if ( echo $WCC | grep "no \|not " >/dev/null ) +then + WCC=`which cc 2>&1` + if [ "x$WCC" = "x" ] then - echo + WCC="no cc" + fi + if ( echo $WCC | grep "no \|not " >/dev/null ) + then + echo "not found" + echo echo "The WFDB software cannot be compiled, because there does not" echo "appear to be a C compiler installed on this system. Please" echo "install one, be sure that it is in your PATH, and that it is" @@ -192,7 +205,7 @@ DIR= while [ x$DIR = x ] do - conf/prompt "Choose a location, or press to install in /usr: " "" + conf/prompt "Choose a location, or press to install in /usr:" read DIR case x$DIR in x/usr) ;; @@ -206,8 +219,6 @@ done fi -echo "The WFDB software will be installed in '$DIR'." - case $DIR in /usr) ;; /*) sed "s+^WFDBROOT = /usr+WFDBROOT = $DIR+" conf/site.tmp @@ -216,11 +227,57 @@ >conf/site.tmp mv conf/site.tmp conf/site-slib.def esac - + +echo "The WFDB software will be installed in '$DIR'." + +MANTMP=`grep "MANDIR =" conf/site.def |sed 's+$(WFDBROOT)/++' |cut -d " " -f 3` +MANDEF=$DIR/$MANTMP +if [ x$MANDIR = x ] +then + echo + echo "Where do you wish to install the manual pages?" + echo "They will be installed in subdirectories of MANDIR (by default," + echo "MANDIR is '$MANDEF'). If you install them in a non-standard" + echo "directory, you will need to add that directory to your MANPATH." + echo "The value of MANDIR must be a full pathname (beginning with '/'," + echo "but without a '/' at the end). If the subdirectories (man1, man3," + echo "man5, ...) of MANDIR don't exist, they will be created as necessary." + echo + DIR= + while [ x$MANDIR = x ] + do + conf/prompt "Choose a location, or press to install in $MANDEF:" + read MANDIR + case x$MANDIR in + x/usr) ;; + x) MANDIR=$MANDEF ;; + x*/) MANDIR= + echo "Please type the path again, omitting the '/' at the end." ;; + x/*) ;; + x*) MANDIR= + echo "Please enter an absolute pathname, beginning with '/'." ;; + esac + done +fi + +if [ "$MANDIR" != "$MANDEF" ] +then + sed "s+^MANDIR = $MANDEF+MANDIR = $MANDIR+" conf/site.tmp + mv conf/site.tmp conf/site.def +fi + +echo "The manual pages will be installed in '$MANDIR'." + echo -echo "Looking for libwww ..." -if ( which libwww-config 2>&1 | grep "no \|not " >/dev/null ) +conf/prompt "Looking for libwww ..." +WLC=`which libwww-config 2>&1` +if [ "x$WLC" = "x" ] +then + WLC="no libwww-config" +fi +if ( echo $WLC | grep "no \|not " >/dev/null ) then + echo "not found" echo "The WFDB software will be compiled without NETFILES access, because" echo "libwww does not appear to be installed on this system." echo "To add NETFILES access, install libwww and run ./configure again." @@ -232,6 +289,7 @@ sed "s/WFDB_NETFILES 1/WFDB_NETFILES 0/" lib/wfdb.h WITHNF=without else + echo "found" echo "The WFDB software will be compiled with NETFILES access." echo "NETFILES=1" >config.cache sed "s/LWC = :/LWC = libwww-config/" conf/site.tmp @@ -272,7 +330,12 @@ sed "s+DBDIR+$DIR/database+" lib/wfdblib.h echo -echo "Looking for the XView libraries ..." +conf/prompt "Looking for the XView libraries ..." +TEXTEDIT=`which textedit 2>&1` +if [ "x$TEXTEDIT" = "x" ] +then + TEXTEDIT="no textedit" +fi if [ -d /usr/openwin ] then WAVE=1; @@ -286,12 +349,11 @@ WAVE=1; sed "s+/usr/openwin+/opt/openwin+" tmp.$$ mv tmp.$$ wave/Makefile -elif ( which textedit 2>&1 | grep "no \|not " >/dev/null ) +elif ( echo $TEXTEDIT | grep "no \|not " >/dev/null ) then WAVE=0; else WAVE=1; - TEXTEDIT=`which textedit`; TEDIR=`dirname $TEXTEDIT`; OWHOME=`dirname $TEDIR`; sed "s+/usr/openwin+$OWHOME+" tmp.$$ @@ -299,6 +361,7 @@ fi if [ $WAVE = 0 ] then + echo "not found" echo "WAVE will not be compiled, because the XView libraries do not" echo "appear to be installed on this system." echo "To compile WAVE, install XView, add the directory containing the" @@ -308,6 +371,7 @@ echo "WAVE=0" >>config.cache WAVECOMP="WAVE will not be compiled." else + echo "found" WAVECOMP="WAVE will be compiled and installed in '$DIR/bin'." echo "WAVE=1" >>config.cache fi @@ -352,7 +416,6 @@ echo " george@mit.edu" fi - cat < Requires: w3c-libwww >= 5.2 Requires: w3c-libwww-devel >= 5.2 BuildRoot: /var/tmp/%{name}-root %changelog +* Wed Mar 19 2003 George B Moody +- added --mandir to build, fixed linking in post + * Wed Dec 18 2002 George B Moody - split into wfdb, wfdb-devel, wfdb-app, wfdb-wave, wfdb-doc subpackages @@ -26,7 +31,7 @@ %setup %build -PATH=$PATH:/usr/openwin/bin ./configure --prefix=/usr +PATH=$PATH:/usr/openwin/bin ./configure --prefix=/usr --mandir=%{_mandir} make # The 'make' command above actually *installs* the WFDB library and its *.h @@ -57,7 +62,9 @@ rm -rf $RPM_BUILD_ROOT make clean -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +test -e /usr/lib/libwfdb.so.10 -a ! -e /usr/lib/libwfdb.so && ln -s /usr/lib/libwfdb.so.10 /usr/lib/libwfdb.so %postun -p /sbin/ldconfig @@ -83,6 +90,7 @@ %package devel Summary: WFDB developer's toolkit Group: Development/Libraries +URL: http://www.physionet.org/physiotools/wpg/ Requires: wfdb = VERSION %description devel