Index: ChangeLog =================================================================== RCS file: /cvsroot/xforms/xforms/ChangeLog,v retrieving revision 1.83 diff -u -p -r1.83 ChangeLog --- ChangeLog 3 Dec 2003 01:02:25 -0000 1.83 +++ ChangeLog 30 Mar 2004 10:04:25 -0000 @@ -1,3 +1,19 @@ +2004-03-30 Jean-Marc Lasgouttes + + * configure.ac: set version to 1.0.90. Use XFORMS_CHECK_VERSION + + * config/xformsinclude.m4 (XFORMS_CHECK_VERSION): merge + XFORMS_SET_VERSION and XFORMS_CHECK_VERSION. Set PACKAGE here and + read version from PACKAGE_VERSION (set by AC_INIT). Remove + detection of prereleases. Development versions are now versions + with minor version number >= 50. + + * README: small update + + * configure.ac: add new define RETSIGTYPE_IS_VOID + + * lib/signal.c: fix handling of RETSIGTYPE + 2003-12-02 Angus Leeming * demos/Makefile.am: enable 'make -j2' to work on a Index: README =================================================================== RCS file: /cvsroot/xforms/xforms/README,v retrieving revision 1.2 diff -u -p -r1.2 README --- README 19 Nov 2003 14:32:57 -0000 1.2 +++ README 30 Mar 2004 10:04:25 -0000 @@ -1,10 +1,10 @@ XForms Version 1.1 -This is the Open Source distribution of the XForms Library, a +This is the Free Software 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 software. It is -licensed under the LGPL (Lesser Gnu Public License) version 2.1. See +licensed under the LGPL (Lesser General Public License) version 2.1. See the file COPYING.LIB for the gory details. - - - @@ -13,7 +13,7 @@ What's new? Read NEWS. -Documentation on XForms is available from ncmir.ucsd.edu /pub/xforms +Documentation on XForms is available from ncmir.ucsd.edu /pub/xforms/DOC/ via anonymous ftp. The entire XForms distribution plus the latest info is accessible via @@ -32,19 +32,9 @@ xforms relies on several other libraries * libjpeg, 6.0b or newer. * libGL (optional) -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/ - - - - -This Open Source distribution is available at +This source distribution is available at Index: configure.ac =================================================================== RCS file: /cvsroot/xforms/xforms/configure.ac,v retrieving revision 1.10 diff -u -p -r1.10 configure.ac --- configure.ac 28 Nov 2003 14:10:43 -0000 1.10 +++ configure.ac 30 Mar 2004 10:04:25 -0000 @@ -1,20 +1,15 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(xforms,1.1cvs,xforms@bob.usuhs.mil) AC_PREREQ(2.52) -AC_CONFIG_SRCDIR(lib/forms.c) -AM_CONFIG_HEADER([lib/config.h]) - +AC_INIT(xforms, 1.0.90, xforms@bob.usuhs.mil) AC_CONFIG_AUX_DIR(config) - -PACKAGE=xforms -XFORMS_SET_VERSION(1,0,2) +AC_CONFIG_SRCDIR(lib/forms.c) XFORMS_CHECK_VERSION -AM_MAINTAINER_MODE AC_CANONICAL_TARGET - -AM_INIT_AUTOMAKE(xforms, $VERSION) +AM_CONFIG_HEADER([lib/config.h]) +AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) +AM_MAINTAINER_MODE # fix the value of the prefixes. test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -100,7 +95,10 @@ XFORMS_PATH_XPM XFORMS_CHECK_LIB_JPEG # Checks for library functions. -AC_TYPE_SIGNAL dnl used +AC_TYPE_SIGNAL +if test $ac_cv_type_signal = "void" ; then + AC_DEFINE(RETSIGTYPE_IS_VOID, 1, [Define if the return type of signal handlers is void]) +fi AC_CHECK_FUNCS([snprintf strcasecmp strerror usleep vsnprintf]) XFORMS_CHECK_DECL(snprintf, stdio.h) XFORMS_CHECK_DECL(vsnprintf, stdio.h) Index: config/xformsinclude.m4 =================================================================== RCS file: /cvsroot/xforms/xforms/config/xformsinclude.m4,v retrieving revision 1.6 diff -u -p -r1.6 xformsinclude.m4 --- config/xformsinclude.m4 19 Nov 2003 22:33:17 -0000 1.6 +++ config/xformsinclude.m4 30 Mar 2004 10:04:25 -0000 @@ -4,27 +4,23 @@ dnl Lars Gullik Bjønnes (larsbj@ dnl Allan Rae (rae@lyx.org) -dnl Usage XFORMS_SET_VERSION(Version, Revision, Fixlevel) -dnl Sets variables VERSION, FL_VERSION, FL_REVISION, FL_FIXLEVEL. -AC_DEFUN(XFORMS_SET_VERSION,[ -AC_SUBST(FL_VERSION, $1) -AC_SUBST(FL_REVISION, $2) -AC_SUBST(FL_FIXLEVEL, $3) -AC_SUBST(VERSION, $1.$2.$3) -]) - -dnl Usage XFORMS_CHECK_VERSION Displays version of xforms being built and -dnl sets variables "xforms_devel_version" and "xforms_prerelease" -AC_DEFUN(XFORMS_CHECK_VERSION,[ +dnl Usage XFORMS_CHECK_VERSION +dnl Sets variables VERSION, FL_VERSION, FL_REVISION, FL_FIXLEVEL and +dnl xforms_devel_version. +AC_DEFUN([XFORMS_CHECK_VERSION],[ +AC_SUBST(PACKAGE, $PACKAGE_NAME) +AC_SUBST(VERSION, $PACKAGE_VERSION) +[eval] `echo $PACKAGE_VERSION | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)/FL_VERSION=\1; FL_REVISION=\2; FL_FIXLEVEL=\3/'` +AC_SUBST(FL_VERSION) +AC_SUBST(FL_REVISION) +AC_SUBST(FL_FIXLEVEL) echo "configuring xforms version $VERSION" -xforms_prerelease=no xforms_devel_version=no case $VERSION in - *cvs*) xforms_devel_version=yes +dnl ( + *.[[5-9]][[0-9]]) xforms_devel_version=yes AC_DEFINE(DEVEL_VERSION, 1, Define if you are building a development version of xforms) echo "WARNING: This is a development version. Expect bugs." ;; - *pre*) xforms_prerelease=yes - echo "WARNING: This is a prerelease. Be careful!" ;; esac]) dnl Usage XFORMS_CHECK_LIB_JPEG: Checks for jpeg library @@ -155,7 +151,7 @@ AC_LANG_COMPILER(C) ### We might want to get or shut warnings. AC_ARG_ENABLE(warnings, [ --enable-warnings tell the compiler to display more warnings],, - [ if test $xforms_devel_version = yes -o $xforms_prerelease = yes && test $ac_cv_prog_gcc = yes ; then + [ if test $xforms_devel_version = yes && test $ac_cv_prog_gcc = yes ; then enable_warnings=yes; else enable_warnings=no; @@ -171,7 +167,7 @@ fi ### We might want to disable debug AC_ARG_ENABLE(debug, [ --enable-debug enable debug information],, - [ if test $xforms_devel_version = yes -o $xforms_prerelease = yes && test $ac_cv_prog_gcc = yes ; then + [ if test $xforms_devel_version = yes && test $ac_cv_prog_gcc = yes ; then enable_debug=yes; else enable_debug=no; Index: lib/signal.c =================================================================== RCS file: /cvsroot/xforms/xforms/lib/signal.c,v retrieving revision 1.7 diff -u -p -r1.7 signal.c --- lib/signal.c 19 Nov 2003 14:32:57 -0000 1.7 +++ lib/signal.c 30 Mar 2004 10:04:25 -0000 @@ -78,7 +78,7 @@ default_signal_handler(int sig) exit(sig); } -#if RETSIGTYPE != void +#ifndef RETSIGTYPE_IS_VOID return 0; #endif }