Index: ChangeLog =================================================================== RCS file: /cvsroot/xforms/xforms/ChangeLog,v retrieving revision 1.54 diff -u -p -r1.54 ChangeLog --- ChangeLog 18 Nov 2003 22:21:05 -0000 1.54 +++ ChangeLog 19 Nov 2003 11:35:58 -0000 @@ -1,3 +1,17 @@ +2003-11-19 Jean-Marc Lasgouttes + + * config/xformsinclude.m4 (XFORMS_PATH_XPM): honor X_CFLAGS to + find xpm.h (should fix problem reported by Reed Riddle) + + * README: update. In particular, the acknowledgement of copyright + has been removed since the code is not here anymore (and the + advertising clause is not needed anymore). Try to point to the new + nongnu.org site. + + * Makefile.am (dist-hook): remove old leftover from LyX + + * lib/signal.c (default_signal_handler): fix typo + 2003-11-14 Jean-Marc Lasgouttes * config/config.guess: Index: Copyright =================================================================== RCS file: /cvsroot/xforms/xforms/Copyright,v retrieving revision 1.2 diff -u -p -r1.2 Copyright --- Copyright 9 Sep 2003 00:28:24 -0000 1.2 +++ Copyright 19 Nov 2003 11:35:58 -0000 @@ -4,5 +4,5 @@ Copyright (c) 1996-2000 by T.C. Zhao and Parts Copyright (c) 1999-2002 T.C. Zhao and Steve Lamont ALL RIGHTS RESERVED. -See the file COPYING for your rights. +See the file COPYING.LIB for your rights. Index: Makefile.am =================================================================== RCS file: /cvsroot/xforms/xforms/Makefile.am,v retrieving revision 1.4 diff -u -p -r1.4 Makefile.am --- Makefile.am 3 Oct 2003 08:52:51 -0000 1.4 +++ Makefile.am 19 Nov 2003 11:35:58 -0000 @@ -22,15 +22,11 @@ endif SUBDIRS = config lib image $(GL) fd2ps fdesign $(DEMOS) -EXTRA_DIST = ChangeLog COPYING.LIB Copyright README README.OS2 \ +EXTRA_DIST = ChangeLog COPYING.LIB Copyright INSTALL README README.OS2 \ autogen.sh xforms.spec.in xforms.spec # Hack so that the targets that use tar will also work with automake 1.4 AMTAR ?= $(TAR) - -dist-hook: - cd $(distdir) ; \ - rm -rf `find images -name \*CVS\*` rpmdist: dist if [ -z "`type -path rpmbuild`" ]; \ Index: README =================================================================== RCS file: /cvsroot/xforms/xforms/README,v retrieving revision 1.1 diff -u -p -r1.1 README --- README 30 May 2003 09:35:44 -0000 1.1 +++ README 19 Nov 2003 11:35:58 -0000 @@ -3,17 +3,34 @@ This is the Open Source distribution of the XForms Library, a graphical user interface toolkit for X Window Systems. -It should work under X11 R4, R5 & R6. XForms is free. It is licensed -under the LGPL (Lesser Gnu Public License) version 2.1. See the file -COPYING.LIB for the gory details. +It should work under X11 R4, R5 & R6. XForms is free software. It is +licensed under the LGPL (Lesser Gnu Public License) version 2.1. See +the file COPYING.LIB for the gory details. + + - - - + +What's new? + + Read NEWS. + +Documentation on XForms is available from ncmir.ucsd.edu /pub/xforms +via anonymous ftp. + +The entire XForms distribution plus the latest info is accessible via +http://www.nongnu.org/xforms/ + + - - - What do I need to compile xforms from the source distribution? - * You should be able to compile xforms on any 'reasonable' flavour of - unix. - * LibXpm, version 4.7 or newer. +You should be able to compile xforms on any 'reasonable' flavour of +unix. -get it from ftp://avahi.inria.fr/pub/xpm or ftp://ftp.x.org/contrib. +xforms relies on several other libraries, namely + + * libXpm, version 4.7 or newer. + * libjpeg, 6.0b or newer. + * libGL (optional) What's new? @@ -23,28 +40,17 @@ Documentation on XForms is available fro via anonymous ftp. The entire XForms distribution plus the latest info is accessible via -http://world.std.com/~xforms +http://www.nongnu.org/xforms/ - - - This Open Source distribution is available at - + If you would like to act as a mirror for this distribution, please feel free to do so. -The binary distributions of XForms will at some time in the future be -deleted from the server. Effective immediately, they are considered -unmaintained deprecated versions. - - - - - - -The strtod() function code is Copyright The Regents of -the University of California and derived from software contributed to -Berkeley by Chris Torek and is distributed as per the licensing -therein. - - - - There is a mailing list for XForms. Send a message to @@ -54,6 +60,9 @@ xforms-request@bob.usuhs.mil with one of unsubscribe xforms to get on and off the list. + +You can also use a web interface here: +http://cweblog.usuhs.mil/mailman/listinfo/xforms To use the mailing list, send your message to xforms@bob.usuhs.mil Index: config/xformsinclude.m4 =================================================================== RCS file: /cvsroot/xforms/xforms/config/xformsinclude.m4,v retrieving revision 1.4 diff -u -p -r1.4 xformsinclude.m4 --- config/xformsinclude.m4 9 Sep 2003 16:08:49 -0000 1.4 +++ config/xformsinclude.m4 19 Nov 2003 11:35:58 -0000 @@ -46,6 +46,8 @@ AC_SUBST(XPM_LIB) LIBS="$SAVE_LIBS" ### Check for Xpm headers +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" xforms_cv_xpm_h_location="" AC_CHECK_HEADER(X11/xpm.h,[ ac_cv_header_xpm_h=yes @@ -54,6 +56,7 @@ AC_CHECK_HEADER(xpm.h,[],[ XFORMS_LIB_ERROR(xpm.h,Xpm)])]) AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$xforms_cv_xpm_h_location, [define this to the location of xpm.h to be used with #include, e.g. ]) +CPPFLAGS="$SAVE_CPPFLAGS" ### Test for the header version if test $ac_cv_header_xpm_h = yes; then Index: lib/signal.c =================================================================== RCS file: /cvsroot/xforms/xforms/lib/signal.c,v retrieving revision 1.6 diff -u -p -r1.6 signal.c --- lib/signal.c 8 Sep 2003 23:48:36 -0000 1.6 +++ lib/signal.c 19 Nov 2003 11:35:58 -0000 @@ -78,7 +78,7 @@ default_signal_handler(int sig) exit(sig); } -#if RETSYGTYPE != void +#if RETSIGTYPE != void return 0; #endif }