diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/AUTHORS gsl-1.14/AUTHORS *** gsl-1.13/AUTHORS Mon Jun 29 12:30:16 2009 --- gsl-1.14/AUTHORS Wed Mar 10 10:57:12 2010 *************** *** 25,27 **** --- 25,29 ---- transforms Jason H. Stover (jason@sakla.net) - cumulative distribution functions Patrick Alken - nonsymmetric and generalized eigensystems, B-splines + Rhys Ulerich (rhys.ulerich@gmail.com) - multisets + Pavel Holoborodko - fixed order Gauss-Legendre quadrature diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/BUGS gsl-1.14/BUGS *** gsl-1.13/BUGS Tue Aug 25 14:52:36 2009 --- gsl-1.14/BUGS Wed Mar 10 12:53:06 2010 *************** *** 1,6 **** The GSL Bugs Database is at http://savannah.gnu.org/bugs/?group=gsl ! This file was generated from it at Tue Aug 25 15:52:36 2009 ------------------------------------------------------------------------ BUG-ID: 21828 --- 1,150 ---- The GSL Bugs Database is at http://savannah.gnu.org/bugs/?group=gsl ! This file was generated from it at Thu Mar 4 12:16:25 2010 ! ! ------------------------------------------------------------------------ ! BUG-ID: 28267 ! STATUS: Open/Postponed ! CATEGORY: Accuracy problem ! SUMMARY: poor convergence region for gsl_sf_hyperg_1F1 ! ! The magnitude of the error is greater than the value itself for ! a<<0, b>0, x>>0 ! ! gsl_sf_hyperg1F1(-3.78e+01, 2, 1.035e+02) => -7.00055e+18 +/- 3.77654e+19 ! ! ----------------------------------------------- ! From: Weibin Li ! To: bug-gsl@gnu.org ! Subject: [Bug-gsl] gsl_sf_hyperg_1F1 ! Date: Mon, 30 Nov 2009 15:26:11 +0100 ! ! Hi, guys ! ! I experienced bugs with gsl_sf_hyperg_1F1. The version is gsl_1.12, but ! the testing is also done with gsl_1.13, using a mac with version 10.5.8 ! and hp-workstation with gnome_2.24.1. ! ! #include ! #include ! #include ! #include "gsl/gsl_sf_hyperg.h" ! ! int main(int argc, char **argv) ! { ! int ii; ! double Ri; ! double v0; ! ! gsl_sf_result r; ! for(ii = 10; ii< 140;ii++) ! { ! Ri = 2013; ! v0 =38.86871 +ii*2.5e-10; ! ! gsl_sf_hyperg_1F1_e(1.0-v0,2,2.0*Ri/v0,&r); ! printf("%lg\t%14.13g\t%14.13g\n",v0,r.val,r.err); ! ! } ! return 0; ! } ! ! The output of above code shows an extremely large error. by increasing ! Ri, the relative error decreases. Is there any idea to fix this? ! ! Thank you very much. ! ! Best ! ! Weibin ! ! -It's inherently difficult to compute the value in this region either way as there is massive cancellation in both the series and the Kummer transformed series.I cannot find any algorithm which handles this case.Confirmed ! ! ------------------------------------------------------------------------ ! BUG-ID: 27515 ! STATUS: Open/Fixed ! CATEGORY: Build ! SUMMARY: install-sh is broken with current automake ! ! From: Alexander Belikoff ! To: bug-gsl@gnu.org ! Subject: [Bug-gsl] GSL installation bug ! Date: Wed, 23 Sep 2009 15:20:15 -0400 ! ! Hello – I’m trying to install GSL on Solaris 10 and I’ve run into an ! installation procedure bug. At least in ./matrix directory the install ! command is: ! ! .././install-sh -c -m 644 gsl_matrix.h gsl_matrix_char.h ! gsl_matrix_complex_double.h gsl_matrix_complex_float.h ! gsl_matrix_complex_long_double.h gsl_matrix_double.h gsl_matrix_float.h ! gsl_matrix_int.h gsl_matrix_long.h gsl_matrix_long_double.h ! gsl_matrix_short.h gsl_matrix_uchar.h gsl_matrix_uint.h gsl_matrix_ulong.h ! gsl_matrix_ushort.h TARGET_DIR ! ! However, install-sh is coded in such a way that it only uses the first ! non-option argument as a source and the last one as destination quietly ! ignoring the rest of them. This results in only gsl_matrix.h being installed ! and all other headers quietly ignored. ! ! I'll try to hack a patch overnight and send it over to you guys. ! ! -- Sasha ! _______________________________________________ ! Bug-gsl mailing list ! Bug-gsl@gnu.org ! http://lists.gnu.org/mailman/listinfo/bug-gsl ! ! From: Peter Johansson ! To: Alexander Belikoff ! Cc: bug-gsl@gnu.org ! Subject: Re: [Bug-gsl] GSL installation bug ! Date: Thu, 24 Sep 2009 00:05:31 -0400 ! ! Hello Sasha, ! ! please keep bug-gsl in cc (especially since I'm just a user and not the ! maintainer) ! ! Alexander Belikoff wrote: ! > Hello Peter - thanks for the quick response. Cannot check right now, ! > will do tomorrow morning. GSL itself was downloaded as a .tgz package ! > from GNU FTP server (version 1.13). What install-sh does, is the ! > following: the moment it finds a non-option argument it assigns it to ! > *src* variable. Next time it finds a non-option argument, given that ! > *$src* is non-empty, it assigns it to *dst*. As a result, after ! > processing the command-line arguments, *$src* is the first non-option ! > arg, and *$dst* is the last one with everything in between ignored. ! I downloaded the latest gsl (1.13) and indeed the behavior of install-sh ! is sub-optimal. When I previously claimed that install-sh worked as ! expected for me that was based on an install-sh that comes with automake ! 1.11 (script version 2009-04-28.21). That version of install-sh differs ! significantly from the one in gsl 1.13. It seems like the install-sh has ! not been updated when the maintainer has updated his automake. The ! Makefile.ins that come in gsl 1.13 are created by automake 1.11 but ! install-sh is probably an older version. In order to update install-sh ! (and friends) one needs to (as a maintainer) call automake with the ! --force switch. I noticed that the autogen.sh script in the git ! repository calls automake without the --force switch, which might ! explain why the files have never been updated. ! ! > ! > I've fixed it for my installation by lifting install-sh from another ! > package and putting it in place of the one in GSL. ! Seems like a good workaround. ! > ! > Anyway, I'll provide more info tomorrow... ! ! Cheers, ! Peter ! ! _______________________________________________ ! Bug-gsl mailing list ! Bug-gsl@gnu.org ! http://lists.gnu.org/mailman/listinfo/bug-gsl ! ! See the errata section on http://www.gnu.org/software/gsl/ ! for a link to a working install-shConfirmedVersion in the repository is updated. Need to make sure it gets in the release! ------------------------------------------------------------------------ BUG-ID: 21828 *************** *** 656,704 **** http://lists.gnu.org/mailman/listinfo/bug-gsl ------------------------------------------------------------------------ - BUG-ID: 25383 - STATUS: Open/Postponed - CATEGORY: None - SUMMARY: use GSL_ENOPROG instead of GSL_CONTINUE in lmiterate.c - - [I think we should use GSL_ENOPROG in lmiterate.c although it could break existing code I guess] - - From: "Mark M. Ito" - To: bug-gsl@gnu.org - Subject: [Bug-gsl] non-linear LS fit example in documentation: bug? - Date: Tue, 20 Jan 2009 15:16:26 -0500 - - Dear GSL folks, - - In section 37.9 "Example programs for Nonlinear Least-Squares Fitting" - in the gsl manual, the main loop says: - - do - { - iter++; - status = gsl_multifit_fdfsolver_iterate (s); - - printf ("status = %s\n", gsl_strerror (status)); - - print_state (iter, s); - - if (status) - break; - - status = gsl_multifit_test_delta (s->dx, s->x, - 1e-4, 1e-4); - } - while (status == GSL_CONTINUE && iter < 500); - - gsl_multifit_covar (s->J, 0.0, covar); - - Shouldn't the "if (status) break;" be an "if (status) continue;"? It is - normal for the solver to return GSL_CONTINUE in which case you want to - continue to iterate. Break exits the do loop completely, no? - - -- Mark Ito - - ________________________________ - This has been documented in the manual. Will change in a future release (1.14)3 - NormalConfirmed - - ------------------------------------------------------------------------ --- 800,802 ---- diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/ChangeLog gsl-1.14/ChangeLog *** gsl-1.13/ChangeLog Thu Jul 9 20:31:06 2009 --- gsl-1.14/ChangeLog Wed Mar 10 10:57:12 2010 *************** *** 1,3 **** --- 1,8 ---- + 2010-01-18 Brian Gough + + * gsl_version.h.in, configure.ac: added GSL_MAJOR_VERSION and + GSL_MINOR_VERSION macros + 2009-07-09 Brian Gough * configure.ac: added RETURN_IF_NULL macro to handle null argument diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/INSTALL gsl-1.14/INSTALL *** gsl-1.13/INSTALL Mon Jun 29 12:30:17 2009 --- gsl-1.14/INSTALL Wed Mar 10 10:57:12 2010 *************** *** 61,66 **** --- 61,71 ---- instructions on installing the library in another location or changing other default compilation options. + When building from source, GNU packages are compiled with debugging + symbols enabled by default (CFLAGS="-g -O2"). It's part of the + philosophy that anyone should be able to examine any program on the + system. + ------------------------------ Platform Specific Compilation Notes diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/Makefile.am gsl-1.14/Makefile.am *** gsl-1.13/Makefile.am Fri Aug 21 18:00:59 2009 --- gsl-1.14/Makefile.am Wed Mar 10 10:57:12 2010 *************** *** 2,10 **** # AUTOMAKE_OPTIONS = readme-alpha ! SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit statistics siman sum integration interpolation histogram ode-initval roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc ! SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la permutation/libgslpermutation.la combination/libgslcombination.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h --- 2,10 ---- # AUTOMAKE_OPTIONS = readme-alpha ! SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit statistics siman sum integration interpolation histogram ode-initval roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc ! SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/Makefile.in gsl-1.14/Makefile.in *** gsl-1.13/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/Makefile.in Wed Mar 10 10:58:31 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 101,108 **** gsl_randist_DEPENDENCIES = libgsl.la cblas/libgslcblas.la SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 101,109 ---- gsl_randist_DEPENDENCIES = libgsl.la cblas/libgslcblas.la SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 179,189 **** --- 180,192 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 197,202 **** --- 200,207 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 256,262 **** --- 261,269 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 300,307 **** top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit statistics siman sum integration interpolation histogram ode-initval roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc ! SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la permutation/libgslpermutation.la combination/libgslcombination.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h bin_SCRIPTS = gsl-config pkgconfigdir = $(libdir)/pkgconfig --- 307,332 ---- top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit statistics siman sum integration interpolation histogram ode-initval roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc ! SUBLIBS = block/libgslblock.la blas/libgslblas.la \ ! bspline/libgslbspline.la complex/libgslcomplex.la \ ! cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la \ ! deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la \ ! fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la \ ! ieee-utils/libgslieeeutils.la integration/libgslintegration.la \ ! interpolation/libgslinterpolation.la linalg/libgsllinalg.la \ ! matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la \ ! multifit/libgslmultifit.la multimin/libgslmultimin.la \ ! multiroots/libgslmultiroots.la ntuple/libgslntuple.la \ ! ode-initval/libgslodeiv.la permutation/libgslpermutation.la \ ! combination/libgslcombination.la multiset/libgslmultiset.la \ ! poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la \ ! rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la \ ! sort/libgslsort.la specfunc/libgslspecfunc.la \ ! statistics/libgslstatistics.la sum/libgslsum.la \ ! sys/libgslsys.la test/libgsltest.la utils/libutils.la \ ! vector/libgslvector.la cdf/libgslcdf.la \ ! wavelet/libgslwavelet.la pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h bin_SCRIPTS = gsl-config pkgconfigdir = $(libdir)/pkgconfig *************** *** 349,363 **** @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps'; \ ! $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps \ && exit 0; \ exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 374,388 ---- @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ! $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 521,534 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 546,575 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsl-histogram.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsl-randist.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 606,612 **** # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ --- 647,653 ---- # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *************** *** 631,637 **** fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): ! @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ --- 672,678 ---- fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): ! @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *************** *** 887,893 **** fi; \ done -test -n "$(am__skip_mode_fix)" \ ! || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ --- 928,935 ---- fi; \ done -test -n "$(am__skip_mode_fix)" \ ! || find "$(distdir)" -type d ! -perm -755 \ ! -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ *************** *** 931,947 **** distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ ! unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac --- 973,989 ---- distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ ! bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ ! lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ ! GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac *************** *** 1046,1051 **** --- 1088,1094 ---- distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags *************** *** 1095,1100 **** --- 1138,1144 ---- maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/NEWS gsl-1.14/NEWS *** gsl-1.13/NEWS Tue Sep 8 10:04:06 2009 --- gsl-1.14/NEWS Wed Mar 10 10:57:12 2010 *************** *** 1,4 **** ! * What is new in gsl-1.13: ** Upgraded to latest autoconf and automake (autoconf-2.64, automake-1.11) --- 1,57 ---- ! * What is new in gsl-1.14: ! ! ** Upgraded to latest libtool, autoconf and automake (libtool-2.2.6b, ! autoconf-2.65, automake-1.11.1). Fixes security hole in 'make ! dist' (see Automake CVE-2009-4029). ! ! ** Added support for "multisets", which are similar to permutations ! and combinations. A multiset is an array of k integers in the ! range 0 to n-1 where each value may occur more than once. Multisets ! can be used to iterate over the indices of a k-th order symmetric ! tensor in n-space. (Rhys Ulerich) ! ! ** Added gsl_integrate_glfixed routines for performing fixed order ! Gauss-Legendre integration ! (Pavel Holoborodko, Konstantin Holoborodko, Rhys Ulerich) ! ! ** In the LMDER multi-dimensional fitting routines, the return code ! GSL_ENOPROG is now used instead of GSL_CONTINUE for the case where ! 10 or more attempts to find a suitable trial step have been made ! without success. [bug #25383] ! ! ** The confluent hypergeometric function gsl_sf_hyperg_U (a,b,x) has ! been extended to support x < 0 for cases not involving ! singularities in 1F1(a,b,x). [bug #27859] ! ! ** The F-distribution gsl_ran_fdist_pdf now avoids unnecessary ! underflow and overflow and handles cases where n > 248. [bug ! #28500] ! ! ** The SVD routines now use a scaled version of the implicit QR method ! and compute the shift more reliably for values at the limit of ! double precision, avoiding potential NaNs. [bug #28767] ! ! ** A compile time error is emitted if the configuration stage prevents ! the functions gsl_isnan and gsl_finite from being defined. ! ! ** Added missing dereference in GSL_VECTOR_COMPLEX when not using ! GSL_RANGE_CHECK [bug #28017] ! ! ** Improved the range of gsl_sf_hyperg1F1(a,b,x) when a<0,b>0. [bug ! #28718] ! ! ** Added macros GSL_MAJOR_VERSION and GSL_MINOR_VERSION in ! ! ! ** Improved gsl_eigen_symmv and gsl_eigen_symm to avoid a potential ! infinite loop when the tridiagonalised matrix contains very small ! values. [bug #28096] ! ! ** Added functions gsl_multifit_linear_usvd and ! gsl_multifit_wlinear_usvd for multilinear fitting without ! column-scaling of the fit matrix. ! ! * What was new in gsl-1.13: ** Upgraded to latest autoconf and automake (autoconf-2.64, automake-1.11) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/TODO gsl-1.14/TODO *** gsl-1.13/TODO Mon Jun 29 12:30:17 2009 --- gsl-1.14/TODO Wed Mar 10 12:49:40 2010 *************** *** 34,41 **** * Cubature, e.g as provided by Cubpack. (Gert Van den Eynde ?) - * Mathieu functions (Lowell Johnson ) - * Fresnel Integrals ("Juergen J. Zach" ) * Cumulative Distribution functions for discrete random distributions --- 34,39 ---- diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/aclocal.m4 gsl-1.14/aclocal.m4 *** gsl-1.13/aclocal.m4 Tue Sep 8 10:32:18 2009 --- gsl-1.14/aclocal.m4 Wed Mar 10 10:57:57 2010 *************** *** 1,4 **** ! # generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. --- 1,4 ---- ! # generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. *************** *** 13,20 **** m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, ! [m4_warning([this file was generated for autoconf 2.64. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) --- 13,20 ---- m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ! [m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) *************** *** 34,40 **** [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. ! m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) --- 34,40 ---- [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. ! m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) *************** *** 50,56 **** # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) --- 50,56 ---- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) *************** *** 144,149 **** --- 144,411 ---- Usually this means the macro was only invoked conditionally.]]) fi])]) + # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # 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. + + # serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, + # will think it sees a *use*, and therefore will trigger all it's + # C support machinery. Also note that it means that autoscan, seeing + # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + # _AM_DEPENDENCIES(NAME) + # ---------------------- + # See how the compiler implements dependency checking. + # NAME is "CC", "CXX", "GCJ", or "OBJC". + # We try a few techniques and use that to set a single cache variable. + # + # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was + # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular + # dependency, and given that the user is not expected to run this macro, + # just rely on AC_PROG_CC. + AC_DEFUN([_AM_DEPENDENCIES], + [AC_REQUIRE([AM_SET_DEPDIR])dnl + AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl + AC_REQUIRE([AM_MAKE_INCLUDE])dnl + AC_REQUIRE([AM_DEP_TRACK])dnl + + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + + AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], + [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_$1_dependencies_compiler_type=none + fi + ]) + AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) + AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + ]) + + + # AM_SET_DEPDIR + # ------------- + # Choose a directory name for dependency files. + # This macro is AC_REQUIREd in _AM_DEPENDENCIES + AC_DEFUN([AM_SET_DEPDIR], + [AC_REQUIRE([AM_SET_LEADING_DOT])dnl + AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl + ]) + + + # AM_DEP_TRACK + # ------------ + AC_DEFUN([AM_DEP_TRACK], + [AC_ARG_ENABLE(dependency-tracking, + [ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) + AC_SUBST([AMDEPBACKSLASH])dnl + _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- + + # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # 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. + + #serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + [{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + } + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + + # AM_OUTPUT_DEPENDENCY_COMMANDS + # ----------------------------- + # This macro should only be invoked once -- use via AC_REQUIRE. + # + # This code is only required when automatic dependency tracking + # is enabled. FIXME. This creates each `.P' file that we will + # need in order to bootstrap the dependency handling code. + AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + [AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) + ]) + # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, *************** *** 365,370 **** --- 627,684 ---- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005, 2009 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. + + # serial 4 + + # AM_MAKE_INCLUDE() + # ----------------- + # Check to see how make treats includes. + AC_DEFUN([AM_MAKE_INCLUDE], + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: + @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + AC_MSG_CHECKING([for style of include used by $am_make]) + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # Ignore all kinds of additional output from `make'. + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; + esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) + AC_MSG_RESULT([$_am_result]) + rm -f confinc confmf + ]) + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 *************** *** 8515,8529 **** # Generated from ltversion.in. ! # serial 3012 ltversion.m4 # This file is part of GNU Libtool ! m4_define([LT_PACKAGE_VERSION], [2.2.6]) ! m4_define([LT_PACKAGE_REVISION], [1.3012]) AC_DEFUN([LTVERSION_VERSION], ! [macro_version='2.2.6' ! macro_revision='1.3012' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) --- 8829,8843 ---- # Generated from ltversion.in. ! # serial 3017 ltversion.m4 # This file is part of GNU Libtool ! m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ! m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], ! [macro_version='2.2.6b' ! macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/autogen.sh gsl-1.14/autogen.sh *** gsl-1.13/autogen.sh Mon Jun 29 12:30:17 2009 --- gsl-1.14/autogen.sh Wed Mar 10 10:57:12 2010 *************** *** 1,7 **** #! /bin/sh echo "If you use a recent version of autotools, this script is obsolete" ! echo "Just run autoreconf -i instead" echo # Run this to generate all the auto-generated files needed by the GNU --- 1,7 ---- #! /bin/sh echo "If you use a recent version of autotools, this script is obsolete" ! echo "Just run autoreconf -i -f -v instead" echo # Run this to generate all the auto-generated files needed by the GNU *************** *** 9,14 **** libtoolize --automake aclocal autoheader ! automake --add-missing --gnu autoconf echo "Now use ./configure --enable-maintainer-mode" --- 9,14 ---- libtoolize --automake aclocal autoheader ! automake --add-missing --gnu --force-missing autoconf echo "Now use ./configure --enable-maintainer-mode" diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/blas/Makefile.in gsl-1.14/blas/Makefile.in *** gsl-1.13/blas/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/blas/Makefile.in Wed Mar 10 10:58:12 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 51,58 **** am_libgslblas_la_OBJECTS = blas.lo libgslblas_la_OBJECTS = $(am_libgslblas_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 51,59 ---- am_libgslblas_la_OBJECTS = blas.lo libgslblas_la_OBJECTS = $(am_libgslblas_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 98,108 **** --- 99,111 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 116,121 **** --- 119,126 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 175,181 **** --- 180,188 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 236,244 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps blas/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps blas/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 243,251 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu blas/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu blas/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 275,288 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 282,309 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blas.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 430,435 **** --- 451,457 ---- mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 475,480 **** --- 497,503 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/block/Makefile.in gsl-1.14/block/Makefile.in *** gsl-1.13/block/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/block/Makefile.in Wed Mar 10 10:58:13 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 249,257 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps block/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps block/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 256,264 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu block/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu block/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 300,313 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 307,337 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/block.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 574,580 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 620,626 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/bspline/Makefile.in gsl-1.14/bspline/Makefile.in *** gsl-1.13/bspline/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/bspline/Makefile.in Wed Mar 10 10:58:13 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 61,68 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la ../statistics/libgslstatistics.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 61,69 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la ../statistics/libgslstatistics.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 110,120 **** --- 111,123 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 128,133 **** --- 131,138 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 187,193 **** --- 192,200 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 252,260 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps bspline/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps bspline/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 259,267 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bspline/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu bspline/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 303,316 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 310,338 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bspline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 552,557 **** --- 574,580 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 597,602 **** --- 620,626 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/cblas/Makefile.in gsl-1.14/cblas/Makefile.in *** gsl-1.13/cblas/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/cblas/Makefile.in Wed Mar 10 10:58:14 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 118,125 **** test_DEPENDENCIES = libgslcblas.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 118,126 ---- test_DEPENDENCIES = libgslcblas.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 145,155 **** --- 146,158 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 163,168 **** --- 166,173 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 222,228 **** --- 227,235 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 330,338 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps cblas/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cblas/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 337,345 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cblas/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cblas/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 403,416 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 410,624 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caxpy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccopy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdotc_sub.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdotu_sub.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgerc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgeru.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cher.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cher2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cher2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cherk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csyr2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csyrk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctbsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctpsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrmm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrsm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasum.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daxpy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dgbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dgemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dgemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dger.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnrm2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drotg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drotm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drotmg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsdot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dspmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dspr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dspr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dswap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsymv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyrk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtbsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtpsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrmm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrsm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dzasum.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dznrm2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icamax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idamax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isamax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/izamax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sasum.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saxpy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scasum.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scnrm2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scopy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdsdot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sger.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snrm2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srotg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srotm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srotmg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sswap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssymv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssyr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssyr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssyr2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssyrk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stbsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strmm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_amax.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_asum.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_axpy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_copy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dot.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gbmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gemm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gemv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ger.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hbmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hemm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hemv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_her.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_her2.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_her2k.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_herk.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hpmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hpr.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hpr2.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_nrm2.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rot.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rotg.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rotm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rotmg.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sbmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_scal.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_spmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_spr.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_spr2.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_swap.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_symm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_symv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_syr.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_syr2.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_syr2k.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_syrk.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tbmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tbsv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tpmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tpsv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_trmm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_trmv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_trsm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_trsv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xerbla.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zaxpy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcopy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zdotc_sub.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zdotu_sub.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zdscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zgbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zgemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zgemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zgerc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zgeru.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhemm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhemv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zher.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zher2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zher2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zherk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhpr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhpr2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zswap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsyr2k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsyrk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztbmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztbsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztpmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztpsv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztrmm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztrmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztrsm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztrsv.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 652,657 **** --- 860,866 ---- clean-libtool mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 697,702 **** --- 906,912 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/cdf/Makefile.in gsl-1.14/cdf/Makefile.in *** gsl-1.13/cdf/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/cdf/Makefile.in Wed Mar 10 10:58:14 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 67,74 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 67,75 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 116,126 **** --- 117,129 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 134,139 **** --- 137,144 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 193,199 **** --- 198,206 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 258,266 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps cdf/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cdf/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 265,273 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cdf/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cdf/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 309,322 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 316,384 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beta.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/betainv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binomial.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cauchy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cauchyinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chisq.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chisqinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponential.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponentialinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exppow.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdistinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flatinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gammainv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gauss.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaussinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geometric.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gumbel1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gumbel1inv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gumbel2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gumbel2inv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hypergeometric.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laplace.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laplaceinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logistic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logisticinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lognormal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lognormalinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nbinomial.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pareto.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paretoinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pascal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poisson.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rayleigh.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rayleighinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tdist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tdistinv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weibull.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weibullinv.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 558,563 **** --- 620,626 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 603,608 **** --- 666,672 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/cdf/geometric.c gsl-1.14/cdf/geometric.c *** gsl-1.13/cdf/geometric.c Wed Nov 19 09:13:46 2008 --- gsl-1.14/cdf/geometric.c Wed Mar 10 10:57:12 2010 *************** *** 1,6 **** --- 1,7 ---- /* cdf/geometric.c * * Copyright (C) 2004 Jason H. Stover. + * Copyright (C) 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 70,76 **** if (k < 1) { ! Q = 1.0; } q = 1.0 - p; --- 71,77 ---- if (k < 1) { ! return 1.0; } q = 1.0 - p; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/cdf/tdistinv.c gsl-1.14/cdf/tdistinv.c *** gsl-1.13/cdf/tdistinv.c Wed Nov 19 09:13:46 2008 --- gsl-1.14/cdf/tdistinv.c Wed Mar 10 10:57:12 2010 *************** *** 1,6 **** /* cdf/tdistinv.c * ! * Copyright (C) 2007 Brian Gough * Copyright (C) 2002 Jason H. Stover. * * This program is free software; you can redistribute it and/or modify --- 1,6 ---- /* cdf/tdistinv.c * ! * Copyright (C) 2007, 2010 Brian Gough * Copyright (C) 2002 Jason H. Stover. * * This program is free software; you can redistribute it and/or modify *************** *** 61,71 **** if (nu == 1.0) { x = tan (M_PI * (P - 0.5)); } else if (nu == 2.0) { ! double a = 2 * P - 1; ! x = a / sqrt (2 * (1 - a * a)); } ptail = (P < 0.5) ? P : 1 - P; --- 61,72 ---- if (nu == 1.0) { x = tan (M_PI * (P - 0.5)); + return x; } else if (nu == 2.0) { ! x = (2 * P - 1) / sqrt (2 * P * (1 - P)); ! return x; } ptail = (P < 0.5) ? P : 1 - P; *************** *** 159,169 **** if (nu == 1.0) { x = tan (M_PI * (0.5 - Q)); } else if (nu == 2.0) { ! double a = 2 * (1 - Q) - 1; ! x = a / sqrt (2 * (1 - a * a)); } qtail = (Q < 0.5) ? Q : 1 - Q; --- 160,171 ---- if (nu == 1.0) { x = tan (M_PI * (0.5 - Q)); + return x; } else if (nu == 2.0) { ! x = (1 - 2 * Q) / sqrt (2 * Q * (1 - Q)); ! return x; } qtail = (Q < 0.5) ? Q : 1 - Q; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/cheb/Makefile.in gsl-1.14/cheb/Makefile.in *** gsl-1.13/cheb/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/cheb/Makefile.in Wed Mar 10 10:58:15 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../test/libgsltest.la ../sys/libgslsys.la ../err/libgslerr.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../test/libgsltest.la ../sys/libgslsys.la ../err/libgslerr.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 247,255 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps cheb/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cheb/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 254,262 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cheb/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cheb/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 298,311 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 305,336 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deriv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/integ.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 547,552 **** --- 572,578 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 592,597 **** --- 618,624 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/combination/Makefile.in gsl-1.14/combination/Makefile.in *** gsl-1.13/combination/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/combination/Makefile.in Wed Mar 10 10:58:15 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 38,44 **** check_PROGRAMS = test$(EXEEXT) subdir = combination DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ ! $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ --- 38,44 ---- check_PROGRAMS = test$(EXEEXT) subdir = combination DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ ! $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ *************** *** 59,66 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 59,67 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 108,118 **** --- 109,121 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 126,131 **** --- 129,136 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 185,191 **** --- 190,198 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 250,258 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps combination/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps combination/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 257,265 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu combination/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu combination/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 301,314 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 308,339 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combination.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 575,581 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 621,627 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/combination/TODO gsl-1.14/combination/TODO *** gsl-1.13/combination/TODO Thu Jan 1 00:00:00 1970 --- gsl-1.14/combination/TODO Wed Mar 10 10:57:12 2010 *************** *** 0 **** --- 1 ---- + * The module has a lot of overlap with multiset/ some of the functions could be abstracted out. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/complex/Makefile.in gsl-1.14/complex/Makefile.in *** gsl-1.13/complex/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/complex/Makefile.in Wed Mar 10 10:58:15 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 247,255 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps complex/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps complex/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 254,262 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu complex/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu complex/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 298,311 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 305,334 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 547,552 **** --- 570,576 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 592,597 **** --- 616,622 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/config.guess gsl-1.14/config.guess *** gsl-1.13/config.guess Wed Jan 30 20:26:55 2008 --- gsl-1.14/config.guess Wed Mar 10 10:58:12 2010 *************** *** 1,10 **** #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 1,10 ---- #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 27,42 **** # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner . ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # ! # The plan is that this can be called by configure scripts if you ! # don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` --- 27,42 ---- # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner. Please send patches (context ! # diff format) to and include a ChangeLog ! # entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # ! # You can get the latest version of this script from: ! # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` *************** *** 56,63 **** GNU config.guess ($timestamp) Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." --- 56,63 ---- GNU config.guess ($timestamp) Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." *************** *** 170,176 **** arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? --- 170,176 ---- arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? *************** *** 324,337 **** case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) ! echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize --- 324,356 ---- case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ! echo i386-pc-auroraux${UNAME_RELEASE} ! exit ;; ! i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ! eval $set_cc_for_build ! SUN_ARCH="i386" ! # If there is a compiler, see if it is configured for 64-bit objects. ! # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ! # This test works for both compilers. ! if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ! if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ! (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ! grep IS_64BIT_ARCH >/dev/null ! then ! SUN_ARCH="x86_64" ! fi ! fi ! echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize *************** *** 532,538 **** echo rs6000-ibm-aix3.2 fi exit ;; ! *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 --- 551,557 ---- echo rs6000-ibm-aix3.2 fi exit ;; ! *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 *************** *** 640,646 **** # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else --- 659,665 ---- # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep -q __LP64__ then HP_ARCH="hppa2.0w" else *************** *** 791,808 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:[3456]*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we --- 810,833 ---- i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we *************** *** 832,839 **** i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu --- 857,885 ---- i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) ! eval $set_cc_for_build ! if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ARM_EABI__ ! then ! echo ${UNAME_MACHINE}-unknown-linux-gnu ! else ! echo ${UNAME_MACHINE}-unknown-linux-gnueabi ! fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 847,852 **** --- 893,909 ---- frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; *************** *** 856,929 **** m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef mips ! #undef mipsel #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips #else CPU= #endif #endif EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^CPU/{ ! s: ::g ! p ! }'`" ! test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^CPU/{ ! s: ::g ! p ! }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; ! ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu ! exit ;; ! ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu exit ;; ! alpha:Linux:*:*) ! case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ! EV5) UNAME_MACHINE=alphaev5 ;; ! EV56) UNAME_MACHINE=alphaev56 ;; ! PCA56) UNAME_MACHINE=alphapca56 ;; ! PCA57) UNAME_MACHINE=alphapca56 ;; ! EV6) UNAME_MACHINE=alphaev6 ;; ! EV67) UNAME_MACHINE=alphaev67 ;; ! EV68*) UNAME_MACHINE=alphaev68 ;; ! esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ! if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ! echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level --- 913,945 ---- m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef ${UNAME_MACHINE} ! #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; ! padre:Linux:*:*) ! echo sparc-unknown-linux-gnu exit ;; ! parisc64:Linux:*:* | hppa64:Linux:*:*) ! echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level *************** *** 933,940 **** *) echo hppa-unknown-linux-gnu ;; esac exit ;; ! parisc64:Linux:*:* | hppa64:Linux:*:*) ! echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux --- 949,959 ---- *) echo hppa-unknown-linux-gnu ;; esac exit ;; ! ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu ! exit ;; ! ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux *************** *** 954,1025 **** x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; ! xtensa:Linux:*:*) ! echo xtensa-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif - EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both --- 973,981 ---- x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; ! xtensa*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both *************** *** 1048,1054 **** i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) --- 1004,1010 ---- i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) *************** *** 1092,1099 **** pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i386. ! echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 --- 1048,1058 ---- pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. ! # Note: whatever this is, it MUST be the same as what config.sub ! # prints for the "djgpp" host, or else GDB configury will decide that ! # this is a cross-build. ! echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 *************** *** 1131,1136 **** --- 1090,1105 ---- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1143,1149 **** rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) --- 1112,1118 ---- rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) *************** *** 1206,1211 **** --- 1175,1183 ---- BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; *************** *** 1233,1238 **** --- 1205,1220 ---- *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} *************** *** 1314,1319 **** --- 1296,1304 ---- i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 *************** *** 1474,1482 **** the operating system you are using. It is advised that you download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- 1459,1467 ---- the operating system you are using. It is advised that you download the most up to date version of the config scripts from ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/config.sub gsl-1.14/config.sub *** gsl-1.13/config.sub Wed Jan 30 20:26:55 2008 --- gsl-1.14/config.sub Wed Mar 10 10:58:12 2010 *************** *** 1,10 **** #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-04-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 1,10 ---- #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 32,44 **** # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. --- 32,47 ---- # Please send patches to . Submit a context ! # diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. *************** *** 72,79 **** version="\ GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." --- 75,82 ---- version="\ GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." *************** *** 122,127 **** --- 125,131 ---- case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 148,157 **** -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 --- 152,164 ---- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 *************** *** 249,261 **** | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ --- 256,271 ---- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ *************** *** 268,273 **** --- 278,284 ---- | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ *************** *** 276,295 **** | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k) basic_machine=$basic_machine-unknown ;; ! m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none --- 287,308 ---- | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ ! | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k | z80) basic_machine=$basic_machine-unknown ;; ! m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none *************** *** 329,342 **** | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ --- 342,358 ---- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ *************** *** 357,377 **** | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ ! | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ ! | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 373,398 ---- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ ! | romp-* | rs6000-* | rx-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa*-* \ | ymp-* \ ! | z8k-* | z80-*) ! ;; ! # Recognize the basic CPU types without company name, with glob match. ! xtensa*) ! basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 435,440 **** --- 456,465 ---- basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux *************** *** 443,452 **** --- 468,493 ---- basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd *************** *** 475,482 **** basic_machine=craynv-cray os=-unicosmp ;; ! cr16c) ! basic_machine=cr16c-unknown os=-elf ;; crds | unos) --- 516,523 ---- basic_machine=craynv-cray os=-unicosmp ;; ! cr16) ! basic_machine=cr16-unknown os=-elf ;; crds | unos) *************** *** 514,519 **** --- 555,564 ---- basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp *************** *** 668,673 **** --- 713,726 ---- basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; *************** *** 679,684 **** --- 732,740 ---- basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 *************** *** 813,818 **** --- 869,882 ---- basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; *************** *** 1021,1026 **** --- 1085,1094 ---- basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; *************** *** 1096,1101 **** --- 1164,1173 ---- basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none *************** *** 1134,1140 **** we32k) basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) --- 1206,1212 ---- we32k) basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) *************** *** 1184,1189 **** --- 1256,1264 ---- # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; *************** *** 1204,1213 **** # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ ! | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ --- 1279,1289 ---- # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ! | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ! | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ *************** *** 1216,1222 **** | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ --- 1292,1298 ---- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ *************** *** 1226,1232 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1302,1308 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) *************** *** 1356,1361 **** --- 1432,1440 ---- -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) *************** *** 1553,1559 **** -sunos*) vendor=sun ;; ! -aix*) vendor=ibm ;; -beos*) --- 1632,1638 ---- -sunos*) vendor=sun ;; ! -cnk*|-aix*) vendor=ibm ;; -beos*) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/configure gsl-1.14/configure *** gsl-1.13/configure Tue Sep 8 10:32:46 2009 --- gsl-1.14/configure Wed Mar 10 10:58:08 2010 *************** *** 1,10 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.64 for gsl 1.13. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ! # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ! # Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,12 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.65 for gsl 1.14. ! # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ! # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ! # Inc. ! # # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. *************** *** 673,679 **** ! exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --- 675,682 ---- ! test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, *************** *** 695,702 **** # Identity of this package. PACKAGE_NAME='gsl' PACKAGE_TARNAME='gsl' ! PACKAGE_VERSION='1.13' ! PACKAGE_STRING='gsl 1.13' PACKAGE_BUGREPORT='' PACKAGE_URL='' --- 698,705 ---- # Identity of this package. PACKAGE_NAME='gsl' PACKAGE_TARNAME='gsl' ! PACKAGE_VERSION='1.14' ! PACKAGE_STRING='gsl 1.14' PACKAGE_BUGREPORT='' PACKAGE_URL='' *************** *** 778,787 **** FGREP EGREP GREP - SED LIBTOOL LN_S CPP OBJEXT EXEEXT ac_ct_CC --- 781,798 ---- FGREP EGREP GREP LIBTOOL LN_S CPP + am__fastdepCC_FALSE + am__fastdepCC_TRUE + CCDEPMODE + AMDEPBACKSLASH + AMDEP_FALSE + AMDEP_TRUE + am__quote + am__include + DEPDIR OBJEXT EXEEXT ac_ct_CC *************** *** 797,802 **** --- 808,816 ---- build_vendor build_cpu build + GSL_MINOR_VERSION + GSL_MAJOR_VERSION + SED GSL_LT_CBLAS_VERSION GSL_LT_VERSION MAINT *************** *** 867,872 **** --- 881,887 ---- ac_user_opts=' enable_option_checking enable_maintainer_mode + enable_dependency_tracking enable_shared enable_static with_pic *************** *** 1424,1430 **** # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures gsl 1.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... --- 1439,1445 ---- # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures gsl 1.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... *************** *** 1494,1500 **** if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of gsl 1.13:";; esac cat <<\_ACEOF --- 1509,1515 ---- if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of gsl 1.14:";; esac cat <<\_ACEOF *************** *** 1504,1509 **** --- 1519,1526 ---- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] *************** *** 1523,1529 **** LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l ! CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor --- 1540,1546 ---- LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l ! CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor *************** *** 1593,1600 **** test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF ! gsl configure 1.13 ! generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation --- 1610,1617 ---- test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF ! gsl configure 1.14 ! generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation *************** *** 1641,1647 **** ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! return $ac_retval } # ac_fn_c_try_compile --- 1658,1664 ---- ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! as_fn_set_status $ac_retval } # ac_fn_c_try_compile *************** *** 1678,1684 **** ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! return $ac_retval } # ac_fn_c_try_cpp --- 1695,1701 ---- ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! as_fn_set_status $ac_retval } # ac_fn_c_try_cpp *************** *** 1724,1730 **** # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! return $ac_retval } # ac_fn_c_try_link --- 1741,1747 ---- # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! as_fn_set_status $ac_retval } # ac_fn_c_try_link *************** *** 1797,1803 **** fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! return $ac_retval } # ac_fn_c_try_run --- 1814,1820 ---- fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ! as_fn_set_status $ac_retval } # ac_fn_c_try_run *************** *** 2051,2058 **** This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. ! It was created by gsl $as_me 1.13, which was ! generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ --- 2068,2075 ---- This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. ! It was created by gsl $as_me 1.14, which was ! generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ *************** *** 2305,2311 **** for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue ! if test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 --- 2322,2328 ---- for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue ! if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 *************** *** 2314,2322 **** done if test -r "$cache_file"; then ! # Some versions of bash will fail to source /dev/null (special ! # files actually), so we avoid doing that. ! if test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in --- 2331,2339 ---- done if test -r "$cache_file"; then ! # Some versions of bash will fail to source /dev/null (special files ! # actually), so we avoid doing that. DJGPP emulates it as a regular file. ! if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in *************** *** 2737,2742 **** --- 2754,2760 ---- fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else *************** *** 2744,2750 **** # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi --- 2762,2767 ---- *************** *** 2861,2867 **** # Define the identity of the package. PACKAGE='gsl' ! VERSION='1.13' cat >>confdefs.h <<_ACEOF --- 2878,2884 ---- # Define the identity of the package. PACKAGE='gsl' ! VERSION='1.14' cat >>confdefs.h <<_ACEOF *************** *** 2928,2936 **** ! GSL_CURRENT=14 GSL_REVISION=0 ! GSL_AGE=14 CBLAS_CURRENT=0 CBLAS_REVISION=0 CBLAS_AGE=0 --- 2945,2953 ---- ! GSL_CURRENT=15 GSL_REVISION=0 ! GSL_AGE=15 CBLAS_CURRENT=0 CBLAS_REVISION=0 CBLAS_AGE=0 *************** *** 2951,2956 **** --- 2968,3047 ---- ;; esac + { $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 test "${ac_cv_path_SED+set}" = set; 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" + { test -f "$ac_path_SED" && $as_test_x "$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 + + GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([^.][^.]*\).*/\1/'` + GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[^.][^.]*.\([^.][^.]*\).*/\1/'` + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} *************** *** 3383,3414 **** ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ! #include int main () { - FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ! $as_echo_n "checking for C compiler default output file name... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: --- 3474,3503 ---- ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ! int main () { ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ! $as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: *************** *** 3470,3479 **** else ac_file='' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 - $as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : ! $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --- 3559,3568 ---- else ac_file='' fi if test -z "$ac_file"; then : ! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ! $as_echo "no" >&6; } ! $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 *************** *** 3481,3531 **** { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } fi ac_exeext=$ac_cv_exeext ! # Check that the compiler produces executables we can run. If not, either ! # the compiler is broken, or we cross compile. ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ! $as_echo_n "checking whether the C compiler works... " >&6; } ! # If not cross compiling, check that we can run a simple program. ! if test "$cross_compiling" != yes; then ! if { ac_try='./$ac_file' ! { { case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ! $as_echo "$ac_try_echo"; } >&5 ! (eval "$ac_try") 2>&5 ! ac_status=$? ! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ! test $ac_status = 0; }; }; then ! cross_compiling=no ! else ! if test "$cross_compiling" = maybe; then ! cross_compiling=yes ! else ! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ! as_fn_error "cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." "$LINENO" 5; } ! fi ! fi ! fi ! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ! $as_echo "yes" >&6; } ! ! rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 - $as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" --- 3570,3587 ---- { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext ! rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" *************** *** 3558,3570 **** as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi ! rm -f conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : --- 3614,3685 ---- as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi ! rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int + main () + { + FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files="$ac_clean_files conftest.out" + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } + if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + + rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out + ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : *************** *** 3827,3832 **** --- 3942,4136 ---- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: + @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # Ignore all kinds of additional output from `make'. + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; + esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else + AMDEP_TRUE='#' + AMDEP_FALSE= + fi + + + + depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' *************** *** 3985,3992 **** ! macro_version='2.2.6' ! macro_revision='1.3012' --- 4289,4296 ---- ! macro_version='2.2.6b' ! macro_revision='1.3017' *************** *** 4586,4598 **** else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext ! (eval echo "\"\$as_me:4589: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 ! (eval echo "\"\$as_me:4592: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 ! (eval echo "\"\$as_me:4595: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" --- 4890,4902 ---- else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext ! (eval echo "\"\$as_me:4893: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 ! (eval echo "\"\$as_me:4896: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 ! (eval echo "\"\$as_me:4899: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" *************** *** 5787,5793 **** ;; *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5790 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 6091,6097 ---- ;; *-*-irix6*) # Find out which ABI we are using. ! echo '#line 6094 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 7176,7186 **** -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7179: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7183: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. --- 7480,7490 ---- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7483: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7487: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. *************** *** 7515,7525 **** -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7518: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7522: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. --- 7819,7829 ---- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7822: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7826: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. *************** *** 7620,7630 **** -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7623: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7627: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 7924,7934 ---- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7927: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7931: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 7675,7685 **** -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7678: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 7979,7989 ---- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7982: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7986: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 10042,10048 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ! #line 10045 "configure" #include "confdefs.h" #if HAVE_DLFCN_H --- 10346,10352 ---- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ! #line 10349 "configure" #include "confdefs.h" #if HAVE_DLFCN_H *************** *** 10138,10144 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ! #line 10141 "configure" #include "confdefs.h" #if HAVE_DLFCN_H --- 10442,10448 ---- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF ! #line 10445 "configure" #include "confdefs.h" #if HAVE_DLFCN_H *************** *** 11342,11348 **** ! ac_config_files="$ac_config_files gsl_version.h gsl.spec gsl/Makefile test/Makefile err/Makefile sys/Makefile utils/Makefile const/Makefile min/Makefile multimin/Makefile ieee-utils/Makefile fft/Makefile specfunc/Makefile dht/Makefile fit/Makefile multifit/Makefile bspline/Makefile statistics/Makefile sum/Makefile roots/Makefile multiroots/Makefile ntuple/Makefile poly/Makefile qrng/Makefile rng/Makefile randist/Makefile siman/Makefile integration/Makefile interpolation/Makefile doc/Makefile block/Makefile vector/Makefile matrix/Makefile histogram/Makefile monte/Makefile ode-initval/Makefile cblas/Makefile blas/Makefile linalg/Makefile eigen/Makefile permutation/Makefile combination/Makefile sort/Makefile complex/Makefile diff/Makefile deriv/Makefile cheb/Makefile cdf/Makefile wavelet/Makefile Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 11646,11652 ---- ! ac_config_files="$ac_config_files gsl_version.h gsl.spec gsl/Makefile test/Makefile err/Makefile sys/Makefile utils/Makefile const/Makefile min/Makefile multimin/Makefile ieee-utils/Makefile fft/Makefile specfunc/Makefile dht/Makefile fit/Makefile multifit/Makefile bspline/Makefile statistics/Makefile sum/Makefile roots/Makefile multiroots/Makefile ntuple/Makefile poly/Makefile qrng/Makefile rng/Makefile randist/Makefile siman/Makefile integration/Makefile interpolation/Makefile doc/Makefile block/Makefile vector/Makefile matrix/Makefile histogram/Makefile monte/Makefile ode-initval/Makefile cblas/Makefile blas/Makefile linalg/Makefile eigen/Makefile permutation/Makefile combination/Makefile multiset/Makefile sort/Makefile complex/Makefile diff/Makefile deriv/Makefile cheb/Makefile cdf/Makefile wavelet/Makefile Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 11453,11458 **** --- 11757,11770 ---- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error "conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi if test -z "${MINGW32_HOST_TRUE}" && test -z "${MINGW32_HOST_FALSE}"; then as_fn_error "conditional \"MINGW32_HOST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 *************** *** 11865,11872 **** # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" ! This file was extended by gsl $as_me 1.13, which was ! generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 12177,12184 ---- # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" ! This file was extended by gsl $as_me 1.14, which was ! generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 11906,11911 **** --- 12218,12224 ---- -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files *************** *** 11928,11937 **** _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ ! gsl config.status 1.13 ! configured by $0, generated by GNU Autoconf 2.64, ! with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation --- 12241,12251 ---- _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ ! gsl config.status 1.14 ! configured by $0, generated by GNU Autoconf 2.65, ! with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation *************** *** 11969,11974 **** --- 12283,12290 ---- ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) *************** *** 12040,12045 **** --- 12356,12362 ---- # # INIT-COMMANDS # + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # The HP-UX ksh and POSIX shell print the target directory to stdout *************** *** 12305,12310 **** --- 12622,12628 ---- do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "gsl_version.h") CONFIG_FILES="$CONFIG_FILES gsl_version.h" ;; "gsl.spec") CONFIG_FILES="$CONFIG_FILES gsl.spec" ;; *************** *** 12348,12353 **** --- 12666,12672 ---- "eigen/Makefile") CONFIG_FILES="$CONFIG_FILES eigen/Makefile" ;; "permutation/Makefile") CONFIG_FILES="$CONFIG_FILES permutation/Makefile" ;; "combination/Makefile") CONFIG_FILES="$CONFIG_FILES combination/Makefile" ;; + "multiset/Makefile") CONFIG_FILES="$CONFIG_FILES multiset/Makefile" ;; "sort/Makefile") CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;; "complex/Makefile") CONFIG_FILES="$CONFIG_FILES complex/Makefile" ;; "diff/Makefile") CONFIG_FILES="$CONFIG_FILES diff/Makefile" ;; *************** *** 12459,12465 **** t delim :nl h ! s/\(.\{148\}\).*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p --- 12778,12784 ---- t delim :nl h ! s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p *************** *** 12473,12479 **** t nl :delim h ! s/\(.\{148\}\).*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p --- 12792,12798 ---- t nl :delim h ! s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p *************** *** 12940,12945 **** --- 13259,13359 ---- case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || + $as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || + $as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + } + ;; "libtool":C) # See if we are running on zsh, and set the options which allow our diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/configure.ac gsl-1.14/configure.ac *** gsl-1.13/configure.ac Tue Sep 8 10:31:41 2009 --- gsl-1.14/configure.ac Wed Mar 10 10:57:12 2010 *************** *** 1,9 **** dnl Process this file with autoconf to produce a configure script. ! AC_INIT([gsl],[1.13]) AC_CONFIG_SRCDIR(gsl_math.h) ! AM_INIT_AUTOMAKE([gnu no-dependencies]) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE --- 1,9 ---- dnl Process this file with autoconf to produce a configure script. ! AC_INIT([gsl],[1.14]) AC_CONFIG_SRCDIR(gsl_math.h) ! AM_INIT_AUTOMAKE([gnu]) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE *************** *** 25,30 **** --- 25,31 ---- dnl gsl-1.11 libgsl 12:0:12 libgslcblas 0:0:0 dnl gsl-1.12 libgsl 13:0:13 libgslcblas 0:0:0 dnl gsl-1.13 libgsl 14:0:14 libgslcblas 0:0:0 + dnl gsl-1.14 libgsl 15:0:15 libgslcblas 0:0:0 dnl dnl (*) There was an error on this release. Firstly, the versioning dnl numbers were not updated. Secondly, 2 functions were removed, but *************** *** 45,53 **** dnl so set to 0 if both happened. dnl ! GSL_CURRENT=14 GSL_REVISION=0 ! GSL_AGE=14 dnl CBLAS_CURRENT=0 CBLAS_REVISION=0 --- 46,54 ---- dnl so set to 0 if both happened. dnl ! GSL_CURRENT=15 GSL_REVISION=0 ! GSL_AGE=15 dnl CBLAS_CURRENT=0 CBLAS_REVISION=0 *************** *** 67,72 **** --- 68,82 ---- ;; esac + dnl Split VERSION into GSL_VERSION_MAJOR and GSL_VERSION_MINOR + dnl Follows AX_SPLIT_VERSION macro from AC-Archive + dnl Rhys Ulerich + AC_PROG_SED + GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'` + GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AC_SUBST(GSL_MAJOR_VERSION) + AC_SUBST(GSL_MINOR_VERSION) + dnl things required by automake dnl AC_ARG_PROGRAM AC_PROG_MAKE_SET *************** *** 543,547 **** #define GSL_DISABLE_DEPRECATED 1]) dnl ! AC_CONFIG_FILES([gsl_version.h gsl.spec gsl/Makefile test/Makefile err/Makefile sys/Makefile utils/Makefile const/Makefile min/Makefile multimin/Makefile ieee-utils/Makefile fft/Makefile specfunc/Makefile dht/Makefile fit/Makefile multifit/Makefile bspline/Makefile statistics/Makefile sum/Makefile roots/Makefile multiroots/Makefile ntuple/Makefile poly/Makefile qrng/Makefile rng/Makefile randist/Makefile siman/Makefile integration/Makefile interpolation/Makefile doc/Makefile block/Makefile vector/Makefile matrix/Makefile histogram/Makefile monte/Makefile ode-initval/Makefile cblas/Makefile blas/Makefile linalg/Makefile eigen/Makefile permutation/Makefile combination/Makefile sort/Makefile complex/Makefile diff/Makefile deriv/Makefile cheb/Makefile cdf/Makefile wavelet/Makefile Makefile]) AC_OUTPUT --- 553,557 ---- #define GSL_DISABLE_DEPRECATED 1]) dnl ! AC_CONFIG_FILES([gsl_version.h gsl.spec gsl/Makefile test/Makefile err/Makefile sys/Makefile utils/Makefile const/Makefile min/Makefile multimin/Makefile ieee-utils/Makefile fft/Makefile specfunc/Makefile dht/Makefile fit/Makefile multifit/Makefile bspline/Makefile statistics/Makefile sum/Makefile roots/Makefile multiroots/Makefile ntuple/Makefile poly/Makefile qrng/Makefile rng/Makefile randist/Makefile siman/Makefile integration/Makefile interpolation/Makefile doc/Makefile block/Makefile vector/Makefile matrix/Makefile histogram/Makefile monte/Makefile ode-initval/Makefile cblas/Makefile blas/Makefile linalg/Makefile eigen/Makefile permutation/Makefile combination/Makefile multiset/Makefile sort/Makefile complex/Makefile diff/Makefile deriv/Makefile cheb/Makefile cdf/Makefile wavelet/Makefile Makefile]) AC_OUTPUT diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/const/Makefile.in gsl-1.14/const/Makefile.in *** gsl-1.13/const/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/const/Makefile.in Wed Mar 10 10:58:16 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 52,59 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 52,60 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 101,111 **** --- 102,114 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 119,124 **** --- 122,129 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 178,184 **** --- 183,191 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 240,248 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps const/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps const/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 247,255 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu const/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu const/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 280,293 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 287,314 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 529,534 **** --- 550,556 ---- mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 574,579 **** --- 596,602 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/depcomp gsl-1.14/depcomp *** gsl-1.13/depcomp Mon Feb 4 13:53:53 2008 --- gsl-1.14/depcomp Wed Mar 10 10:58:12 2010 *************** *** 1,10 **** #! /bin/sh # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2007-03-29.01 ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software ! # Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 1,10 ---- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2009-04-28.21; # UTC ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ! # Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 17,25 **** # 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, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 17,23 ---- # 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 . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 87,92 **** --- 85,99 ---- depmode=dashmstdout fi + cygpath_u="cygpath -u -f -" + if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp + fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what *************** *** 192,205 **** ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' ! ' ' ' >> $depfile ! echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ! >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile --- 199,212 ---- ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' ! ' ' ' >> "$depfile" ! echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ! >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile *************** *** 328,334 **** if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. ! sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi --- 335,346 ---- if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. ! sed -ne '2,${ ! s/^ *// ! s/ \\*$// ! s/$/:/ ! p ! }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi *************** *** 404,410 **** # Remove the call to Libtool. if test "$libtool" = yes; then ! while test $1 != '--mode=compile'; do shift done shift --- 416,422 ---- # Remove the call to Libtool. if test "$libtool" = yes; then ! while test "X$1" != 'X--mode=compile'; do shift done shift *************** *** 455,486 **** "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then ! while test $1 != '--mode=compile'; do shift done shift fi # X makedepend shift ! cleared=no ! for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done ! obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" --- 467,505 ---- "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then ! while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift ! cleared=no eat=no ! for arg ! do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done ! obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" *************** *** 500,506 **** # Remove the call to Libtool. if test "$libtool" = yes; then ! while test $1 != '--mode=compile'; do shift done shift --- 519,525 ---- # Remove the call to Libtool. if test "$libtool" = yes; then ! while test "X$1" != 'X--mode=compile'; do shift done shift *************** *** 538,550 **** msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout, regardless of -o, ! # because we must use -o when running libtool. "$@" || exit $? IFS=" " for arg do case "$arg" in "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift --- 557,583 ---- msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift *************** *** 557,572 **** ;; esac done ! "$@" -E | ! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" ! . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" ! . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; none) exec "$@" ;; --- 590,612 ---- ;; esac done ! "$@" -E 2>/dev/null | ! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" ! sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" ! sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; + msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; *************** *** 585,589 **** # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-end: "$" # End: --- 625,630 ---- # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-time-zone: "UTC" ! # time-stamp-end: "; # UTC" # End: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/deriv/Makefile.in gsl-1.14/deriv/Makefile.in *** gsl-1.13/deriv/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/deriv/Makefile.in Wed Mar 10 10:58:16 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 247,255 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps deriv/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps deriv/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 254,262 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu deriv/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu deriv/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 298,311 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 305,333 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deriv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 547,552 **** --- 569,575 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 592,597 **** --- 615,621 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/dht/Makefile.in gsl-1.14/dht/Makefile.in *** gsl-1.13/dht/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/dht/Makefile.in Wed Mar 10 10:58:16 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 58,65 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 58,66 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 107,117 **** --- 108,120 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 125,130 **** --- 128,135 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 184,190 **** --- 189,197 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps dht/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps dht/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dht/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu dht/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,334 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dht.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 570,576 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 616,622 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/diff/Makefile.in gsl-1.14/diff/Makefile.in *** gsl-1.13/diff/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/diff/Makefile.in Wed Mar 10 10:58:17 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la \ ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 247,255 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps diff/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps diff/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 254,262 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu diff/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu diff/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 298,311 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 305,333 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 547,552 **** --- 569,575 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 592,597 **** --- 615,621 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/Makefile.am gsl-1.14/doc/Makefile.am *** gsl-1.13/doc/Makefile.am Wed Nov 19 09:13:46 2008 --- gsl-1.14/doc/Makefile.am Wed Mar 10 10:57:12 2010 *************** *** 2,20 **** info_TEXINFOS = gsl-ref.texi noinst_TEXINFOS = gsl-design.texi ! gsl_ref_TEXINFOS = err.texi cblas.texi blas.texi min.texi fft.texi rng.texi randist.texi roots.texi statistics.texi specfunc.texi specfunc-airy.texi specfunc-bessel.texi specfunc-clausen.texi specfunc-coulomb.texi specfunc-coupling.texi specfunc-dawson.texi specfunc-debye.texi specfunc-dilog.texi specfunc-elementary.texi specfunc-ellint.texi specfunc-elljac.texi specfunc-erf.texi specfunc-exp.texi specfunc-expint.texi specfunc-fermi-dirac.texi specfunc-gamma.texi specfunc-gegenbauer.texi specfunc-hyperg.texi specfunc-lambert.texi specfunc-laguerre.texi specfunc-legendre.texi specfunc-log.texi specfunc-mathieu.texi specfunc-pow-int.texi specfunc-psi.texi specfunc-synchrotron.texi specfunc-transport.texi specfunc-trig.texi specfunc-zeta.texi siman.texi vectors.texi debug.texi histogram.texi ode-initval.texi integration.texi ieee754.texi montecarlo.texi sum.texi intro.texi usage.texi dwt.texi dht.texi interp.texi poly.texi linalg.texi eigen.texi multiroots.texi sort.texi permutation.texi combination.texi complex.texi math.texi fitting.texi multifit.texi const.texi ntuple.texi diff.texi qrng.texi cheb.texi multimin.texi gpl.texi fdl.texi autoconf.texi freemanuals.texi bspline.texi man_MANS = gsl.3 gsl-config.1 gsl-randist.1 gsl-histogram.1 figures = multimin.eps siman-test.eps siman-energy.eps 12-cities.eps initial-route.eps final-route.eps fft-complex-radix2-f.eps fft-complex-radix2-t.eps fft-complex-radix2.eps fft-real-mixedradix.eps roots-bisection.eps roots-false-position.eps roots-newtons-method.eps roots-secant-method.eps histogram.eps histogram2d.eps min-interval.eps fit-wlinear.eps fit-wlinear2.eps fit-exp.eps ntuple.eps qrng.eps cheb.eps vdp.eps interp2.eps rand-beta.tex rand-binomial.tex rand-cauchy.tex rand-chisq.tex rand-erlang.tex rand-exponential.tex rand-fdist.tex rand-flat.tex rand-gamma.tex rand-gaussian.tex rand-geometric.tex rand-laplace.tex rand-logarithmic.tex rand-logistic.tex rand-lognormal.tex rand-pareto.tex rand-poisson.tex rand-hypergeometric.tex rand-nbinomial.tex rand-pascal.tex rand-bivariate-gaussian.tex rand-rayleigh.tex rand-rayleigh-tail.tex rand-tdist.tex rand-weibull.tex random-walk.tex randplots.gnp rand-exppow.tex rand-levy.tex rand-levyskew.tex rand-gumbel.tex rand-bernoulli.tex rand-gaussian-tail.tex rand-gumbel1.tex rand-gumbel2.tex landau.dat rand-landau.tex dwt-orig.eps dwt-samp.eps interpp2.eps bspline.eps ! examples_src = examples/blas.c examples/block.c examples/cblas.c examples/cdf.c examples/cheb.c examples/combination.c examples/const.c examples/demo_fn.c examples/diff.c examples/eigen.c examples/fft.c examples/fftmr.c examples/fftreal.c examples/fitting.c examples/fitting2.c examples/fitting3.c examples/histogram.c examples/histogram2d.c examples/ieee.c examples/ieeeround.c examples/integration.c examples/interp.c examples/intro.c examples/linalglu.c examples/matrix.c examples/matrixw.c examples/min.c examples/monte.c examples/ntupler.c examples/ntuplew.c examples/ode-initval.c examples/odefixed.c examples/permseq.c examples/permshuffle.c examples/polyroots.c examples/qrng.c examples/randpoisson.c examples/randwalk.c examples/rng.c examples/rngunif.c examples/rootnewt.c examples/roots.c examples/siman.c examples/sortsmall.c examples/specfun.c examples/specfun_e.c examples/stat.c examples/statsort.c examples/sum.c examples/vector.c examples/vectorr.c examples/vectorview.c examples/vectorw.c examples/demo_fn.h examples/dwt.c examples/expfit.c examples/nlfit.c examples/interpp.c examples/eigen_nonsymm.c examples/bspline.c examples/multimin.c examples/multiminfn.c examples/nmsimplex.c ! examples_out = examples/blas.out examples/block.out examples/cblas.out examples/cdf.out examples/combination.out examples/const.out examples/diff.out examples/integration.out examples/intro.out examples/linalglu.out examples/min.out examples/polyroots.out examples/randpoisson.2.out examples/randpoisson.out examples/rng.out examples/rngunif.2.out examples/rngunif.out examples/sortsmall.out examples/specfun.out examples/specfun_e.out examples/stat.out examples/statsort.out examples/sum.out examples/vectorview.out examples/ecg.dat examples/dwt.dat examples/multimin.out examples/nmsimplex.out noinst_DATA = $(examples_src) $(examples_out) $(figures) ! EXTRA_DIST = $(man_MANS) $(noinst_DATA) gsl-design.texi fftalgorithms.tex fftalgorithms.bib algorithm.sty algorithmic.sty calc.sty # pdf disabled, use postscript and ps2pdf .PHONY: pdf --- 2,20 ---- info_TEXINFOS = gsl-ref.texi noinst_TEXINFOS = gsl-design.texi ! gsl_ref_TEXINFOS = err.texi cblas.texi blas.texi min.texi fft.texi rng.texi randist.texi roots.texi statistics.texi specfunc.texi specfunc-airy.texi specfunc-bessel.texi specfunc-clausen.texi specfunc-coulomb.texi specfunc-coupling.texi specfunc-dawson.texi specfunc-debye.texi specfunc-dilog.texi specfunc-elementary.texi specfunc-ellint.texi specfunc-elljac.texi specfunc-erf.texi specfunc-exp.texi specfunc-expint.texi specfunc-fermi-dirac.texi specfunc-gamma.texi specfunc-gegenbauer.texi specfunc-hyperg.texi specfunc-lambert.texi specfunc-laguerre.texi specfunc-legendre.texi specfunc-log.texi specfunc-mathieu.texi specfunc-pow-int.texi specfunc-psi.texi specfunc-synchrotron.texi specfunc-transport.texi specfunc-trig.texi specfunc-zeta.texi siman.texi vectors.texi debug.texi histogram.texi ode-initval.texi integration.texi ieee754.texi montecarlo.texi sum.texi intro.texi usage.texi dwt.texi dht.texi interp.texi poly.texi linalg.texi eigen.texi multiroots.texi sort.texi permutation.texi combination.texi multiset.texi complex.texi math.texi fitting.texi multifit.texi const.texi ntuple.texi diff.texi qrng.texi cheb.texi multimin.texi gpl.texi fdl.texi autoconf.texi freemanuals.texi bspline.texi man_MANS = gsl.3 gsl-config.1 gsl-randist.1 gsl-histogram.1 figures = multimin.eps siman-test.eps siman-energy.eps 12-cities.eps initial-route.eps final-route.eps fft-complex-radix2-f.eps fft-complex-radix2-t.eps fft-complex-radix2.eps fft-real-mixedradix.eps roots-bisection.eps roots-false-position.eps roots-newtons-method.eps roots-secant-method.eps histogram.eps histogram2d.eps min-interval.eps fit-wlinear.eps fit-wlinear2.eps fit-exp.eps ntuple.eps qrng.eps cheb.eps vdp.eps interp2.eps rand-beta.tex rand-binomial.tex rand-cauchy.tex rand-chisq.tex rand-erlang.tex rand-exponential.tex rand-fdist.tex rand-flat.tex rand-gamma.tex rand-gaussian.tex rand-geometric.tex rand-laplace.tex rand-logarithmic.tex rand-logistic.tex rand-lognormal.tex rand-pareto.tex rand-poisson.tex rand-hypergeometric.tex rand-nbinomial.tex rand-pascal.tex rand-bivariate-gaussian.tex rand-rayleigh.tex rand-rayleigh-tail.tex rand-tdist.tex rand-weibull.tex random-walk.tex randplots.gnp rand-exppow.tex rand-levy.tex rand-levyskew.tex rand-gumbel.tex rand-bernoulli.tex rand-gaussian-tail.tex rand-gumbel1.tex rand-gumbel2.tex landau.dat rand-landau.tex dwt-orig.eps dwt-samp.eps interpp2.eps bspline.eps ! examples_src = examples/blas.c examples/block.c examples/cblas.c examples/cdf.c examples/cheb.c examples/combination.c examples/multiset.c examples/const.c examples/demo_fn.c examples/diff.c examples/eigen.c examples/fft.c examples/fftmr.c examples/fftreal.c examples/fitting.c examples/fitting2.c examples/fitting3.c examples/histogram.c examples/histogram2d.c examples/ieee.c examples/ieeeround.c examples/integration.c examples/interp.c examples/intro.c examples/linalglu.c examples/matrix.c examples/matrixw.c examples/min.c examples/monte.c examples/ntupler.c examples/ntuplew.c examples/ode-initval.c examples/odefixed.c examples/permseq.c examples/permshuffle.c examples/polyroots.c examples/qrng.c examples/randpoisson.c examples/randwalk.c examples/rng.c examples/rngunif.c examples/rootnewt.c examples/roots.c examples/siman.c examples/sortsmall.c examples/specfun.c examples/specfun_e.c examples/stat.c examples/statsort.c examples/sum.c examples/vector.c examples/vectorr.c examples/vectorview.c examples/vectorw.c examples/demo_fn.h examples/dwt.c examples/expfit.c examples/nlfit.c examples/interpp.c examples/eigen_nonsymm.c examples/bspline.c examples/multimin.c examples/multiminfn.c examples/nmsimplex.c ! examples_out = examples/blas.out examples/block.out examples/cblas.out examples/cdf.out examples/combination.out examples/multiset.out examples/const.out examples/diff.out examples/integration.out examples/intro.out examples/linalglu.out examples/min.out examples/polyroots.out examples/randpoisson.2.out examples/randpoisson.out examples/rng.out examples/rngunif.2.out examples/rngunif.out examples/sortsmall.out examples/specfun.out examples/specfun_e.out examples/stat.out examples/statsort.out examples/sum.out examples/vectorview.out examples/ecg.dat examples/dwt.dat examples/multimin.out examples/nmsimplex.out noinst_DATA = $(examples_src) $(examples_out) $(figures) ! EXTRA_DIST = $(man_MANS) $(noinst_DATA) gsl-design.texi fftalgorithms.tex fftalgorithms.bib algorithm.sty algorithmic.sty calc.sty statnotes.tex # pdf disabled, use postscript and ps2pdf .PHONY: pdf diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/Makefile.in gsl-1.14/doc/Makefile.in *** gsl-1.13/doc/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/doc/Makefile.in Wed Mar 10 10:58:17 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 46,53 **** CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = - depcomp = - am__depfiles_maybe = SOURCES = DIST_SOURCES = INFO_DEPS = $(srcdir)/gsl-ref.info --- 46,51 ---- *************** *** 99,109 **** --- 97,109 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 117,122 **** --- 117,124 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 176,182 **** --- 178,186 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 240,248 **** ode-initval.texi integration.texi ieee754.texi montecarlo.texi \ sum.texi intro.texi usage.texi dwt.texi dht.texi interp.texi \ poly.texi linalg.texi eigen.texi multiroots.texi sort.texi \ ! permutation.texi combination.texi complex.texi math.texi \ ! fitting.texi multifit.texi const.texi ntuple.texi diff.texi \ ! qrng.texi cheb.texi multimin.texi gpl.texi fdl.texi \ autoconf.texi freemanuals.texi bspline.texi man_MANS = gsl.3 gsl-config.1 gsl-randist.1 gsl-histogram.1 figures = multimin.eps siman-test.eps siman-energy.eps 12-cities.eps \ --- 244,252 ---- ode-initval.texi integration.texi ieee754.texi montecarlo.texi \ sum.texi intro.texi usage.texi dwt.texi dht.texi interp.texi \ poly.texi linalg.texi eigen.texi multiroots.texi sort.texi \ ! permutation.texi combination.texi multiset.texi complex.texi \ ! math.texi fitting.texi multifit.texi const.texi ntuple.texi \ ! diff.texi qrng.texi cheb.texi multimin.texi gpl.texi fdl.texi \ autoconf.texi freemanuals.texi bspline.texi man_MANS = gsl.3 gsl-config.1 gsl-randist.1 gsl-histogram.1 figures = multimin.eps siman-test.eps siman-energy.eps 12-cities.eps \ *************** *** 268,277 **** interpp2.eps bspline.eps examples_src = examples/blas.c examples/block.c examples/cblas.c \ examples/cdf.c examples/cheb.c examples/combination.c \ ! examples/const.c examples/demo_fn.c examples/diff.c \ ! examples/eigen.c examples/fft.c examples/fftmr.c \ ! examples/fftreal.c examples/fitting.c examples/fitting2.c \ ! examples/fitting3.c examples/histogram.c \ examples/histogram2d.c examples/ieee.c examples/ieeeround.c \ examples/integration.c examples/interp.c examples/intro.c \ examples/linalglu.c examples/matrix.c examples/matrixw.c \ --- 272,281 ---- interpp2.eps bspline.eps examples_src = examples/blas.c examples/block.c examples/cblas.c \ examples/cdf.c examples/cheb.c examples/combination.c \ ! examples/multiset.c examples/const.c examples/demo_fn.c \ ! examples/diff.c examples/eigen.c examples/fft.c \ ! examples/fftmr.c examples/fftreal.c examples/fitting.c \ ! examples/fitting2.c examples/fitting3.c examples/histogram.c \ examples/histogram2d.c examples/ieee.c examples/ieeeround.c \ examples/integration.c examples/interp.c examples/intro.c \ examples/linalglu.c examples/matrix.c examples/matrixw.c \ *************** *** 288,296 **** examples/nlfit.c examples/interpp.c examples/eigen_nonsymm.c \ examples/bspline.c examples/multimin.c examples/multiminfn.c \ examples/nmsimplex.c ! examples_out = examples/blas.out examples/block.out examples/cblas.out examples/cdf.out examples/combination.out examples/const.out examples/diff.out examples/integration.out examples/intro.out examples/linalglu.out examples/min.out examples/polyroots.out examples/randpoisson.2.out examples/randpoisson.out examples/rng.out examples/rngunif.2.out examples/rngunif.out examples/sortsmall.out examples/specfun.out examples/specfun_e.out examples/stat.out examples/statsort.out examples/sum.out examples/vectorview.out examples/ecg.dat examples/dwt.dat examples/multimin.out examples/nmsimplex.out noinst_DATA = $(examples_src) $(examples_out) $(figures) ! EXTRA_DIST = $(man_MANS) $(noinst_DATA) gsl-design.texi fftalgorithms.tex fftalgorithms.bib algorithm.sty algorithmic.sty calc.sty all: all-am .SUFFIXES: --- 292,300 ---- examples/nlfit.c examples/interpp.c examples/eigen_nonsymm.c \ examples/bspline.c examples/multimin.c examples/multiminfn.c \ examples/nmsimplex.c ! examples_out = examples/blas.out examples/block.out examples/cblas.out examples/cdf.out examples/combination.out examples/multiset.out examples/const.out examples/diff.out examples/integration.out examples/intro.out examples/linalglu.out examples/min.out examples/polyroots.out examples/randpoisson.2.out examples/randpoisson.out examples/rng.out examples/rngunif.2.out examples/rngunif.out examples/sortsmall.out examples/specfun.out examples/specfun_e.out examples/stat.out examples/statsort.out examples/sum.out examples/vectorview.out examples/ecg.dat examples/dwt.dat examples/multimin.out examples/nmsimplex.out noinst_DATA = $(examples_src) $(examples_out) $(figures) ! EXTRA_DIST = $(man_MANS) $(noinst_DATA) gsl-design.texi fftalgorithms.tex fftalgorithms.bib algorithm.sty algorithmic.sty calc.sty statnotes.tex all: all-am .SUFFIXES: *************** *** 304,312 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 308,316 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/blas.texi gsl-1.14/doc/blas.texi *** gsl-1.13/doc/blas.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/blas.texi Wed Mar 10 10:57:12 2010 *************** *** 662,668 **** updated interface standards, is available online from the @sc{blas} Homepage and @sc{blas} Technical Forum web-site. ! @itemize @asis @item @cite{BLAS Homepage} @* @uref{http://www.netlib.org/blas/} --- 662,668 ---- updated interface standards, is available online from the @sc{blas} Homepage and @sc{blas} Technical Forum web-site. ! @itemize @w{} @item @cite{BLAS Homepage} @* @uref{http://www.netlib.org/blas/} *************** *** 675,681 **** The following papers contain the specifications for Level 1, Level 2 and Level 3 @sc{blas}. ! @itemize @asis @item C. Lawson, R. Hanson, D. Kincaid, F. Krogh, ``Basic Linear Algebra Subprograms for Fortran Usage'', @cite{ACM Transactions on Mathematical --- 675,681 ---- The following papers contain the specifications for Level 1, Level 2 and Level 3 @sc{blas}. ! @itemize @w{} @item C. Lawson, R. Hanson, D. Kincaid, F. Krogh, ``Basic Linear Algebra Subprograms for Fortran Usage'', @cite{ACM Transactions on Mathematical diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/bspline.texi gsl-1.14/doc/bspline.texi *** gsl-1.13/doc/bspline.texi Tue Jul 7 19:30:22 2009 --- gsl-1.14/doc/bspline.texi Wed Mar 10 10:57:12 2010 *************** *** 252,258 **** Further information on the algorithms described in this section can be found in the following book, ! @itemize @asis C. de Boor, @cite{A Practical Guide to Splines} (1978), Springer-Verlag, ISBN 0-387-90356-9. @end itemize --- 252,258 ---- Further information on the algorithms described in this section can be found in the following book, ! @itemize @w{} C. de Boor, @cite{A Practical Guide to Splines} (1978), Springer-Verlag, ISBN 0-387-90356-9. @end itemize *************** *** 260,266 **** Further information of Greville abscissae and B-spline collocation can be found in the following paper, ! @itemize @asis Richard W. Johnson, Higher order B-spline collocation at the Greville abscissae. @cite{Applied Numerical Mathematics}. vol.@: 52, 2005, 63--75. @end itemize --- 260,266 ---- Further information of Greville abscissae and B-spline collocation can be found in the following paper, ! @itemize @w{} Richard W. Johnson, Higher order B-spline collocation at the Greville abscissae. @cite{Applied Numerical Mathematics}. vol.@: 52, 2005, 63--75. @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/cheb.texi gsl-1.14/doc/cheb.texi *** gsl-1.13/doc/cheb.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/cheb.texi Wed Mar 10 10:57:12 2010 *************** *** 186,192 **** The following paper describes the use of Chebyshev series, ! @itemize @asis @item R. Broucke, ``Ten Subroutines for the Manipulation of Chebyshev Series [C1] (Algorithm 446)''. @cite{Communications of the ACM} 16(4), 254--256 --- 186,192 ---- The following paper describes the use of Chebyshev series, ! @itemize @w{} @item R. Broucke, ``Ten Subroutines for the Manipulation of Chebyshev Series [C1] (Algorithm 446)''. @cite{Communications of the ACM} 16(4), 254--256 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/combination.texi gsl-1.14/doc/combination.texi *** gsl-1.13/doc/combination.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/combination.texi Wed Mar 10 10:57:12 2010 *************** *** 211,217 **** @noindent Further information on combinations can be found in, ! @itemize @asis @item Donald L. Kreher, Douglas R. Stinson, @cite{Combinatorial Algorithms: Generation, Enumeration and Search}, 1998, CRC Press LLC, ISBN --- 211,217 ---- @noindent Further information on combinations can be found in, ! @itemize @w{} @item Donald L. Kreher, Douglas R. Stinson, @cite{Combinatorial Algorithms: Generation, Enumeration and Search}, 1998, CRC Press LLC, ISBN diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/complex.texi gsl-1.14/doc/complex.texi *** gsl-1.13/doc/complex.texi Sat Jan 31 14:40:46 2009 --- gsl-1.14/doc/complex.texi Wed Mar 10 10:57:12 2010 *************** *** 457,463 **** The implementations of the elementary and trigonometric functions are based on the following papers, ! @itemize @asis @item T. E. Hull, Thomas F. Fairgrieve, Ping Tak Peter Tang, ``Implementing Complex Elementary Functions Using Exception --- 457,463 ---- The implementations of the elementary and trigonometric functions are based on the following papers, ! @itemize @w{} @item T. E. Hull, Thomas F. Fairgrieve, Ping Tak Peter Tang, ``Implementing Complex Elementary Functions Using Exception *************** *** 475,481 **** The general formulas and details of branch cuts can be found in the following books, ! @itemize @asis @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, ``Circular Functions in Terms of Real and Imaginary Parts'', Formulas --- 475,481 ---- The general formulas and details of branch cuts can be found in the following books, ! @itemize @w{} @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, ``Circular Functions in Terms of Real and Imaginary Parts'', Formulas diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/const.texi gsl-1.14/doc/const.texi *** gsl-1.13/doc/const.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/const.texi Wed Mar 10 10:57:12 2010 *************** *** 566,572 **** information on the values of physical constants is also available from the NIST website. ! @itemize @asis @item P.J. Mohr, B.N. Taylor, D.B. Newell, ``CODATA Recommended Values of the Fundamental Physical Constants: 2006'', Reviews of Modern Physics, 80(2), pp. 633--730 (2008). --- 566,572 ---- information on the values of physical constants is also available from the NIST website. ! @itemize @w{} @item P.J. Mohr, B.N. Taylor, D.B. Newell, ``CODATA Recommended Values of the Fundamental Physical Constants: 2006'', Reviews of Modern Physics, 80(2), pp. 633--730 (2008). diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/debug.texi gsl-1.14/doc/debug.texi *** gsl-1.13/doc/debug.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/debug.texi Wed Mar 10 10:57:12 2010 *************** *** 365,371 **** The following books are essential reading for anyone writing and debugging numerical programs with @sc{gcc} and @sc{gdb}. ! @itemize @asis @item R.M. Stallman, @cite{Using and Porting GNU CC}, Free Software Foundation, ISBN 1882114388 --- 365,371 ---- The following books are essential reading for anyone writing and debugging numerical programs with @sc{gcc} and @sc{gdb}. ! @itemize @w{} @item R.M. Stallman, @cite{Using and Porting GNU CC}, Free Software Foundation, ISBN 1882114388 *************** *** 379,385 **** For a tutorial introduction to the GNU C Compiler and related programs, see ! @itemize @asis @item B.J. Gough, @cite{An Introduction to GCC}, Network Theory Ltd, ISBN 0954161793 --- 379,385 ---- For a tutorial introduction to the GNU C Compiler and related programs, see ! @itemize @w{} @item B.J. Gough, @cite{An Introduction to GCC}, Network Theory Ltd, ISBN 0954161793 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/dht.texi gsl-1.14/doc/dht.texi *** gsl-1.13/doc/dht.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/dht.texi Wed Mar 10 10:57:12 2010 *************** *** 20,28 **** the discrete Fourier transform, where samples are taken at points related to the zeroes of the sine or cosine function. ! Specifically, let @math{f(t)} be a function on the unit interval. ! Then the finite @math{\nu}-Hankel transform of @math{f(t)} is defined ! to be the set of numbers @math{g_m} given by, @tex \beforedisplay $$ --- 20,30 ---- the discrete Fourier transform, where samples are taken at points related to the zeroes of the sine or cosine function. ! Specifically, let @math{f(t)} be a function on the unit interval and ! @c{$j_{\nu,m}$} ! @math{j_(\nu,m)} the @math{m}-th zero of the Bessel function ! @math{J_\nu(x)}. Then the finite @math{\nu}-Hankel transform of ! @math{f(t)} is defined to be the set of numbers @math{g_m} given by, @tex \beforedisplay $$ *************** *** 41,53 **** @tex \beforedisplay $$ ! f(t) = \sum_{m=1}^\infty {{2 J_\nu(j_{\nu,m}x)}\over{J_{\nu+1}(j_{\nu,m})^2}} g_m. $$ \afterdisplay @end tex @ifinfo @example ! f(t) = \sum_@{m=1@}^\infty (2 J_\nu(j_(\nu,m)x) / J_(\nu+1)(j_(\nu,m))^2) g_m. @end example @end ifinfo --- 43,55 ---- @tex \beforedisplay $$ ! f(t) = \sum_{m=1}^\infty {{2 J_\nu(j_{\nu,m}t)}\over{J_{\nu+1}(j_{\nu,m})^2}} g_m. $$ \afterdisplay @end tex @ifinfo @example ! f(t) = \sum_@{m=1@}^\infty (2 J_\nu(j_(\nu,m)t) / J_(\nu+1)(j_(\nu,m))^2) g_m. @end example @end ifinfo *************** *** 121,127 **** @deftypefun int gsl_dht_apply (const gsl_dht * @var{t}, double * @var{f_in}, double * @var{f_out}) This function applies the transform @var{t} to the array @var{f_in} whose size is equal to the size of the transform. The result is stored ! in the array @var{f_out} which must be of the same length. @end deftypefun @deftypefun double gsl_dht_x_sample (const gsl_dht * @var{t}, int @var{n}) --- 123,133 ---- @deftypefun int gsl_dht_apply (const gsl_dht * @var{t}, double * @var{f_in}, double * @var{f_out}) This function applies the transform @var{t} to the array @var{f_in} whose size is equal to the size of the transform. The result is stored ! in the array @var{f_out} which must be of the same length. ! ! Applying this function to its output gives the original data ! multiplied by @c{$(1/j_{\nu,M})^2$} ! @math{(1/j_(\nu,M))^2}, up to numerical errors. @end deftypefun @deftypefun double gsl_dht_x_sample (const gsl_dht * @var{t}, int @var{n}) *************** *** 142,153 **** The algorithms used by these functions are described in the following papers, ! @itemize @asis @item H. Fisk Johnson, Comp.@: Phys.@: Comm.@: 43, 181 (1987). @end itemize ! @itemize @asis @item D. Lemoine, J. Chem.@: Phys.@: 101, 3936 (1994). @end itemize --- 148,159 ---- The algorithms used by these functions are described in the following papers, ! @itemize @w{} @item H. Fisk Johnson, Comp.@: Phys.@: Comm.@: 43, 181 (1987). @end itemize ! @itemize @w{} @item D. Lemoine, J. Chem.@: Phys.@: 101, 3936 (1994). @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/diff.texi gsl-1.14/doc/diff.texi *** gsl-1.13/doc/diff.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/diff.texi Wed Mar 10 10:57:12 2010 *************** *** 94,100 **** The algorithms used by these functions are described in the following sources: ! @itemize @asis @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, Section 25.3.4, and Table 25.5 (Coefficients for Differentiation). --- 94,100 ---- The algorithms used by these functions are described in the following sources: ! @itemize @w{} @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, Section 25.3.4, and Table 25.5 (Coefficients for Differentiation). diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/dwt.texi gsl-1.14/doc/dwt.texi *** gsl-1.13/doc/dwt.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/dwt.texi Wed Mar 10 10:57:12 2010 *************** *** 133,139 **** @deffnx {Wavelet} gsl_wavelet_daubechies_centered @cindex Daubechies wavelets @cindex maximal phase, Daubechies wavelets ! The is the Daubechies wavelet family of maximum phase with @math{k/2} vanishing moments. The implemented wavelets are @c{$k=4, 6, \dots, 20$} @math{k=4, 6, @dots{}, 20}, with @var{k} even. --- 133,139 ---- @deffnx {Wavelet} gsl_wavelet_daubechies_centered @cindex Daubechies wavelets @cindex maximal phase, Daubechies wavelets ! This is the Daubechies wavelet family of maximum phase with @math{k/2} vanishing moments. The implemented wavelets are @c{$k=4, 6, \dots, 20$} @math{k=4, 6, @dots{}, 20}, with @var{k} even. *************** *** 185,191 **** of size @var{n} must be provided. For two-dimensional transforms of @var{n}-by-@var{n} matrices it is sufficient to allocate a workspace of size @var{n}, since the transform operates on individual rows and ! columns. @end deftypefun @deftypefun {void} gsl_wavelet_workspace_free (gsl_wavelet_workspace * @var{work}) --- 185,191 ---- of size @var{n} must be provided. For two-dimensional transforms of @var{n}-by-@var{n} matrices it is sufficient to allocate a workspace of size @var{n}, since the transform operates on individual rows and ! columns. A null pointer is returned if insufficient memory is available. @end deftypefun @deftypefun {void} gsl_wavelet_workspace_free (gsl_wavelet_workspace * @var{work}) *************** *** 371,377 **** The mathematical background to wavelet transforms is covered in the original lectures by Daubechies, ! @itemize @asis @item Ingrid Daubechies. Ten Lectures on Wavelets. --- 371,377 ---- The mathematical background to wavelet transforms is covered in the original lectures by Daubechies, ! @itemize @w{} @item Ingrid Daubechies. Ten Lectures on Wavelets. *************** *** 383,389 **** An easy to read introduction to the subject with an emphasis on the application of the wavelet transform in various branches of science is, ! @itemize @asis @item Paul S. Addison. @cite{The Illustrated Wavelet Transform Handbook}. Institute of Physics Publishing (2002), ISBN 0750306920. --- 383,389 ---- An easy to read introduction to the subject with an emphasis on the application of the wavelet transform in various branches of science is, ! @itemize @w{} @item Paul S. Addison. @cite{The Illustrated Wavelet Transform Handbook}. Institute of Physics Publishing (2002), ISBN 0750306920. *************** *** 393,399 **** For extensive coverage of signal analysis by wavelets, wavelet packets and local cosine bases see, ! @itemize @asis @item S. G. Mallat. @cite{A wavelet tour of signal processing} (Second edition). Academic Press (1999), ISBN 012466606X. --- 393,399 ---- For extensive coverage of signal analysis by wavelets, wavelet packets and local cosine bases see, ! @itemize @w{} @item S. G. Mallat. @cite{A wavelet tour of signal processing} (Second edition). Academic Press (1999), ISBN 012466606X. *************** *** 403,416 **** The concept of multiresolution analysis underlying the wavelet transform is described in, ! @itemize @asis @item S. G. Mallat. Multiresolution Approximations and Wavelet Orthonormal Bases of L@math{^2}(R). @cite{Transactions of the American Mathematical Society}, 315(1), 1989, 69--87. @end itemize ! @itemize @asis @item S. G. Mallat. A Theory for Multiresolution Signal Decomposition---The Wavelet Representation. --- 403,416 ---- The concept of multiresolution analysis underlying the wavelet transform is described in, ! @itemize @w{} @item S. G. Mallat. Multiresolution Approximations and Wavelet Orthonormal Bases of L@math{^2}(R). @cite{Transactions of the American Mathematical Society}, 315(1), 1989, 69--87. @end itemize ! @itemize @w{} @item S. G. Mallat. A Theory for Multiresolution Signal Decomposition---The Wavelet Representation. *************** *** 422,435 **** The coefficients for the individual wavelet families implemented by the library can be found in the following papers, ! @itemize @asis @item I. Daubechies. Orthonormal Bases of Compactly Supported Wavelets. @cite{Communications on Pure and Applied Mathematics}, 41 (1988) 909--996. @end itemize ! @itemize @asis @item A. Cohen, I. Daubechies, and J.-C. Feauveau. Biorthogonal Bases of Compactly Supported Wavelets. --- 422,435 ---- The coefficients for the individual wavelet families implemented by the library can be found in the following papers, ! @itemize @w{} @item I. Daubechies. Orthonormal Bases of Compactly Supported Wavelets. @cite{Communications on Pure and Applied Mathematics}, 41 (1988) 909--996. @end itemize ! @itemize @w{} @item A. Cohen, I. Daubechies, and J.-C. Feauveau. Biorthogonal Bases of Compactly Supported Wavelets. *************** *** 442,448 **** @uref{http://www.physionet.org/} and is described in the following paper, ! @itemize @asis @item Goldberger et al. PhysioBank, PhysioToolkit, and PhysioNet: Components --- 442,448 ---- @uref{http://www.physionet.org/} and is described in the following paper, ! @itemize @w{} @item Goldberger et al. PhysioBank, PhysioToolkit, and PhysioNet: Components diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/eigen.texi gsl-1.14/doc/eigen.texi *** gsl-1.13/doc/eigen.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/eigen.texi Wed Mar 10 10:57:12 2010 *************** *** 808,814 **** Further information on the algorithms described in this section can be found in the following book, ! @itemize @asis @item G. H. Golub, C. F. Van Loan, @cite{Matrix Computations} (3rd Ed, 1996), Johns Hopkins University Press, ISBN 0-8018-5414-8. --- 808,814 ---- Further information on the algorithms described in this section can be found in the following book, ! @itemize @w{} @item G. H. Golub, C. F. Van Loan, @cite{Matrix Computations} (3rd Ed, 1996), Johns Hopkins University Press, ISBN 0-8018-5414-8. *************** *** 818,824 **** Further information on the generalized eigensystems QZ algorithm can be found in this paper, ! @itemize @asis @item C. Moler, G. Stewart, ``An Algorithm for Generalized Matrix Eigenvalue Problems'', SIAM J. Numer. Anal., Vol 10, No 2, 1973. --- 818,824 ---- Further information on the generalized eigensystems QZ algorithm can be found in this paper, ! @itemize @w{} @item C. Moler, G. Stewart, ``An Algorithm for Generalized Matrix Eigenvalue Problems'', SIAM J. Numer. Anal., Vol 10, No 2, 1973. *************** *** 829,835 **** Eigensystem routines for very large matrices can be found in the Fortran library @sc{lapack}. The @sc{lapack} library is described in, ! @itemize @asis @item @cite{LAPACK Users' Guide} (Third Edition, 1999), Published by SIAM, ISBN 0-89871-447-8. --- 829,835 ---- Eigensystem routines for very large matrices can be found in the Fortran library @sc{lapack}. The @sc{lapack} library is described in, ! @itemize @w{} @item @cite{LAPACK Users' Guide} (Third Edition, 1999), Published by SIAM, ISBN 0-89871-447-8. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/examples/multiset.c gsl-1.14/doc/examples/multiset.c *** gsl-1.13/doc/examples/multiset.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/doc/examples/multiset.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,25 ---- + #include + #include + + int + main (void) + { + gsl_multiset * c; + size_t i; + + printf ("All multisets of {0,1,2,3} by size:\n") ; + for (i = 0; i <= 4; i++) + { + c = gsl_multiset_calloc (4, i); + do + { + printf ("{"); + gsl_multiset_fprintf (stdout, c, " %u"); + printf (" }\n"); + } + while (gsl_multiset_next (c) == GSL_SUCCESS); + gsl_multiset_free (c); + } + + return 0; + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/examples/multiset.out gsl-1.14/doc/examples/multiset.out *** gsl-1.13/doc/examples/multiset.out Thu Jan 1 00:00:00 1970 --- gsl-1.14/doc/examples/multiset.out Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,71 ---- + all multisets of {0,1,2,3} by size: + { } + { 0 } + { 1 } + { 2 } + { 3 } + { 0 0 } + { 0 1 } + { 0 2 } + { 0 3 } + { 1 1 } + { 1 2 } + { 1 3 } + { 2 2 } + { 2 3 } + { 3 3 } + { 0 0 0 } + { 0 0 1 } + { 0 0 2 } + { 0 0 3 } + { 0 1 1 } + { 0 1 2 } + { 0 1 3 } + { 0 2 2 } + { 0 2 3 } + { 0 3 3 } + { 1 1 1 } + { 1 1 2 } + { 1 1 3 } + { 1 2 2 } + { 1 2 3 } + { 1 3 3 } + { 2 2 2 } + { 2 2 3 } + { 2 3 3 } + { 3 3 3 } + { 0 0 0 0 } + { 0 0 0 1 } + { 0 0 0 2 } + { 0 0 0 3 } + { 0 0 1 1 } + { 0 0 1 2 } + { 0 0 1 3 } + { 0 0 2 2 } + { 0 0 2 3 } + { 0 0 3 3 } + { 0 1 1 1 } + { 0 1 1 2 } + { 0 1 1 3 } + { 0 1 2 2 } + { 0 1 2 3 } + { 0 1 3 3 } + { 0 2 2 2 } + { 0 2 2 3 } + { 0 2 3 3 } + { 0 3 3 3 } + { 1 1 1 1 } + { 1 1 1 2 } + { 1 1 1 3 } + { 1 1 2 2 } + { 1 1 2 3 } + { 1 1 3 3 } + { 1 2 2 2 } + { 1 2 2 3 } + { 1 2 3 3 } + { 1 3 3 3 } + { 2 2 2 2 } + { 2 2 2 3 } + { 2 2 3 3 } + { 2 3 3 3 } + { 3 3 3 3 } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/fft.texi gsl-1.14/doc/fft.texi *** gsl-1.13/doc/fft.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/fft.texi Wed Mar 10 10:57:13 2010 *************** *** 932,938 **** article @cite{Fast Fourier Transforms: A Tutorial Review and A State of the Art} by Duhamel and Vetterli, ! @itemize @asis @item P. Duhamel and M. Vetterli. Fast fourier transforms: A tutorial review and a state of the art. --- 932,938 ---- article @cite{Fast Fourier Transforms: A Tutorial Review and A State of the Art} by Duhamel and Vetterli, ! @itemize @w{} @item P. Duhamel and M. Vetterli. Fast fourier transforms: A tutorial review and a state of the art. *************** *** 952,958 **** such as @cite{The Fast Fourier Transform} by Brigham and @cite{DFT/FFT and Convolution Algorithms} by Burrus and Parks, ! @itemize @asis @item E. Oran Brigham. @cite{The Fast Fourier Transform}. --- 952,958 ---- such as @cite{The Fast Fourier Transform} by Brigham and @cite{DFT/FFT and Convolution Algorithms} by Burrus and Parks, ! @itemize @w{} @item E. Oran Brigham. @cite{The Fast Fourier Transform}. *************** *** 969,975 **** The mixed-radix algorithm at the heart of the @sc{fftpack} routines is reviewed in Clive Temperton's paper, ! @itemize @asis @item Clive Temperton. Self-sorting mixed-radix fast fourier transforms. --- 969,975 ---- The mixed-radix algorithm at the heart of the @sc{fftpack} routines is reviewed in Clive Temperton's paper, ! @itemize @w{} @item Clive Temperton. Self-sorting mixed-radix fast fourier transforms. *************** *** 980,986 **** The derivation of FFTs for real-valued data is explained in the following two articles, ! @itemize @asis @item Henrik V. Sorenson, Douglas L. Jones, Michael T. Heideman, and C. Sidney Burrus. --- 980,986 ---- The derivation of FFTs for real-valued data is explained in the following two articles, ! @itemize @w{} @item Henrik V. Sorenson, Douglas L. Jones, Michael T. Heideman, and C. Sidney Burrus. *************** *** 1000,1006 **** useful reference for implementations of many different FFT algorithms, ! @itemize @asis @item Digital Signal Processing Committee and IEEE Acoustics, Speech, and Signal Processing Committee, editors. --- 1000,1006 ---- useful reference for implementations of many different FFT algorithms, ! @itemize @w{} @item Digital Signal Processing Committee and IEEE Acoustics, Speech, and Signal Processing Committee, editors. *************** *** 1011,1017 **** @comment There is also an annotated bibliography of papers on the FFT and related @comment topics by Burrus, ! @comment @itemize @asis @comment @item C. S. Burrus. Notes on the FFT. @comment @end itemize @comment @noindent --- 1011,1017 ---- @comment There is also an annotated bibliography of papers on the FFT and related @comment topics by Burrus, ! @comment @itemize @w{} @comment @item C. S. Burrus. Notes on the FFT. @comment @end itemize @comment @noindent *************** *** 1023,1029 **** automatically tunes itself for each hardware platform in order to achieve maximum performance. It is available under the GNU GPL. ! @itemize @asis @item FFTW Website, @uref{http://www.fftw.org/} @end itemize --- 1023,1029 ---- automatically tunes itself for each hardware platform in order to achieve maximum performance. It is available under the GNU GPL. ! @itemize @w{} @item FFTW Website, @uref{http://www.fftw.org/} @end itemize *************** *** 1031,1037 **** @noindent The source code for @sc{fftpack} is available from Netlib, ! @itemize @asis @item FFTPACK, @uref{http://www.netlib.org/fftpack/} @end itemize --- 1031,1037 ---- @noindent The source code for @sc{fftpack} is available from Netlib, ! @itemize @w{} @item FFTPACK, @uref{http://www.netlib.org/fftpack/} @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/fitting.texi gsl-1.14/doc/fitting.texi *** gsl-1.13/doc/fitting.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/fitting.texi Wed Mar 10 10:57:13 2010 *************** *** 303,350 **** @end deftypefun @deftypefun int gsl_multifit_linear (const gsl_matrix * @var{X}, const gsl_vector * @var{y}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! @deftypefunx int gsl_multifit_linear_svd (const gsl_matrix * @var{X}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! These functions compute the best-fit parameters @var{c} of the model ! @math{y = X c} for the observations @var{y} and the matrix of predictor ! variables @var{X}. The variance-covariance matrix of the model ! parameters @var{cov} is estimated from the scatter of the observations ! about the best-fit. The sum of squares of the residuals from the ! best-fit, @math{\chi^2}, is returned in @var{chisq}. If the coefficient ! of determination is desired, it can be computed from the expression @math{R^2 = 1 - \chi^2 / TSS}, where the total sum of squares (TSS) of the observations @var{y} may be computed from @code{gsl_stats_tss}. The best-fit is found by singular value decomposition of the matrix ! @var{X} using the preallocated workspace provided in @var{work}. The ! modified Golub-Reinsch SVD algorithm is used, with column scaling to ! improve the accuracy of the singular values. Any components which have ! zero singular value (to machine precision) are discarded from the fit. ! In the second form of the function the components are discarded if the ! ratio of singular values @math{s_i/s_0} falls below the user-specified ! tolerance @var{tol}, and the effective rank is returned in @var{rank}. @end deftypefun @deftypefun int gsl_multifit_wlinear (const gsl_matrix * @var{X}, const gsl_vector * @var{w}, const gsl_vector * @var{y}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) - @deftypefunx int gsl_multifit_wlinear_svd (const gsl_matrix * @var{X}, const gsl_vector * @var{w}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) - This function computes the best-fit parameters @var{c} of the weighted model @math{y = X c} for the observations @var{y} with weights @var{w} ! and the matrix of predictor variables @var{X}. The covariance matrix of ! the model parameters @var{cov} is computed with the given weights. The ! weighted sum of squares of the residuals from the best-fit, ! @math{\chi^2}, is returned in @var{chisq}. If the coefficient ! of determination is desired, it can be computed from the expression ! @math{R^2 = 1 - \chi^2 / WTSS}, where the weighted total sum of squares ! (WTSS) of the observations @var{y} may be computed from ! @code{gsl_stats_wtss}. ! The best-fit is found by singular value decomposition of the matrix ! @var{X} using the preallocated workspace provided in @var{work}. Any ! components which have zero singular value (to machine precision) are ! discarded from the fit. In the second form of the function the ! components are discarded if the ratio of singular values @math{s_i/s_0} ! falls below the user-specified tolerance @var{tol}, and the effective ! rank is returned in @var{rank}. @end deftypefun @deftypefun int gsl_multifit_linear_est (const gsl_vector * @var{x}, const gsl_vector * @var{c}, const gsl_matrix * @var{cov}, double * @var{y}, double * @var{y_err}) --- 303,349 ---- @end deftypefun @deftypefun int gsl_multifit_linear (const gsl_matrix * @var{X}, const gsl_vector * @var{y}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! This function computes the best-fit parameters @var{c} of the model ! @math{y = X c} for the observations @var{y} and the matrix of ! predictor variables @var{X}, using the preallocated workspace provided ! in @var{work}. The variance-covariance matrix of the model parameters ! @var{cov} is estimated from the scatter of the observations about the ! best-fit. The sum of squares of the residuals from the best-fit, ! @math{\chi^2}, is returned in @var{chisq}. If the coefficient of ! determination is desired, it can be computed from the expression @math{R^2 = 1 - \chi^2 / TSS}, where the total sum of squares (TSS) of the observations @var{y} may be computed from @code{gsl_stats_tss}. The best-fit is found by singular value decomposition of the matrix ! @var{X} using the modified Golub-Reinsch SVD algorithm, with column ! scaling to improve the accuracy of the singular values. Any components ! which have zero singular value (to machine precision) are discarded ! from the fit. @end deftypefun @deftypefun int gsl_multifit_wlinear (const gsl_matrix * @var{X}, const gsl_vector * @var{w}, const gsl_vector * @var{y}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) This function computes the best-fit parameters @var{c} of the weighted model @math{y = X c} for the observations @var{y} with weights @var{w} ! and the matrix of predictor variables @var{X}, using the preallocated ! workspace provided in @var{work}. The covariance matrix of the model ! parameters @var{cov} is computed with the given weights. The weighted ! sum of squares of the residuals from the best-fit, @math{\chi^2}, is ! returned in @var{chisq}. If the coefficient of determination is ! desired, it can be computed from the expression @math{R^2 = 1 - \chi^2 ! / WTSS}, where the weighted total sum of squares (WTSS) of the ! observations @var{y} may be computed from @code{gsl_stats_wtss}. ! @end deftypefun ! @deftypefun int gsl_multifit_linear_svd (const gsl_matrix * @var{X}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! @deftypefunx int gsl_multifit_wlinear_svd (const gsl_matrix * @var{X}, const gsl_vector * @var{w}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! In these functions components of the fit are discarded if the ratio of ! singular values @math{s_i/s_0} falls below the user-specified ! tolerance @var{tol}, and the effective rank is returned in @var{rank}. ! @end deftypefun ! ! @deftypefun int gsl_multifit_linear_usvd (const gsl_matrix * @var{X}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! @deftypefunx int gsl_multifit_wlinear_usvd (const gsl_matrix * @var{X}, const gsl_vector * @var{w}, const gsl_vector * @var{y}, double @var{tol}, size_t * @var{rank}, gsl_vector * @var{c}, gsl_matrix * @var{cov}, double * @var{chisq}, gsl_multifit_linear_workspace * @var{work}) ! These functions compute the fit using an SVD without column scaling. @end deftypefun @deftypefun int gsl_multifit_linear_est (const gsl_vector * @var{x}, const gsl_vector * @var{c}, const gsl_matrix * @var{cov}, double * @var{y}, double * @var{y_err}) *************** *** 497,503 **** found in the ``Statistics'' chapter of the Annual Review of Particle Physics prepared by the Particle Data Group, ! @itemize @asis @item @cite{Review of Particle Properties}, R.M. Barnett et al., Physical Review D54, 1 (1996) --- 496,502 ---- found in the ``Statistics'' chapter of the Annual Review of Particle Physics prepared by the Particle Data Group, ! @itemize @w{} @item @cite{Review of Particle Properties}, R.M. Barnett et al., Physical Review D54, 1 (1996) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/freemanuals.texi gsl-1.14/doc/freemanuals.texi *** gsl-1.13/doc/freemanuals.texi Wed Nov 19 09:13:46 2008 --- gsl-1.14/doc/freemanuals.texi Wed Mar 10 10:57:13 2010 *************** *** 93,99 **** The Free Software Foundation maintains a list of free documentation published by other publishers: ! @itemize @asis @item @uref{http://www.fsf.org/doc/other-free-books.html} @end itemize --- 93,99 ---- The Free Software Foundation maintains a list of free documentation published by other publishers: ! @itemize @w{} @item @uref{http://www.fsf.org/doc/other-free-books.html} @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/gsl-design.texi gsl-1.14/doc/gsl-design.texi *** gsl-1.13/doc/gsl-design.texi Sat Jan 31 14:40:46 2009 --- gsl-1.14/doc/gsl-design.texi Wed Mar 10 10:57:13 2010 *************** *** 529,535 **** It will be useful to read the following papers, ! @itemize @asis @item Kiem-Phong Vo, ``The Discipline and Method Architecture for Reusable Libraries'', Software - Practice & Experience, v.30, pp.107-128, 2000. --- 529,535 ---- It will be useful to read the following papers, ! @itemize @w{} @item Kiem-Phong Vo, ``The Discipline and Method Architecture for Reusable Libraries'', Software - Practice & Experience, v.30, pp.107-128, 2000. *************** *** 544,550 **** There are associated papers on Vmalloc, SFIO, and CDT which are also relevant to the design of portable C libraries. ! @itemize @asis @item Kiem-Phong Vo, ``Vmalloc: A General and Efficient Memory Allocator''. Software Practice & Experience, 26:1--18, 1996. --- 544,550 ---- There are associated papers on Vmalloc, SFIO, and CDT which are also relevant to the design of portable C libraries. ! @itemize @w{} @item Kiem-Phong Vo, ``Vmalloc: A General and Efficient Memory Allocator''. Software Practice & Experience, 26:1--18, 1996. *************** *** 602,608 **** latest review papers. A search of the following journals should be undertaken. ! @itemize @asis @item ACM Transactions on Mathematical Software @item Numerische Mathematik @item Journal of Computation and Applied Mathematics --- 602,608 ---- latest review papers. A search of the following journals should be undertaken. ! @itemize @w{} @item ACM Transactions on Mathematical Software @item Numerische Mathematik @item Journal of Computation and Applied Mathematics diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/gsl-ref.texi gsl-1.14/doc/gsl-ref.texi *** gsl-1.13/doc/gsl-ref.texi Tue Aug 25 15:01:59 2009 --- gsl-1.14/doc/gsl-ref.texi Wed Mar 10 10:57:13 2010 *************** *** 45,64 **** % Because makeinfo.c exists, we can't just define new commands. % So instead, we take over little-used existing commands. % ! % Redefine @cite{text} to act like $text$ in regular TeX. ! % Info will typeset this same as @samp{text}. ! \gdef\goodtex{\tex \let\rm\goodrm \let\t\ttfont \turnoffactive} \gdef\goodrm{\fam0\tenrm} \gdef\math{\goodtex$\mathxxx} \gdef\mathxxx#1{#1$\endgroup} \global\let\oldxrefX=\xrefX \gdef\xrefX[#1]{\begingroup\let\math=\dfn\oldxrefX[#1]\endgroup} % - % Redefine @i{text} to be equivalent to @cite{text}, i.e., to use math mode. - % This looks the same in TeX but omits the surrounding ` ' in Info. - %\global\let\i=\cite - %\global\let\math=\cite - % % Redefine @c{tex-stuff} \n @whatever{info-stuff}. \gdef\c{\futurelet\next\mycxxx} \gdef\mycxxx{% --- 45,58 ---- % Because makeinfo.c exists, we can't just define new commands. % So instead, we take over little-used existing commands. % ! \gdef\goodtex{\tex \let\rm\goodrm \let\t\ttfont \mathactive} \gdef\goodrm{\fam0\tenrm} \gdef\math{\goodtex$\mathxxx} \gdef\mathxxx#1{#1$\endgroup} + % \global\let\oldxrefX=\xrefX \gdef\xrefX[#1]{\begingroup\let\math=\dfn\oldxrefX[#1]\endgroup} % % Redefine @c{tex-stuff} \n @whatever{info-stuff}. \gdef\c{\futurelet\next\mycxxx} \gdef\mycxxx{% *************** *** 131,137 **** @set GSL @i{GNU Scientific Library} @copying ! Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The GSL Team. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or --- 125,131 ---- @set GSL @i{GNU Scientific Library} @copying ! Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The GSL Team. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or *************** *** 248,253 **** --- 242,248 ---- * Vectors and Matrices:: * Permutations:: * Combinations:: + * Multisets:: * Sorting:: * BLAS Support:: * Linear Algebra:: *************** *** 329,339 **** @chapter Permutations @include permutation.texi ! @node Combinations, Sorting, Permutations, Top @chapter Combinations @include combination.texi ! @node Sorting, BLAS Support, Combinations, Top @chapter Sorting @include sort.texi --- 324,338 ---- @chapter Permutations @include permutation.texi ! @node Combinations, Multisets, Permutations, Top @chapter Combinations @include combination.texi ! @node Multisets, Sorting, Combinations, Top ! @chapter Multisets ! @include multiset.texi ! ! @node Sorting, BLAS Support, Multisets, Top @chapter Sorting @include sort.texi diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/ieee754.texi gsl-1.14/doc/ieee754.texi *** gsl-1.13/doc/ieee754.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/ieee754.texi Wed Mar 10 10:57:13 2010 *************** *** 245,251 **** @noindent where @var{keyword} is one of the following mode-names, ! @itemize @asis @item @code{single-precision} @item --- 245,251 ---- @noindent where @var{keyword} is one of the following mode-names, ! @itemize @w{} @item @code{single-precision} @item *************** *** 415,421 **** The reference for the IEEE standard is, ! @itemize @asis @item ANSI/IEEE Std 754-1985, IEEE Standard for Binary Floating-Point Arithmetic. @end itemize --- 415,421 ---- The reference for the IEEE standard is, ! @itemize @w{} @item ANSI/IEEE Std 754-1985, IEEE Standard for Binary Floating-Point Arithmetic. @end itemize *************** *** 424,430 **** A more pedagogical introduction to the standard can be found in the following paper, ! @itemize @asis @item David Goldberg: What Every Computer Scientist Should Know About Floating-Point Arithmetic. @cite{ACM Computing Surveys}, Vol.@: 23, No.@: 1 --- 424,430 ---- A more pedagogical introduction to the standard can be found in the following paper, ! @itemize @w{} @item David Goldberg: What Every Computer Scientist Should Know About Floating-Point Arithmetic. @cite{ACM Computing Surveys}, Vol.@: 23, No.@: 1 *************** *** 442,448 **** A detailed textbook on IEEE arithmetic and its practical use is available from SIAM Press, ! @itemize @asis @item Michael L. Overton, @cite{Numerical Computing with IEEE Floating Point Arithmetic}, SIAM Press, ISBN 0898715717. --- 442,448 ---- A detailed textbook on IEEE arithmetic and its practical use is available from SIAM Press, ! @itemize @w{} @item Michael L. Overton, @cite{Numerical Computing with IEEE Floating Point Arithmetic}, SIAM Press, ISBN 0898715717. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/integration.texi gsl-1.14/doc/integration.texi *** gsl-1.13/doc/integration.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/integration.texi Wed Mar 10 10:57:13 2010 *************** *** 12,18 **** oscillatory integrals. The library reimplements the algorithms used in @sc{quadpack}, a numerical integration package written by Piessens, Doncker-Kapenga, Uberhuber and Kahaner. Fortran code for @sc{quadpack} is ! available on Netlib. The functions described in this chapter are declared in the header file @file{gsl_integration.h}. --- 12,20 ---- oscillatory integrals. The library reimplements the algorithms used in @sc{quadpack}, a numerical integration package written by Piessens, Doncker-Kapenga, Uberhuber and Kahaner. Fortran code for @sc{quadpack} is ! available on Netlib. Also included are non-adaptive, fixed-order ! Gauss-Legendre integration routines with high precision coefficients ! by Pavel Holoborodko. The functions described in this chapter are declared in the header file @file{gsl_integration.h}. *************** *** 28,33 **** --- 30,36 ---- * QAWS adaptive integration for singular functions:: * QAWO adaptive integration for oscillatory functions:: * QAWF adaptive integration for Fourier integrals:: + * Fixed order Gauss-Legendre integration:: * Numerical integration error codes:: * Numerical integration examples:: * Numerical integration References and Further Reading:: *************** *** 776,781 **** --- 779,814 ---- @end deftypefun + @node Fixed order Gauss-Legendre integration + @section Gauss-Legendre integration + + The fixed-order Gauss-Legendre integration routines are provided for fast + integration of smooth functions with known polynomial order. The + @math{n}-point Gauss-Legendre rule is exact for polynomials of order + @math{2*n-1} or less. For example, these rules are useful when integrating + basis functions to form mass matrices for the Galerkin method. Unlike other + numerical integration routines within the library, these routines do not accept + absolute or relative error bounds. + + @deftypefun {gsl_integration_glfixed_table *} gsl_integration_glfixed_table_alloc (size_t @var{n}) + @tpindex gsl_integration_glfixed_table + This function determines the Gauss-Legendre abscissae and weights necessary for + an @math{n}-point fixed order integration scheme. If possible, high precision + precomputed coefficients are used. If precomputed weights are not available, + lower precision coefficients are computed on the fly. + @end deftypefun + + @deftypefun double gsl_integration_glfixed (const gsl_function * @var{f}, double @var{a}, double @var{b}, {gsl_integration_glfixed_table *} @var{t}) + This function applies the Gauss-Legendre integration rule + contained in table @var{t} and returns the result. + @end deftypefun + + + @deftypefun void gsl_integration_glfixed_table_alloc (gsl_integration_glfixed_table * @var{t}) + @tpindex gsl_integration_glfixed_table + This function frees the memory associated with the table @var{t}. + @end deftypefun + @node Numerical integration error codes @section Error codes *************** *** 849,855 **** includes useful advice on numerical integration and many references to the numerical integration literature used in developing @sc{quadpack}. ! @itemize @asis @item R. Piessens, E. de Doncker-Kapenga, C.W. Uberhuber, D.K. Kahaner. @cite{@sc{quadpack} A subroutine package for automatic integration} --- 882,888 ---- includes useful advice on numerical integration and many references to the numerical integration literature used in developing @sc{quadpack}. ! @itemize @w{} @item R. Piessens, E. de Doncker-Kapenga, C.W. Uberhuber, D.K. Kahaner. @cite{@sc{quadpack} A subroutine package for automatic integration} diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/interp.texi gsl-1.14/doc/interp.texi *** gsl-1.13/doc/interp.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/interp.texi Wed Mar 10 10:57:13 2010 *************** *** 319,325 **** Descriptions of the interpolation algorithms and further references can be found in the following books: ! @itemize @asis @item C.W. Ueberhuber, @cite{Numerical Computation (Volume 1), Chapter 9 ``Interpolation''}, Springer (1997), ISBN 3-540-62058-3. --- 319,325 ---- Descriptions of the interpolation algorithms and further references can be found in the following books: ! @itemize @w{} @item C.W. Ueberhuber, @cite{Numerical Computation (Volume 1), Chapter 9 ``Interpolation''}, Springer (1997), ISBN 3-540-62058-3. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/intro.texi gsl-1.14/doc/intro.texi *** gsl-1.13/doc/intro.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/intro.texi Wed Mar 10 10:57:13 2010 *************** *** 100,106 **** license is available from the GNU Project webpage @cite{Frequently Asked Questions about the GNU GPL}, ! @itemize @asis @item @uref{http://www.gnu.org/copyleft/gpl-faq.html} @end itemize --- 100,106 ---- license is available from the GNU Project webpage @cite{Frequently Asked Questions about the GNU GPL}, ! @itemize @w{} @item @uref{http://www.gnu.org/copyleft/gpl-faq.html} @end itemize *************** *** 121,127 **** from the internet. A list of public ftp servers which carry the source code can be found on the GNU website, ! @itemize @asis @item @uref{http://www.gnu.org/software/gsl/} @end itemize --- 121,127 ---- from the internet. A list of public ftp servers which carry the source code can be found on the GNU website, ! @itemize @w{} @item @uref{http://www.gnu.org/software/gsl/} @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/linalg.texi gsl-1.14/doc/linalg.texi *** gsl-1.13/doc/linalg.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/linalg.texi Wed Mar 10 10:57:13 2010 *************** *** 1144,1150 **** Further information on the algorithms described in this section can be found in the following book, ! @itemize @asis @item G. H. Golub, C. F. Van Loan, @cite{Matrix Computations} (3rd Ed, 1996), Johns Hopkins University Press, ISBN 0-8018-5414-8. --- 1144,1150 ---- Further information on the algorithms described in this section can be found in the following book, ! @itemize @w{} @item G. H. Golub, C. F. Van Loan, @cite{Matrix Computations} (3rd Ed, 1996), Johns Hopkins University Press, ISBN 0-8018-5414-8. *************** *** 1153,1159 **** @noindent The @sc{lapack} library is described in the following manual, ! @itemize @asis @item @cite{LAPACK Users' Guide} (Third Edition, 1999), Published by SIAM, ISBN 0-89871-447-8. --- 1153,1159 ---- @noindent The @sc{lapack} library is described in the following manual, ! @itemize @w{} @item @cite{LAPACK Users' Guide} (Third Edition, 1999), Published by SIAM, ISBN 0-89871-447-8. *************** *** 1168,1174 **** @noindent The Modified Golub-Reinsch algorithm is described in the following paper, ! @itemize @asis @item T.F. Chan, ``An Improved Algorithm for Computing the Singular Value Decomposition'', @cite{ACM Transactions on Mathematical Software}, 8 --- 1168,1174 ---- @noindent The Modified Golub-Reinsch algorithm is described in the following paper, ! @itemize @w{} @item T.F. Chan, ``An Improved Algorithm for Computing the Singular Value Decomposition'', @cite{ACM Transactions on Mathematical Software}, 8 *************** *** 1179,1185 **** The Jacobi algorithm for singular value decomposition is described in the following papers, ! @itemize @asis @item J.C. Nash, ``A one-sided transformation method for the singular value decomposition and algebraic eigenproblem'', @cite{Computer Journal}, --- 1179,1185 ---- The Jacobi algorithm for singular value decomposition is described in the following papers, ! @itemize @w{} @item J.C. Nash, ``A one-sided transformation method for the singular value decomposition and algebraic eigenproblem'', @cite{Computer Journal}, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/mdate-sh gsl-1.14/doc/mdate-sh *** gsl-1.13/doc/mdate-sh Mon Feb 4 13:53:53 2008 --- gsl-1.14/doc/mdate-sh Wed Mar 10 10:58:17 2010 *************** *** 1,10 **** #!/bin/sh # Get modification time of a file or directory and pretty-print it. ! scriptversion=2007-03-30.02 ! # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007 Free Software ! # Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify --- 1,10 ---- #!/bin/sh # Get modification time of a file or directory and pretty-print it. ! scriptversion=2009-04-28.21; # UTC ! # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free ! # Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify *************** *** 18,25 **** # 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, write to the Free Software Foundation, ! # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 18,24 ---- # 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 . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 201,205 **** # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-end: "$" # End: --- 200,205 ---- # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-time-zone: "UTC" ! # time-stamp-end: "; # UTC" # End: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/min.texi gsl-1.14/doc/min.texi *** gsl-1.13/doc/min.texi Sat Jul 11 13:37:26 2009 --- gsl-1.14/doc/min.texi Wed Mar 10 10:57:13 2010 *************** *** 399,405 **** Further information on Brent's algorithm is available in the following book, ! @itemize @asis @item Richard Brent, @cite{Algorithms for minimization without derivatives}, Prentice-Hall (1973), republished by Dover in paperback (2002), ISBN --- 399,405 ---- Further information on Brent's algorithm is available in the following book, ! @itemize @w{} @item Richard Brent, @cite{Algorithms for minimization without derivatives}, Prentice-Hall (1973), republished by Dover in paperback (2002), ISBN diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/montecarlo.texi gsl-1.14/doc/montecarlo.texi *** gsl-1.13/doc/montecarlo.texi Mon Aug 3 15:00:39 2009 --- gsl-1.14/doc/montecarlo.texi Wed Mar 10 10:57:13 2010 *************** *** 743,749 **** The @sc{miser} algorithm is described in the following article by Press and Farrar, ! @itemize @asis @item W.H. Press, G.R. Farrar, @cite{Recursive Stratified Sampling for Multidimensional Monte Carlo Integration}, --- 743,749 ---- The @sc{miser} algorithm is described in the following article by Press and Farrar, ! @itemize @w{} @item W.H. Press, G.R. Farrar, @cite{Recursive Stratified Sampling for Multidimensional Monte Carlo Integration}, *************** *** 753,759 **** @noindent The @sc{vegas} algorithm is described in the following papers, ! @itemize @asis @item G.P. Lepage, @cite{A New Algorithm for Adaptive Multidimensional Integration}, --- 753,759 ---- @noindent The @sc{vegas} algorithm is described in the following papers, ! @itemize @w{} @item G.P. Lepage, @cite{A New Algorithm for Adaptive Multidimensional Integration}, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/multifit.texi gsl-1.14/doc/multifit.texi *** gsl-1.13/doc/multifit.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/multifit.texi Wed Mar 10 10:57:13 2010 *************** *** 431,439 **** the norm of the gradient, relative to the norm of the function, falls below machine precision ! @item GSL_CONTINUE the routine has made 10 or more attempts to find a suitable trial step ! without success (but subsequent calls can be made to continue the search). @end table @noindent --- 431,441 ---- the norm of the gradient, relative to the norm of the function, falls below machine precision ! @item GSL_ENOPROG the routine has made 10 or more attempts to find a suitable trial step ! without success (but subsequent calls can be made to continue the ! search).@footnote{The return code @code{GSL_CONTINUE} was used for ! this case in versions prior to 1.14.} @end table @noindent *************** *** 634,640 **** The @sc{minpack} algorithm is described in the following article, ! @itemize @asis @item J.J. Mor@'e, @cite{The Levenberg-Marquardt Algorithm: Implementation and Theory}, Lecture Notes in Mathematics, v630 (1978), ed G. Watson. --- 636,642 ---- The @sc{minpack} algorithm is described in the following article, ! @itemize @w{} @item J.J. Mor@'e, @cite{The Levenberg-Marquardt Algorithm: Implementation and Theory}, Lecture Notes in Mathematics, v630 (1978), ed G. Watson. *************** *** 644,650 **** The following paper is also relevant to the algorithms described in this section, ! @itemize @asis @item J.J. Mor@'e, B.S. Garbow, K.E. Hillstrom, ``Testing Unconstrained Optimization Software'', ACM Transactions on Mathematical Software, Vol --- 646,652 ---- The following paper is also relevant to the algorithms described in this section, ! @itemize @w{} @item J.J. Mor@'e, B.S. Garbow, K.E. Hillstrom, ``Testing Unconstrained Optimization Software'', ACM Transactions on Mathematical Software, Vol diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/multimin.texi gsl-1.14/doc/multimin.texi *** gsl-1.13/doc/multimin.texi Thu Aug 13 18:37:22 2009 --- gsl-1.14/doc/multimin.texi Wed Mar 10 10:57:13 2010 *************** *** 482,494 **** simplex contracts itself near the minimum. The size is returned by the function @code{gsl_multimin_fminimizer_size}. ! The @code{nmsimplex2} version of this minimiser is a new @math{O(N)} ! implementation of the earlier @math{O(N^2)} @code{nmsimplex} minimiser. It uses the same underlying algorithm, but the simplex updates are computed more efficiently for high-dimensional problems. In addition, the size of simplex is calculated as the @sc{rms} distance of each vertex from the center rather than the mean distance, ! allowing a linear update of this quantity on each step. @end deffn @deffn {Minimizer} gsl_multimin_fminimizer_nmsimplex2rand --- 482,495 ---- simplex contracts itself near the minimum. The size is returned by the function @code{gsl_multimin_fminimizer_size}. ! The @code{nmsimplex2} version of this minimiser is a new @math{O(N)} operations ! implementation of the earlier @math{O(N^2)} operations @code{nmsimplex} minimiser. It uses the same underlying algorithm, but the simplex updates are computed more efficiently for high-dimensional problems. In addition, the size of simplex is calculated as the @sc{rms} distance of each vertex from the center rather than the mean distance, ! allowing a linear update of this quantity on each step. The memory usage is ! @math{O(N^2)} for both algorithms. @end deffn @deffn {Minimizer} gsl_multimin_fminimizer_nmsimplex2rand *************** *** 565,571 **** The conjugate gradient and BFGS methods are described in detail in the following book, ! @itemize @asis @item R. Fletcher, @cite{Practical Methods of Optimization (Second Edition)} Wiley (1987), ISBN 0471915475. --- 566,572 ---- The conjugate gradient and BFGS methods are described in detail in the following book, ! @itemize @w{} @item R. Fletcher, @cite{Practical Methods of Optimization (Second Edition)} Wiley (1987), ISBN 0471915475. *************** *** 574,580 **** A brief description of multidimensional minimization algorithms and more recent references can be found in, ! @itemize @asis @item C.W. Ueberhuber, @cite{Numerical Computation (Volume 2)}, Chapter 14, Section 4.4 ``Minimization Methods'', p.@: 325--335, Springer (1997), ISBN --- 575,581 ---- A brief description of multidimensional minimization algorithms and more recent references can be found in, ! @itemize @w{} @item C.W. Ueberhuber, @cite{Numerical Computation (Volume 2)}, Chapter 14, Section 4.4 ``Minimization Methods'', p.@: 325--335, Springer (1997), ISBN *************** *** 584,590 **** @noindent The simplex algorithm is described in the following paper, ! @itemize @asis @item J.A. Nelder and R. Mead, @cite{A simplex method for function minimization}, Computer Journal vol.@: 7 (1965), 308--313. --- 585,591 ---- @noindent The simplex algorithm is described in the following paper, ! @itemize @w{} @item J.A. Nelder and R. Mead, @cite{A simplex method for function minimization}, Computer Journal vol.@: 7 (1965), 308--313. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/multiroots.texi gsl-1.14/doc/multiroots.texi *** gsl-1.13/doc/multiroots.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/multiroots.texi Wed Mar 10 10:57:13 2010 *************** *** 1056,1062 **** The original version of the Hybrid method is described in the following articles by Powell, ! @itemize @asis @item M.J.D. Powell, ``A Hybrid Method for Nonlinear Equations'' (Chap 6, p 87--114) and ``A Fortran Subroutine for Solving systems of Nonlinear --- 1056,1062 ---- The original version of the Hybrid method is described in the following articles by Powell, ! @itemize @w{} @item M.J.D. Powell, ``A Hybrid Method for Nonlinear Equations'' (Chap 6, p 87--114) and ``A Fortran Subroutine for Solving systems of Nonlinear *************** *** 1069,1075 **** The following papers are also relevant to the algorithms described in this section, ! @itemize @asis @item J.J. Mor@'e, M.Y. Cosnard, ``Numerical Solution of Nonlinear Equations'', @cite{ACM Transactions on Mathematical Software}, Vol 5, No 1, (1979), p 64--85 --- 1069,1075 ---- The following papers are also relevant to the algorithms described in this section, ! @itemize @w{} @item J.J. Mor@'e, M.Y. Cosnard, ``Numerical Solution of Nonlinear Equations'', @cite{ACM Transactions on Mathematical Software}, Vol 5, No 1, (1979), p 64--85 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/multiset.texi gsl-1.14/doc/multiset.texi *** gsl-1.13/doc/multiset.texi Thu Jan 1 00:00:00 1970 --- gsl-1.14/doc/multiset.texi Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,201 ---- + @cindex multisets + + This chapter describes functions for creating and manipulating multisets. A + multiset @math{c} is represented by an array of @math{k} integers in the range + 0 to @math{n-1}, where each value @math{c_i} may occur more than once. The + multiset @math{c} corresponds to indices of @math{k} elements chosen from an + @math{n} element vector with replacement. In mathematical terms, @math{n} is + the cardinality of the multiset while @math{k} is the maximum multiplicity of + any value. Multisets are useful, for example, when iterating over the indices + of a @math{k}-th order symmetric tensor in @math{n}-space. + + The functions described in this chapter are defined in the header file + @file{gsl_multiset.h}. + + @menu + * The Multiset struct:: + * Multiset allocation:: + * Accessing multiset elements:: + * Multiset properties:: + * Multiset functions:: + * Reading and writing multisets:: + * Multiset Examples:: + @end menu + + @node The Multiset struct + @section The Multiset struct + @tpindex gsl_multiset + A multiset is defined by a structure containing three components, the + values of @math{n} and @math{k}, and a pointer to the multiset array. + The elements of the multiset array are all of type @code{size_t}, and + are stored in increasing order. The @code{gsl_multiset} structure + looks like this, + + @example + typedef struct + @{ + size_t n; + size_t k; + size_t *data; + @} gsl_multiset; + @end example + @comment + + @noindent + + @node Multiset allocation + @section Multiset allocation + + @deftypefun {gsl_multiset *} gsl_multiset_alloc (size_t @var{n}, size_t @var{k}) + This function allocates memory for a new multiset with parameters @var{n}, + @var{k}. The multiset is not initialized and its elements are undefined. Use + the function @code{gsl_multiset_calloc} if you want to create a multiset which + is initialized to the lexicographically first multiset element. A null pointer + is returned if insufficient memory is available to create the multiset. + @end deftypefun + + @deftypefun {gsl_multiset *} gsl_multiset_calloc (size_t @var{n}, size_t @var{k}) + This function allocates memory for a new multiset with parameters @var{n}, + @var{k} and initializes it to the lexicographically first multiset element. A + null pointer is returned if insufficient memory is available to create the + multiset. + @end deftypefun + + @deftypefun void gsl_multiset_init_first (gsl_multiset * @var{c}) + This function initializes the multiset @var{c} to the lexicographically first + multiset element, i.e. @math{0} repeated @math{k} times. + @end deftypefun + + @deftypefun void gsl_multiset_init_last (gsl_multiset * @var{c}) + This function initializes the multiset @var{c} to the lexicographically last + multiset element, i.e. @math{n-1} repeated @math{k} times. + @end deftypefun + + @deftypefun void gsl_multiset_free (gsl_multiset * @var{c}) + This function frees all the memory used by the multiset @var{c}. + @end deftypefun + + @deftypefun int gsl_multiset_memcpy (gsl_multiset * @var{dest}, const gsl_multiset * @var{src}) + This function copies the elements of the multiset @var{src} into the + multiset @var{dest}. The two multisets must have the same size. + @end deftypefun + + + @node Accessing multiset elements + @section Accessing multiset elements + + The following function can be used to access the elements of a multiset. + + @deftypefun size_t gsl_multiset_get (const gsl_multiset * @var{c}, const size_t @var{i}) + This function returns the value of the @var{i}-th element of the + multiset @var{c}. If @var{i} lies outside the allowed range of 0 to + @math{@var{k}-1} then the error handler is invoked and 0 is returned. @inlinefn{} + @end deftypefun + + @node Multiset properties + @section Multiset properties + + @deftypefun size_t gsl_multiset_n (const gsl_multiset * @var{c}) + This function returns the range (@math{n}) of the multiset @var{c}. + @end deftypefun + + @deftypefun size_t gsl_multiset_k (const gsl_multiset * @var{c}) + This function returns the number of elements (@math{k}) in the multiset @var{c}. + @end deftypefun + + @deftypefun {size_t *} gsl_multiset_data (const gsl_multiset * @var{c}) + This function returns a pointer to the array of elements in the + multiset @var{c}. + @end deftypefun + + @deftypefun int gsl_multiset_valid (gsl_multiset * @var{c}) + @cindex checking multiset for validity + @cindex testing multiset for validity + This function checks that the multiset @var{c} is valid. The @var{k} + elements should lie in the range 0 to @math{@var{n}-1}, with each + value occurring in nondecreasing order. + @end deftypefun + + @node Multiset functions + @section Multiset functions + + @deftypefun int gsl_multiset_next (gsl_multiset * @var{c}) + @cindex iterating through multisets + This function advances the multiset @var{c} to the next multiset element in + lexicographic order and returns @code{GSL_SUCCESS}. If no further multisets + elements are available it returns @code{GSL_FAILURE} and leaves @var{c} + unmodified. Starting with the first multiset and repeatedly applying this + function will iterate through all possible multisets of a given order. + @end deftypefun + + @deftypefun int gsl_multiset_prev (gsl_multiset * @var{c}) + This function steps backwards from the multiset @var{c} to the previous + multiset element in lexicographic order, returning @code{GSL_SUCCESS}. If no + previous multiset is available it returns @code{GSL_FAILURE} and leaves @var{c} + unmodified. + @end deftypefun + + @node Reading and writing multisets + @section Reading and writing multisets + + The library provides functions for reading and writing multisets to a + file as binary data or formatted text. + + @deftypefun int gsl_multiset_fwrite (FILE * @var{stream}, const gsl_multiset * @var{c}) + This function writes the elements of the multiset @var{c} to the + stream @var{stream} in binary format. The function returns + @code{GSL_EFAILED} if there was a problem writing to the file. Since the + data is written in the native binary format it may not be portable + between different architectures. + @end deftypefun + + @deftypefun int gsl_multiset_fread (FILE * @var{stream}, gsl_multiset * @var{c}) + This function reads elements from the open stream @var{stream} into the + multiset @var{c} in binary format. The multiset @var{c} must be + preallocated with correct values of @math{n} and @math{k} since the + function uses the size of @var{c} to determine how many bytes to read. + The function returns @code{GSL_EFAILED} if there was a problem reading + from the file. The data is assumed to have been written in the native + binary format on the same architecture. + @end deftypefun + + @deftypefun int gsl_multiset_fprintf (FILE * @var{stream}, const gsl_multiset * @var{c}, const char * @var{format}) + This function writes the elements of the multiset @var{c} + line-by-line to the stream @var{stream} using the format specifier + @var{format}, which should be suitable for a type of @var{size_t}. + In ISO C99 the type modifier @code{z} represents @code{size_t}, so + @code{"%zu\n"} is a suitable format.@footnote{In versions of the + GNU C library prior to the ISO C99 standard, + the type modifier @code{Z} was used instead.} The function returns + @code{GSL_EFAILED} if there was a problem writing to the file. + @end deftypefun + + @deftypefun int gsl_multiset_fscanf (FILE * @var{stream}, gsl_multiset * @var{c}) + This function reads formatted data from the stream @var{stream} into the + multiset @var{c}. The multiset @var{c} must be preallocated with + correct values of @math{n} and @math{k} since the function uses the size of @var{c} to + determine how many numbers to read. The function returns + @code{GSL_EFAILED} if there was a problem reading from the file. + @end deftypefun + + + @node Multiset Examples + @section Examples + The example program below prints all multisets elements containing the values + @math{@{0,1,2,3@}} ordered by size. Multiset elements of the same size are + ordered lexicographically. + + @example + @verbatiminclude examples/multiset.c + @end example + + @noindent + Here is the output from the program, + + @example + $ ./a.out + @verbatiminclude examples/multiset.out + @end example + + @noindent + All 70 multisets are generated and sorted lexicographically. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/ode-initval.texi gsl-1.14/doc/ode-initval.texi *** gsl-1.13/doc/ode-initval.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/ode-initval.texi Wed Mar 10 10:57:13 2010 *************** *** 575,581 **** Many of the basic Runge-Kutta formulas can be found in the Handbook of Mathematical Functions, ! @itemize @asis @item Abramowitz & Stegun (eds.), @cite{Handbook of Mathematical Functions}, Section 25.5. --- 575,581 ---- Many of the basic Runge-Kutta formulas can be found in the Handbook of Mathematical Functions, ! @itemize @w{} @item Abramowitz & Stegun (eds.), @cite{Handbook of Mathematical Functions}, Section 25.5. *************** *** 585,591 **** The implicit Bulirsch-Stoer algorithm @code{bsimp} is described in the following paper, ! @itemize @asis @item G. Bader and P. Deuflhard, ``A Semi-Implicit Mid-Point Rule for Stiff Systems of Ordinary Differential Equations.'', Numer.@: Math.@: 41, 373--398, --- 585,591 ---- The implicit Bulirsch-Stoer algorithm @code{bsimp} is described in the following paper, ! @itemize @w{} @item G. Bader and P. Deuflhard, ``A Semi-Implicit Mid-Point Rule for Stiff Systems of Ordinary Differential Equations.'', Numer.@: Math.@: 41, 373--398, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/permutation.texi gsl-1.14/doc/permutation.texi *** gsl-1.13/doc/permutation.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/permutation.texi Wed Mar 10 10:57:13 2010 *************** *** 364,370 **** The subject of permutations is covered extensively in Knuth's @cite{Sorting and Searching}, ! @itemize @asis @item Donald E. Knuth, @cite{The Art of Computer Programming: Sorting and Searching} (Vol 3, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. --- 364,370 ---- The subject of permutations is covered extensively in Knuth's @cite{Sorting and Searching}, ! @itemize @w{} @item Donald E. Knuth, @cite{The Art of Computer Programming: Sorting and Searching} (Vol 3, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. *************** *** 373,379 **** @noindent For the definition of the @dfn{canonical form} see, ! @itemize @asis @item Donald E. Knuth, @cite{The Art of Computer Programming: Fundamental Algorithms} (Vol 1, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. --- 373,379 ---- @noindent For the definition of the @dfn{canonical form} see, ! @itemize @w{} @item Donald E. Knuth, @cite{The Art of Computer Programming: Fundamental Algorithms} (Vol 1, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/poly.texi gsl-1.14/doc/poly.texi *** gsl-1.13/doc/poly.texi Sat Jul 11 14:25:56 2009 --- gsl-1.14/doc/poly.texi Wed Mar 10 10:57:13 2010 *************** *** 296,302 **** The balanced-QR method and its error analysis are described in the following papers, ! @itemize @asis @item R.S. Martin, G. Peters and J.H. Wilkinson, ``The QR Algorithm for Real Hessenberg Matrices'', @cite{Numerische Mathematik}, 14 (1970), 219--231. --- 296,302 ---- The balanced-QR method and its error analysis are described in the following papers, ! @itemize @w{} @item R.S. Martin, G. Peters and J.H. Wilkinson, ``The QR Algorithm for Real Hessenberg Matrices'', @cite{Numerische Mathematik}, 14 (1970), 219--231. *************** *** 315,321 **** @noindent The formulas for divided differences are given in Abramowitz and Stegun, ! @itemize @asis @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, Sections 25.1.4 and 25.2.26. --- 315,321 ---- @noindent The formulas for divided differences are given in Abramowitz and Stegun, ! @itemize @w{} @item Abramowitz and Stegun, @cite{Handbook of Mathematical Functions}, Sections 25.1.4 and 25.2.26. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/qrng.texi gsl-1.14/doc/qrng.texi *** gsl-1.13/doc/qrng.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/qrng.texi Wed Mar 10 10:57:13 2010 *************** *** 165,171 **** The implementations of the quasi-random sequence routines are based on the algorithms described in the following paper, ! @itemize @asis P. Bratley and B.L. Fox and H. Niederreiter, ``Algorithm 738: Programs to Generate Niederreiter's Low-discrepancy Sequences'', @cite{ACM Transactions on Mathematical Software}, Vol.@: 20, No.@: 4, December, 1994, --- 165,171 ---- The implementations of the quasi-random sequence routines are based on the algorithms described in the following paper, ! @itemize @w{} P. Bratley and B.L. Fox and H. Niederreiter, ``Algorithm 738: Programs to Generate Niederreiter's Low-discrepancy Sequences'', @cite{ACM Transactions on Mathematical Software}, Vol.@: 20, No.@: 4, December, 1994, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/randist.texi gsl-1.14/doc/randist.texi *** gsl-1.13/doc/randist.texi Sun Jul 19 10:15:26 2009 --- gsl-1.14/doc/randist.texi Wed Mar 10 10:57:13 2010 *************** *** 2231,2237 **** Devroye. It covers every imaginable distribution and provides hundreds of algorithms. ! @itemize @asis @item Luc Devroye, @cite{Non-Uniform Random Variate Generation}, Springer-Verlag, ISBN 0-387-96305-7. Available online at --- 2231,2237 ---- Devroye. It covers every imaginable distribution and provides hundreds of algorithms. ! @itemize @w{} @item Luc Devroye, @cite{Non-Uniform Random Variate Generation}, Springer-Verlag, ISBN 0-387-96305-7. Available online at *************** *** 2242,2248 **** The subject of random variate generation is also reviewed by Knuth, who describes algorithms for all the major distributions. ! @itemize @asis @item Donald E. Knuth, @cite{The Art of Computer Programming: Seminumerical Algorithms} (Vol 2, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896842. --- 2242,2248 ---- The subject of random variate generation is also reviewed by Knuth, who describes algorithms for all the major distributions. ! @itemize @w{} @item Donald E. Knuth, @cite{The Art of Computer Programming: Seminumerical Algorithms} (Vol 2, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896842. *************** *** 2253,2259 **** generating distributions of random numbers in the ``Monte Carlo'' section of its Annual Review of Particle Physics. ! @itemize @asis @item @cite{Review of Particle Properties} R.M. Barnett et al., Physical Review D54, 1 (1996) --- 2253,2259 ---- generating distributions of random numbers in the ``Monte Carlo'' section of its Annual Review of Particle Physics. ! @itemize @w{} @item @cite{Review of Particle Properties} R.M. Barnett et al., Physical Review D54, 1 (1996) *************** *** 2270,2282 **** J.E. Gentle. Another general reference is @cite{Elements of Statistical Computing} by R.A. Thisted. ! @itemize @asis @item William E. Kennedy and James E. Gentle, @cite{Statistical Computing} (1980), Marcel Dekker, ISBN 0-8247-6898-1. @end itemize ! @itemize @asis @item Ronald A. Thisted, @cite{Elements of Statistical Computing} (1988), Chapman & Hall, ISBN 0-412-01371-1. --- 2270,2282 ---- J.E. Gentle. Another general reference is @cite{Elements of Statistical Computing} by R.A. Thisted. ! @itemize @w{} @item William E. Kennedy and James E. Gentle, @cite{Statistical Computing} (1980), Marcel Dekker, ISBN 0-8247-6898-1. @end itemize ! @itemize @w{} @item Ronald A. Thisted, @cite{Elements of Statistical Computing} (1988), Chapman & Hall, ISBN 0-412-01371-1. *************** *** 2286,2298 **** The cumulative distribution functions for the Gaussian distribution are based on the following papers, ! @itemize @asis @item @cite{Rational Chebyshev Approximations Using Linear Equations}, W.J. Cody, W. Fraser, J.F. Hart. Numerische Mathematik 12, 242--251 (1968). @end itemize ! @itemize @asis @item @cite{Rational Chebyshev Approximations for the Error Function}, W.J. Cody. Mathematics of Computation 23, n107, 631--637 (July 1969). --- 2286,2298 ---- The cumulative distribution functions for the Gaussian distribution are based on the following papers, ! @itemize @w{} @item @cite{Rational Chebyshev Approximations Using Linear Equations}, W.J. Cody, W. Fraser, J.F. Hart. Numerische Mathematik 12, 242--251 (1968). @end itemize ! @itemize @w{} @item @cite{Rational Chebyshev Approximations for the Error Function}, W.J. Cody. Mathematics of Computation 23, n107, 631--637 (July 1969). diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/rng.texi gsl-1.14/doc/rng.texi *** gsl-1.13/doc/rng.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/rng.texi Wed Mar 10 10:57:13 2010 *************** *** 421,427 **** instead if you require it. For more information see, ! @itemize @asis @item Makoto Matsumoto and Takuji Nishimura, ``Mersenne Twister: A 623-dimensionally equidistributed uniform pseudorandom number --- 421,427 ---- instead if you require it. For more information see, ! @itemize @w{} @item Makoto Matsumoto and Takuji Nishimura, ``Mersenne Twister: A 623-dimensionally equidistributed uniform pseudorandom number *************** *** 488,494 **** Both types of generator use 24 words of state per generator. For more information see, ! @itemize @asis @item M. L@"uscher, ``A portable high-quality random number generator for lattice field theory calculations'', @cite{Computer Physics --- 488,494 ---- Both types of generator use 24 words of state per generator. For more information see, ! @itemize @w{} @item M. L@"uscher, ``A portable high-quality random number generator for lattice field theory calculations'', @cite{Computer Physics *************** *** 565,571 **** @math{10^56}). It uses 6 words of state per generator. For more information see, ! @itemize @asis @item P. L'Ecuyer, ``Combined Multiple Recursive Random Number Generators'', @cite{Operations Research}, 44, 5 (1996), 816--822. --- 565,571 ---- @math{10^56}). It uses 6 words of state per generator. For more information see, ! @itemize @w{} @item P. L'Ecuyer, ``Combined Multiple Recursive Random Number Generators'', @cite{Operations Research}, 44, 5 (1996), 816--822. *************** *** 604,610 **** @math{10^46}. It uses 5 words of state per generator. More information can be found in the following paper, ! @itemize @asis @item P. L'Ecuyer, F. Blouin, and R. Coutre, ``A search for good multiple recursive random number generators'', @cite{ACM Transactions on Modeling and --- 604,610 ---- @math{10^46}. It uses 5 words of state per generator. More information can be found in the following paper, ! @itemize @w{} @item P. L'Ecuyer, F. Blouin, and R. Coutre, ``A search for good multiple recursive random number generators'', @cite{ACM Transactions on Modeling and *************** *** 669,675 **** @math{10^26}). It uses 3 words of state per generator. For more information see, ! @itemize @asis @item P. L'Ecuyer, ``Maximally Equidistributed Combined Tausworthe Generators'', @cite{Mathematics of Computation}, 65, 213 (1996), 203--213. --- 669,675 ---- @math{10^26}). It uses 3 words of state per generator. For more information see, ! @itemize @w{} @item P. L'Ecuyer, ``Maximally Equidistributed Combined Tausworthe Generators'', @cite{Mathematics of Computation}, 65, 213 (1996), 203--213. *************** *** 680,686 **** @code{gsl_rng_taus} but with an improved seeding procedure described in the paper, ! @itemize @asis @item P. L'Ecuyer, ``Tables of Maximally Equidistributed Combined LFSR Generators'', @cite{Mathematics of Computation}, 68, 225 (1999), 261--269 --- 680,686 ---- @code{gsl_rng_taus} but with an improved seeding procedure described in the paper, ! @itemize @w{} @item P. L'Ecuyer, ``Tables of Maximally Equidistributed Combined LFSR Generators'', @cite{Mathematics of Computation}, 68, 225 (1999), 261--269 *************** *** 739,745 **** properties of GFSR random number generators.) For more information see, ! @itemize @asis @item Robert M. Ziff, ``Four-tap shift-register-sequence random-number generators'', @cite{Computers in Physics}, 12(4), Jul/Aug --- 739,745 ---- properties of GFSR random number generators.) For more information see, ! @itemize @w{} @item Robert M. Ziff, ``Four-tap shift-register-sequence random-number generators'', @cite{Computers in Physics}, 12(4), Jul/Aug *************** *** 980,986 **** uses 250 words of state per generator. For more information see, ! @itemize @asis @item S. Kirkpatrick and E. Stoll, ``A very fast shift-register sequence random number generator'', @cite{Journal of Computational Physics}, 40, 517--526 --- 980,986 ---- uses 250 words of state per generator. For more information see, ! @itemize @w{} @item S. Kirkpatrick and E. Stoll, ``A very fast shift-register sequence random number generator'', @cite{Journal of Computational Physics}, 40, 517--526 *************** *** 999,1005 **** per generator. For more information see, ! @itemize @asis @item Makoto Matsumoto and Yoshiharu Kurita, ``Twisted GFSR Generators II'', @cite{ACM Transactions on Modelling and Computer Simulation}, --- 999,1005 ---- per generator. For more information see, ! @itemize @w{} @item Makoto Matsumoto and Yoshiharu Kurita, ``Twisted GFSR Generators II'', @cite{ACM Transactions on Modelling and Computer Simulation}, *************** *** 1131,1137 **** ``GGL'' (I'm not sure what that stands for). For more information see, ! @itemize @asis @item Park and Miller, ``Random Number Generators: Good ones are hard to find'', @cite{Communications of the ACM}, October 1988, Volume 31, No 10, pages --- 1131,1137 ---- ``GGL'' (I'm not sure what that stands for). For more information see, ! @itemize @w{} @item Park and Miller, ``Random Number Generators: Good ones are hard to find'', @cite{Communications of the ACM}, October 1988, Volume 31, No 10, pages *************** *** 1175,1181 **** The original source code is available from NETLIB. For more information see, ! @itemize @asis @item W. Petersen, ``Lagged Fibonacci Random Number Generators for the NEC SX-3'', @cite{International Journal of High Speed Computing} (1994). --- 1175,1181 ---- The original source code is available from NETLIB. For more information see, ! @itemize @w{} @item W. Petersen, ``Lagged Fibonacci Random Number Generators for the NEC SX-3'', @cite{International Journal of High Speed Computing} (1994). *************** *** 1355,1365 **** 238 k ints/sec, 215 k doubles/sec, cmrg 247 k ints/sec, 198 k doubles/sec, ranlux389 141 k ints/sec, 140 k doubles/sec, ranlxd2 - - 1852 k ints/sec, 935 k doubles/sec, ran3 - 813 k ints/sec, 575 k doubles/sec, ran0 - 787 k ints/sec, 476 k doubles/sec, ran1 - 379 k ints/sec, 292 k doubles/sec, ran2 @end example @node Random Number Generator Examples --- 1355,1360 ---- *************** *** 1399,1405 **** The subject of random number generation and testing is reviewed extensively in Knuth's @cite{Seminumerical Algorithms}. ! @itemize @asis @item Donald E. Knuth, @cite{The Art of Computer Programming: Seminumerical Algorithms} (Vol 2, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896842. --- 1394,1400 ---- The subject of random number generation and testing is reviewed extensively in Knuth's @cite{Seminumerical Algorithms}. ! @itemize @w{} @item Donald E. Knuth, @cite{The Art of Computer Programming: Seminumerical Algorithms} (Vol 2, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896842. *************** *** 1409,1415 **** Further information is available in the review paper written by Pierre L'Ecuyer, ! @itemize @asis P. L'Ecuyer, ``Random Number Generation'', Chapter 4 of the Handbook on Simulation, Jerry Banks Ed., Wiley, 1998, 93--137. --- 1404,1410 ---- Further information is available in the review paper written by Pierre L'Ecuyer, ! @itemize @w{} P. L'Ecuyer, ``Random Number Generation'', Chapter 4 of the Handbook on Simulation, Jerry Banks Ed., Wiley, 1998, 93--137. *************** *** 1421,1427 **** The source code for the @sc{diehard} random number generator tests is also available online, ! @itemize @asis @item @cite{DIEHARD source code} G. Marsaglia, @item --- 1416,1422 ---- The source code for the @sc{diehard} random number generator tests is also available online, ! @itemize @w{} @item @cite{DIEHARD source code} G. Marsaglia, @item *************** *** 1432,1438 **** A comprehensive set of random number generator tests is available from @sc{nist}, ! @itemize @asis @item NIST Special Publication 800-22, ``A Statistical Test Suite for the Validation of Random Number Generators and Pseudo Random Number --- 1427,1433 ---- A comprehensive set of random number generator tests is available from @sc{nist}, ! @itemize @w{} @item NIST Special Publication 800-22, ``A Statistical Test Suite for the Validation of Random Number Generators and Pseudo Random Number diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/roots.texi gsl-1.14/doc/roots.texi *** gsl-1.13/doc/roots.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/roots.texi Wed Mar 10 10:57:13 2010 *************** *** 922,928 **** For information on the Brent-Dekker algorithm see the following two papers, ! @itemize @asis @item R. P. Brent, ``An algorithm with guaranteed convergence for finding a zero of a function'', @cite{Computer Journal}, 14 (1971) 422--425 --- 922,928 ---- For information on the Brent-Dekker algorithm see the following two papers, ! @itemize @w{} @item R. P. Brent, ``An algorithm with guaranteed convergence for finding a zero of a function'', @cite{Computer Journal}, 14 (1971) 422--425 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/siman.texi gsl-1.14/doc/siman.texi *** gsl-1.13/doc/siman.texi Wed Nov 19 09:13:46 2008 --- gsl-1.14/doc/siman.texi Wed Mar 10 10:57:13 2010 *************** *** 364,370 **** Further information is available in the following book, ! @itemize @asis @item @cite{Modern Heuristic Techniques for Combinatorial Problems}, Colin R. Reeves (ed.), McGraw-Hill, 1995 (ISBN 0-07-709239-2). --- 364,370 ---- Further information is available in the following book, ! @itemize @w{} @item @cite{Modern Heuristic Techniques for Combinatorial Problems}, Colin R. Reeves (ed.), McGraw-Hill, 1995 (ISBN 0-07-709239-2). diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/sort.texi gsl-1.14/doc/sort.texi *** gsl-1.13/doc/sort.texi Wed Nov 19 09:13:46 2008 --- gsl-1.14/doc/sort.texi Wed Mar 10 10:57:13 2010 *************** *** 298,304 **** The subject of sorting is covered extensively in Knuth's @cite{Sorting and Searching}, ! @itemize @asis @item Donald E. Knuth, @cite{The Art of Computer Programming: Sorting and Searching} (Vol 3, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. --- 298,304 ---- The subject of sorting is covered extensively in Knuth's @cite{Sorting and Searching}, ! @itemize @w{} @item Donald E. Knuth, @cite{The Art of Computer Programming: Sorting and Searching} (Vol 3, 3rd Ed, 1997), Addison-Wesley, ISBN 0201896850. *************** *** 307,313 **** @noindent The Heapsort algorithm is described in the following book, ! @itemize @asis @item Robert Sedgewick, @cite{Algorithms in C}, Addison-Wesley, ISBN 0201514257. @end itemize --- 307,313 ---- @noindent The Heapsort algorithm is described in the following book, ! @itemize @w{} @item Robert Sedgewick, @cite{Algorithms in C}, Addison-Wesley, ISBN 0201514257. @end itemize diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/specfunc-legendre.texi gsl-1.14/doc/specfunc-legendre.texi *** gsl-1.13/doc/specfunc-legendre.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/specfunc-legendre.texi Wed Mar 10 10:57:13 2010 *************** *** 122,128 **** @deftypefunx int gsl_sf_legendre_sphPlm_e (int @var{l}, int @var{m}, double @var{x}, gsl_sf_result * @var{result}) These routines compute the normalized associated Legendre polynomial @c{$\sqrt{(2l+1)/(4\pi)} \sqrt{(l-m)!/(l+m)!} P_l^m(x)$} ! @math{$\sqrt@{(2l+1)/(4\pi)@} \sqrt@{(l-m)!/(l+m)!@} P_l^m(x)$} suitable for use in spherical harmonics. The parameters must satisfy @c{$m \ge 0$} @math{m >= 0}, @c{$l \ge m$} @math{l >= m}, @c{$|x| \le 1$} --- 122,128 ---- @deftypefunx int gsl_sf_legendre_sphPlm_e (int @var{l}, int @var{m}, double @var{x}, gsl_sf_result * @var{result}) These routines compute the normalized associated Legendre polynomial @c{$\sqrt{(2l+1)/(4\pi)} \sqrt{(l-m)!/(l+m)!} P_l^m(x)$} ! @math{\sqrt@{(2l+1)/(4\pi)@} \sqrt@{(l-m)!/(l+m)!@} P_l^m(x)} suitable for use in spherical harmonics. The parameters must satisfy @c{$m \ge 0$} @math{m >= 0}, @c{$l \ge m$} @math{l >= m}, @c{$|x| \le 1$} *************** *** 135,141 **** @deftypefunx int gsl_sf_legendre_sphPlm_deriv_array (int @var{lmax}, int @var{m}, double @var{x}, double @var{result_array}[], double @var{result_deriv_array}[]) These functions compute arrays of normalized associated Legendre functions @c{$\sqrt{(2l+1)/(4\pi)} \sqrt{(l-m)!/(l+m)!} P_l^m(x)$} ! @math{$\sqrt@{(2l+1)/(4\pi)@} \sqrt@{(l-m)!/(l+m)!@} P_l^m(x)$}, and derivatives, for @c{$m \ge 0$} @math{m >= 0}, @c{$l = |m|, \dots, lmax$} --- 135,141 ---- @deftypefunx int gsl_sf_legendre_sphPlm_deriv_array (int @var{lmax}, int @var{m}, double @var{x}, double @var{result_array}[], double @var{result_deriv_array}[]) These functions compute arrays of normalized associated Legendre functions @c{$\sqrt{(2l+1)/(4\pi)} \sqrt{(l-m)!/(l+m)!} P_l^m(x)$} ! @math{\sqrt@{(2l+1)/(4\pi)@} \sqrt@{(l-m)!/(l+m)!@} P_l^m(x)}, and derivatives, for @c{$m \ge 0$} @math{m >= 0}, @c{$l = |m|, \dots, lmax$} diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/specfunc.texi gsl-1.14/doc/specfunc.texi *** gsl-1.13/doc/specfunc.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/specfunc.texi Wed Mar 10 10:57:13 2010 *************** *** 315,321 **** The library follows the conventions of @cite{Abramowitz & Stegun} where possible, ! @itemize @asis @item Abramowitz & Stegun (eds.), @cite{Handbook of Mathematical Functions} @end itemize --- 315,321 ---- The library follows the conventions of @cite{Abramowitz & Stegun} where possible, ! @itemize @w{} @item Abramowitz & Stegun (eds.), @cite{Handbook of Mathematical Functions} @end itemize *************** *** 324,330 **** The following papers contain information on the algorithms used to compute the special functions, @cindex MISCFUN ! @itemize @asis @item Allan J. MacLeod, MISCFUN: A software package to compute uncommon special functions. @cite{ACM Trans.@: Math.@: Soft.}, vol.@: 22, --- 324,330 ---- The following papers contain information on the algorithms used to compute the special functions, @cindex MISCFUN ! @itemize @w{} @item Allan J. MacLeod, MISCFUN: A software package to compute uncommon special functions. @cite{ACM Trans.@: Math.@: Soft.}, vol.@: 22, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/stamp-vti gsl-1.14/doc/stamp-vti *** gsl-1.13/doc/stamp-vti Tue Sep 8 10:33:45 2009 --- gsl-1.14/doc/stamp-vti Wed Mar 10 12:53:19 2010 *************** *** 1,4 **** ! @set UPDATED 25 August 2009 ! @set UPDATED-MONTH August 2009 ! @set EDITION 1.13 ! @set VERSION 1.13 --- 1,4 ---- ! @set UPDATED 10 March 2010 ! @set UPDATED-MONTH March 2010 ! @set EDITION 1.14 ! @set VERSION 1.14 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/statistics.texi gsl-1.14/doc/statistics.texi *** gsl-1.13/doc/statistics.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/statistics.texi Wed Mar 10 10:57:13 2010 *************** *** 779,785 **** The standard reference for almost any topic in statistics is the multi-volume @cite{Advanced Theory of Statistics} by Kendall and Stuart. ! @itemize @asis @item Maurice Kendall, Alan Stuart, and J. Keith Ord. @cite{The Advanced Theory of Statistics} (multiple volumes) --- 779,785 ---- The standard reference for almost any topic in statistics is the multi-volume @cite{Advanced Theory of Statistics} by Kendall and Stuart. ! @itemize @w{} @item Maurice Kendall, Alan Stuart, and J. Keith Ord. @cite{The Advanced Theory of Statistics} (multiple volumes) *************** *** 792,798 **** approach. The following book by Gelman, Carlin, Stern and Rubin gives a comprehensive coverage of the subject. ! @itemize @asis @item Andrew Gelman, John B. Carlin, Hal S. Stern, Donald B. Rubin. @cite{Bayesian Data Analysis}. --- 792,798 ---- approach. The following book by Gelman, Carlin, Stern and Rubin gives a comprehensive coverage of the subject. ! @itemize @w{} @item Andrew Gelman, John B. Carlin, Hal S. Stern, Donald B. Rubin. @cite{Bayesian Data Analysis}. *************** *** 804,810 **** Probability and Statistics in the ``Mathematical Tools'' section of its Annual Review of Particle Physics. ! @itemize @asis @item @cite{Review of Particle Properties} R.M. Barnett et al., Physical Review D54, 1 (1996) --- 804,810 ---- Probability and Statistics in the ``Mathematical Tools'' section of its Annual Review of Particle Physics. ! @itemize @w{} @item @cite{Review of Particle Properties} R.M. Barnett et al., Physical Review D54, 1 (1996) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/statnotes.tex gsl-1.14/doc/statnotes.tex *** gsl-1.13/doc/statnotes.tex Thu Jan 1 00:00:00 1970 --- gsl-1.14/doc/statnotes.tex Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,93 ---- + \documentclass[fleqn,12pt]{article} + \newcommand{\expectation}[1]{\langle #1 \rangle} + \begin{document} + \title{Statistical Function Notes} + \author{Brian Gough} + \date{November 2008} + \maketitle + + \section{Weighted mean and variance} + We have $N$ samples $x_i$ drawn from a gaussian distribution + $G(\mu,\sigma)$ (or any distribution with finite first and second + moments). Each sample has a weight $w_i$ which represents the + relative value we place on it. Given the estimate of the mean + % + \begin{eqnarray} + \bar{x} &=& {1 \over W} \sum_i w_i x_i \\ + W &=& \sum_i w_i + \end{eqnarray} + % + \noindent + we want an unbiased estimator of the variance of the underlying + distribution $\sigma^2$. + + We start with the standard definition of the sample variance $V$ and + compute the bias correction factor. + % + \begin{eqnarray} + V &=& {1\over W} \sum_i w_i (x_i - \bar{x})^2 \\ + &=& {1\over W} \sum_i w_i \left(x_i - {1\over W}\sum_j w_j x_j\right)^2 \\ + &=& {1\over W} \sum_i w_i \left(x_i^2 - {2 \over W} x_i \sum_j w_j x_j + + {1 \over W^2} (\sum_j w_j x_j)^2\right) \\ + &=& {1\over W} \left( \sum_i w_i x_i^2 + - {2 \over W} \sum_i w_i x_i \sum_j w_j x_j + + {1 \over W} (\sum_j w_j x_j)^2\right)\\ + &=& {1\over W} \left( \sum_i w_i x_i^2 + - {1 \over W} \sum_i w_i x_i \sum_j w_j x_j\right)\\ + &=& {1\over W} \left( \sum_i w_i x_i^2 + - {1 \over W} \sum_{ij} w_i w_j x_i x_j\right) + \end{eqnarray} + % + We find the expectation value $\expectation{V}$ using the Gaussian + formulas $\expectation{x_i} = \mu$, $\expectation{x_i x_j} = \mu^2 + + \delta_{ij} \sigma^2$. We assume that any random contribution + dependent on the weights themselves is zero or can be + neglected in comparison to $\sigma$. + + % + \begin{eqnarray} + \expectation{V} &=& {1\over W} \left( \sum_i w_i \expectation{x_i^2} + - {1 \over W} \sum_{ij} w_i w_j \expectation{x_i x_j}\right)\\ + &=& {1\over W} \left( \sum_i w_i (\mu^2 + \sigma^2) + - {1 \over W} \sum_{ij} w_i w_j (\mu^2 + \delta_{ij} \sigma^2)\right)\\ + &=& {1\over W} \left( W (\mu^2 + \sigma^2) + - {1 \over W} ( W^2 \mu^2 +( \sum_i w_i^2) \sigma^2)\right)\\ + &=& {1\over W} \left(W \sigma^2 - {1 \over W} ( \sum_i w_i^2)\sigma^2\right)\\ + &=& \left({{W^2 - \sum_i w_i^2} \over W^2}\right) \sigma^2 + \end{eqnarray} + % + Therefore an unbiased estimator $U$ of $\sigma^2$ is + % + \begin{eqnarray} + U &=& {W^2 \over {(W^2 - \sum_i w_i^2)}} \expectation{V}\\ + &=& {W^2 \over {(W^2 - \sum_i w_i^2)}} {1\over W} \sum_i w_i (x_i - \bar{x})^2 \\ + &=& {W \over {(W^2 - \sum_i w_i^2)}} \sum_i w_i (x_i - \bar{x})^2 + \end{eqnarray} + % + And this is the formula used in GSL. + \subsection{Notes} + Note the following properties: + + \begin{itemize} + \item + The formula is invariant under rescaling of the weights. + + \item + For equal weights $w_i = w$ the factor reduces to $N/(N^2-N) = + 1/(N-1)$, which is the familiar factor of the unbiased estimator of + the variance for data without weights. + + \item + When $\sum_i (w_i/W)^2 \ll 1$ the commonly-used weighted variance + formula $V = (1/W)\sum_i w_i (x_i - \bar{x})^2$ is a good + approximation. + \end{itemize} + + If we assume that the ``experimental errors'' arising from the weights + contribute, the underlying variance $\sigma^2$ is overestimated by + this formula (e.g. consider the case $\sigma = 0$---all the variation + will come from the gaussian fluctuations represented by the + $w_i$). The appropriate expectation in this case is $\expectation{x_i + x_j} = \mu^2 + \delta_{ij} (\sigma^2 + 1/w_i)$ + \end{document} + diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/sum.texi gsl-1.14/doc/sum.texi *** gsl-1.13/doc/sum.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/sum.texi Wed Mar 10 10:57:13 2010 *************** *** 161,167 **** The algorithms used by these functions are described in the following papers, ! @itemize @asis @item T. Fessler, W.F. Ford, D.A. Smith, @sc{hurry}: An acceleration algorithm for scalar sequences and series --- 161,167 ---- The algorithms used by these functions are described in the following papers, ! @itemize @w{} @item T. Fessler, W.F. Ford, D.A. Smith, @sc{hurry}: An acceleration algorithm for scalar sequences and series *************** *** 172,178 **** @noindent The theory of the @math{u}-transform was presented by Levin, ! @itemize @asis @item D. Levin, Development of Non-Linear Transformations for Improving Convergence of --- 172,178 ---- @noindent The theory of the @math{u}-transform was presented by Levin, ! @itemize @w{} @item D. Levin, Development of Non-Linear Transformations for Improving Convergence of *************** *** 181,187 **** @noindent A review paper on the Levin Transform is available online, ! @itemize @asis @item Herbert H. H. Homeier, Scalar Levin-Type Sequence Transformations, @uref{http://arxiv.org/abs/math/0005209}. --- 181,187 ---- @noindent A review paper on the Levin Transform is available online, ! @itemize @w{} @item Herbert H. H. Homeier, Scalar Levin-Type Sequence Transformations, @uref{http://arxiv.org/abs/math/0005209}. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/texinfo.tex gsl-1.14/doc/texinfo.tex *** gsl-1.13/doc/texinfo.tex Wed Nov 19 09:13:46 2008 --- gsl-1.14/doc/texinfo.tex Wed Mar 10 10:57:13 2010 *************** *** 3,18 **** % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2004-11-25.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, ! % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software ! % Foundation, Inc. % ! % This texinfo.tex file 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 2, or (at ! % your option) any later version. % % This texinfo.tex file is distributed in the hope that it will be % useful, but WITHOUT ANY WARRANTY; without even the implied warranty --- 3,18 ---- % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2008-04-18.10} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, ! % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ! % 2007, 2008 Free Software Foundation, Inc. % ! % This texinfo.tex file 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. % % This texinfo.tex file is distributed in the hope that it will be % useful, but WITHOUT ANY WARRANTY; without even the implied warranty *************** *** 20,28 **** % General Public License for more details. % % You should have received a copy of the GNU General Public License ! % along with this texinfo.tex file; see the file COPYING. If not, write ! % to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! % Boston, MA 02111-1307, USA. % % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without --- 20,26 ---- % 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 . % % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without *************** *** 67,73 **** \everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} ! \message{Basics,} \chardef\other=12 % We never want plain's \outer definition of \+ in Texinfo. --- 65,71 ---- \everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} ! \chardef\other=12 % We never want plain's \outer definition of \+ in Texinfo. *************** *** 99,104 **** --- 97,103 ---- \let\ptexslash=\/ \let\ptexstar=\* \let\ptext=\t + \let\ptextop=\top % If this character appears in an error message or help string, it % starts a new line in the output. *************** *** 153,172 **** \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi ! % In some macros, we cannot use the `\? notation---the left quote is ! % in some cases the escape char. \chardef\colonChar = `\: \chardef\commaChar = `\, \chardef\dotChar = `\. \chardef\exclamChar= `\! \chardef\questChar = `\? \chardef\semiChar = `\; \chardef\underChar = `\_ - \chardef\spaceChar = `\ % - \chardef\spacecat = 10 - \def\spaceisspace{\catcode\spaceChar=\spacecat} - % Ignore a token. % \def\gobble#1{} --- 152,173 ---- \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi ! % Since the category of space is not known, we have to be careful. ! \chardef\spacecat = 10 ! \def\spaceisspace{\catcode`\ =\spacecat} ! ! % sometimes characters are active, so we need control sequences. \chardef\colonChar = `\: \chardef\commaChar = `\, + \chardef\dashChar = `\- \chardef\dotChar = `\. \chardef\exclamChar= `\! + \chardef\lquoteChar= `\` \chardef\questChar = `\? + \chardef\rquoteChar= `\' \chardef\semiChar = `\; \chardef\underChar = `\_ % Ignore a token. % \def\gobble#1{} *************** *** 277,282 **** --- 278,327 ---- \newdimen\cornerthick \cornerthick=.3pt \newdimen\topandbottommargin \topandbottommargin=.75in + % Output a mark which sets \thischapter, \thissection and \thiscolor. + % We dump everything together because we only have one kind of mark. + % This works because we only use \botmark / \topmark, not \firstmark. + % + % A mark contains a subexpression of the \ifcase ... \fi construct. + % \get*marks macros below extract the needed part using \ifcase. + % + % Another complication is to let the user choose whether \thischapter + % (\thissection) refers to the chapter (section) in effect at the top + % of a page, or that at the bottom of a page. The solution is + % described on page 260 of The TeXbook. It involves outputting two + % marks for the sectioning macros, one before the section break, and + % one after. I won't pretend I can describe this better than DEK... + \def\domark{% + \toks0=\expandafter{\lastchapterdefs}% + \toks2=\expandafter{\lastsectiondefs}% + \toks4=\expandafter{\prevchapterdefs}% + \toks6=\expandafter{\prevsectiondefs}% + \toks8=\expandafter{\lastcolordefs}% + \mark{% + \the\toks0 \the\toks2 + \noexpand\or \the\toks4 \the\toks6 + \noexpand\else \the\toks8 + }% + } + % \topmark doesn't work for the very first chapter (after the title + % page or the contents), so we use \firstmark there -- this gets us + % the mark with the chapter defs, unless the user sneaks in, e.g., + % @setcolor (or @url, or @link, etc.) between @contents and the very + % first @chapter. + \def\gettopheadingmarks{% + \ifcase0\topmark\fi + \ifx\thischapter\empty \ifcase0\firstmark\fi \fi + } + \def\getbottomheadingmarks{\ifcase1\botmark\fi} + \def\getcolormarks{\ifcase2\topmark\fi} + + % Avoid "undefined control sequence" errors. + \def\lastchapterdefs{} + \def\lastsectiondefs{} + \def\prevchapterdefs{} + \def\prevsectiondefs{} + \def\lastcolordefs{} + % Main output routine. \chardef\PAGE = 255 \output = {\onepageout{\pagecontents\PAGE}} *************** *** 294,300 **** --- 339,347 ---- % % Do this outside of the \shipout so @code etc. will be expanded in % the headline as they should be, not taken literally (outputting ''code). + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% + \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% % {% *************** *** 302,311 **** % take effect in \write's, yet the group defined by the \vbox ends % before the \shipout runs. % - \escapechar = `\\ % use backslash in output files. \indexdummies % don't expand commands in the output. \normalturnoffactive % \ in index entries must not stay \, e.g., if ! % the page break happens to be in the middle of an example. \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi --- 349,362 ---- % take effect in \write's, yet the group defined by the \vbox ends % before the \shipout runs. % \indexdummies % don't expand commands in the output. \normalturnoffactive % \ in index entries must not stay \, e.g., if ! % the page break happens to be in the middle of an example. ! % We don't want .vr (or whatever) entries like this: ! % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} ! % "\acronym" won't work when it's read back in; ! % it needs to be ! % {\code {{\tt \backslashcurfont }acronym} \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi *************** *** 333,341 **** \pagebody{#1}% \ifdim\ht\footlinebox > 0pt % Only leave this space if the footline is nonempty. ! % (We lessened \vsize for it in \oddfootingxxx.) % The \baselineskip=24pt in plain's \makefootline has no effect. ! \vskip 2\baselineskip \unvbox\footlinebox \fi % --- 384,392 ---- \pagebody{#1}% \ifdim\ht\footlinebox > 0pt % Only leave this space if the footline is nonempty. ! % (We lessened \vsize for it in \oddfootingyyy.) % The \baselineskip=24pt in plain's \makefootline has no effect. ! \vskip 24pt \unvbox\footlinebox \fi % *************** *** 356,362 **** \egroup % \vbox from first cropmarks clause \fi }% end of \shipout\vbox ! }% end of group with \normalturnoffactive \advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi } --- 407,413 ---- \egroup % \vbox from first cropmarks clause \fi }% end of \shipout\vbox ! }% end of group with \indexdummies \advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi } *************** *** 369,375 **** % marginal hacks, juha@viisa.uucp (Juha Takala) \ifvoid\margin\else % marginal info is present \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi ! \dimen@=\dp#1 \unvbox#1 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi \ifr@ggedbottom \kern-\dimen@ \vfil \fi} } --- 420,426 ---- % marginal hacks, juha@viisa.uucp (Juha Takala) \ifvoid\margin\else % marginal info is present \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi ! \dimen@=\dp#1\relax \unvbox#1\relax \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi \ifr@ggedbottom \kern-\dimen@ \vfil \fi} } *************** *** 391,397 **** % \def\parsearg{\parseargusing{}} \def\parseargusing#1#2{% ! \def\next{#2}% \begingroup \obeylines \spaceisspace --- 442,448 ---- % \def\parsearg{\parseargusing{}} \def\parseargusing#1#2{% ! \def\argtorun{#2}% \begingroup \obeylines \spaceisspace *************** *** 410,416 **** \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} ! % Each occurence of `\^^M' or `\^^M' is replaced by a single space. % % \argremovec might leave us with trailing space, e.g., % @end itemize @c foo --- 461,467 ---- \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} ! % Each occurrence of `\^^M' or `\^^M' is replaced by a single space. % % \argremovec might leave us with trailing space, e.g., % @end itemize @c foo *************** *** 422,429 **** \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% \def\temp{#3}% \ifx\temp\empty ! % We cannot use \next here, as it holds the macro to run; ! % thus we reuse \temp. \let\temp\finishparsearg \else \let\temp\argcheckspaces --- 473,479 ---- \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% \def\temp{#3}% \ifx\temp\empty ! % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: \let\temp\finishparsearg \else \let\temp\argcheckspaces *************** *** 435,448 **** % If a _delimited_ argument is enclosed in braces, they get stripped; so % to get _exactly_ the rest of the line, we had to prevent such situation. % We prepended an \empty token at the very beginning and we expand it now, ! % just before passing the control to \next. ! % (Similarily, we have to think about #3 of \argcheckspacesY above: it is % either the null string, or it ends with \^^M---thus there is no danger % that a pair of braces would be stripped. % % But first, we have to remove the trailing space token. % ! \def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}} % \parseargdef\foo{...} % is roughly equivalent to --- 485,498 ---- % If a _delimited_ argument is enclosed in braces, they get stripped; so % to get _exactly_ the rest of the line, we had to prevent such situation. % We prepended an \empty token at the very beginning and we expand it now, ! % just before passing the control to \argtorun. ! % (Similarly, we have to think about #3 of \argcheckspacesY above: it is % either the null string, or it ends with \^^M---thus there is no danger % that a pair of braces would be stripped. % % But first, we have to remove the trailing space token. % ! \def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} % \parseargdef\foo{...} % is roughly equivalent to *************** *** 493,504 **** % used to check whether the current environment is the one expected. % % Non-false conditionals (@iftex, @ifset) don't fit into this, so they ! % are not treated as enviroments; they don't open a group. (The % implementation of @end takes care not to call \endgroup in this % special case.) ! % At runtime, environments start with this: \def\startenvironment#1{\begingroup\def\thisenv{#1}} % initialize \let\thisenv\empty --- 543,554 ---- % used to check whether the current environment is the one expected. % % Non-false conditionals (@iftex, @ifset) don't fit into this, so they ! % are not treated as environments; they don't open a group. (The % implementation of @end takes care not to call \endgroup in this % special case.) ! % At run-time, environments start with this: \def\startenvironment#1{\begingroup\def\thisenv{#1}} % initialize \let\thisenv\empty *************** *** 516,522 **** \fi } ! % Evironment mismatch, #1 expected: \def\badenverr{% \errhelp = \EMsimple \errmessage{This command can appear only \inenvironment\temp, --- 566,572 ---- \fi } ! % Environment mismatch, #1 expected: \def\badenverr{% \errhelp = \EMsimple \errmessage{This command can appear only \inenvironment\temp, *************** *** 566,572 **** \let\}=\myrbrace \begingroup % Definitions to produce \{ and \} commands for indices, ! % and @{ and @} for the aux file. \catcode`\{ = \other \catcode`\} = \other \catcode`\[ = 1 \catcode`\] = 2 \catcode`\! = 0 \catcode`\\ = \other --- 616,622 ---- \let\}=\myrbrace \begingroup % Definitions to produce \{ and \} commands for indices, ! % and @{ and @} for the aux/toc files. \catcode`\{ = \other \catcode`\} = \other \catcode`\[ = 1 \catcode`\] = 2 \catcode`\! = 0 \catcode`\\ = \other *************** *** 600,607 **** \def\jmacro{j} \def\dotless#1{% \def\temp{#1}% ! \ifx\temp\imacro \ptexi ! \else\ifx\temp\jmacro \j \else \errmessage{@dotless can be used only with i or j}% \fi\fi } --- 650,657 ---- \def\jmacro{j} \def\dotless#1{% \def\temp{#1}% ! \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi ! \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi \else \errmessage{@dotless can be used only with i or j}% \fi\fi } *************** *** 647,659 **** \let\/=\allowbreak % @. is an end-of-sentence period. ! \def\.{.\spacefactor=3000 } % @! is an end-of-sentence bang. ! \def\!{!\spacefactor=3000 } % @? is an end-of-sentence query. ! \def\?{?\spacefactor=3000 } % @w prevents a word break. Without the \leavevmode, @w at the % beginning of a paragraph, when TeX is still in vertical mode, would --- 697,724 ---- \let\/=\allowbreak % @. is an end-of-sentence period. ! \def\.{.\spacefactor=\endofsentencespacefactor\space} % @! is an end-of-sentence bang. ! \def\!{!\spacefactor=\endofsentencespacefactor\space} % @? is an end-of-sentence query. ! \def\?{?\spacefactor=\endofsentencespacefactor\space} ! ! % @frenchspacing on|off says whether to put extra space after punctuation. ! % ! \def\onword{on} ! \def\offword{off} ! % ! \parseargdef\frenchspacing{% ! \def\temp{#1}% ! \ifx\temp\onword \plainfrenchspacing ! \else\ifx\temp\offword \plainnonfrenchspacing ! \else ! \errhelp = \EMsimple ! \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% ! \fi\fi ! } % @w prevents a word break. Without the \leavevmode, @w at the % beginning of a paragraph, when TeX is still in vertical mode, would *************** *** 852,866 **** \temp } ! % @include file insert text of that file as input. % \def\include{\parseargusing\filenamecatcodes\includezzz} \def\includezzz#1{% \pushthisfilestack \def\thisfile{#1}% {% ! \makevalueexpandable ! \def\temp{\input #1 }% \expandafter }\temp \popthisfilestack --- 917,935 ---- \temp } ! % @include FILE -- \input text of FILE. % \def\include{\parseargusing\filenamecatcodes\includezzz} \def\includezzz#1{% \pushthisfilestack \def\thisfile{#1}% {% ! \makevalueexpandable % we want to expand any @value in FILE. ! \turnoffactive % and allow special characters in the expansion ! \edef\temp{\noexpand\input #1 }% ! % ! % This trickery is to read FILE outside of a group, in case it makes ! % definitions, etc. \expandafter }\temp \popthisfilestack *************** *** 1031,1039 **** % _ active, and distinguish by seeing if the current family is \slfam, % which is what @var uses. { ! \catcode\underChar = \active \gdef\mathunderscore{% ! \catcode\underChar=\active \def_{\ifnum\fam=\slfam \_\else\sb\fi}% } } --- 1100,1108 ---- % _ active, and distinguish by seeing if the current family is \slfam, % which is what @var uses. { ! \catcode`\_ = \active \gdef\mathunderscore{% ! \catcode`\_=\active \def_{\ifnum\fam=\slfam \_\else\sb\fi}% } } *************** *** 1050,1055 **** --- 1119,1134 ---- \mathunderscore \let\\ = \mathbackslash \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot $\finishmath } \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. *************** *** 1071,1090 **** } } ! % @bullet and @minus need the same treatment as @math, just above. \def\bullet{$\ptexbullet$} ! \def\minus{$-$} % @dots{} outputs an ellipsis using the current font. ! % We do .5em per period so that it has the same spacing in a typewriter ! % font as three actual period characters. % \def\dots{% \leavevmode ! \hbox to 1.5em{% ! \hskip 0pt plus 0.25fil ! .\hfil.\hfil.% ! \hskip 0pt plus 0.5fil }% } --- 1150,1180 ---- } } ! % Some math mode symbols. \def\bullet{$\ptexbullet$} ! \def\geq{\ifmmode \ge\else $\ge$\fi} ! \def\leq{\ifmmode \le\else $\le$\fi} ! \def\minus{\ifmmode -\else $-$\fi} % @dots{} outputs an ellipsis using the current font. ! % We do .5em per period so that it has the same spacing in the cm ! % typewriter fonts as three actual period characters; on the other hand, ! % in other typewriter fonts three periods are wider than 1.5em. So do ! % whichever is larger. % \def\dots{% \leavevmode ! \setbox0=\hbox{...}% get width of three periods ! \ifdim\wd0 > 1.5em ! \dimen0 = \wd0 ! \else ! \dimen0 = 1.5em ! \fi ! \hbox to \dimen0{% ! \hskip 0pt plus.25fil ! .\hskip 0pt plus1fil ! .\hskip 0pt plus1fil ! .\hskip 0pt plus.5fil }% } *************** *** 1092,1098 **** % \def\enddots{% \dots ! \spacefactor=3000 } % @comma{} is so commas can be inserted into text without messing up --- 1182,1188 ---- % \def\enddots{% \dots ! \spacefactor=\endofsentencespacefactor } % @comma{} is so commas can be inserted into text without messing up *************** *** 1176,1215 **** \fi \fi \fi ! % \ifpdf ! \input pdfcolor ! \pdfcatalog{/PageMode /UseOutlines}% \def\dopdfimage#1#2#3{% ! \def\imagewidth{#2}% ! \def\imageheight{#3}% ! % without \immediate, pdftex seg faults when the same image is % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) \ifnum\pdftexversion < 14 \immediate\pdfimage \else \immediate\pdfximage \fi ! \ifx\empty\imagewidth\else width \imagewidth \fi ! \ifx\empty\imageheight\else height \imageheight \fi \ifnum\pdftexversion<13 ! #1.pdf% \else ! {#1.pdf}% \fi \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} \def\pdfmkdest#1{{% ! % We have to set dummies so commands such as @code in a section title ! % aren't expanded. ! \atdummies ! \normalturnoffactive ! \pdfdest name{#1} xyz% }} \def\pdfmkpgn#1{#1} ! \let\linkcolor = \Blue % was Cyan, but that seems light? ! \def\endlink{\Black\pdfendlink} % Adding outlines to PDF; macros for calculating structure of outlines % come from Petr Olsak \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% --- 1266,1441 ---- \fi \fi \fi ! ! % PDF uses PostScript string constants for the names of xref targets, ! % for display in the outlines, and in other places. Thus, we have to ! % double any backslashes. Otherwise, a name like "\node" will be ! % interpreted as a newline (\n), followed by o, d, e. Not good. ! % http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html ! % (and related messages, the final outcome is that it is up to the TeX ! % user to double the backslashes and otherwise make the string valid, so ! % that's what we do). ! ! % double active backslashes. ! % ! {\catcode`\@=0 \catcode`\\=\active ! @gdef@activebackslashdouble{% ! @catcode`@\=@active ! @let\=@doublebackslash} ! } ! ! % To handle parens, we must adopt a different approach, since parens are ! % not active characters. hyperref.dtx (which has the same problem as ! % us) handles it with this amazing macro to replace tokens, with minor ! % changes for Texinfo. It is included here under the GPL by permission ! % from the author, Heiko Oberdiek. ! % ! % #1 is the tokens to replace. ! % #2 is the replacement. ! % #3 is the control sequence with the string. ! % ! \def\HyPsdSubst#1#2#3{% ! \def\HyPsdReplace##1#1##2\END{% ! ##1% ! \ifx\\##2\\% ! \else ! #2% ! \HyReturnAfterFi{% ! \HyPsdReplace##2\END ! }% ! \fi ! }% ! \xdef#3{\expandafter\HyPsdReplace#3#1\END}% ! } ! \long\def\HyReturnAfterFi#1\fi{\fi#1} ! ! % #1 is a control sequence in which to do the replacements. ! \def\backslashparens#1{% ! \xdef#1{#1}% redefine it as its expansion; the definition is simply ! % \lastnode when called from \setref -> \pdfmkdest. ! \HyPsdSubst{(}{\realbackslash(}{#1}% ! \HyPsdSubst{)}{\realbackslash)}{#1}% ! } ! ! \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images ! with PDF output, and none of those formats could be found. (.eps cannot ! be supported due to the design of the PDF format; use regular TeX (DVI ! output) for that.)} ! \ifpdf ! % ! % Color manipulation macros based on pdfcolor.tex. ! \def\cmykDarkRed{0.28 1 1 0.35} ! \def\cmykBlack{0 0 0 1} ! % ! \def\pdfsetcolor#1{\pdfliteral{#1 k}} ! % Set color, and create a mark which defines \thiscolor accordingly, ! % so that \makeheadline knows which color to restore. ! \def\setcolor#1{% ! \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% ! \domark ! \pdfsetcolor{#1}% ! } ! % ! \def\maincolor{\cmykBlack} ! \pdfsetcolor{\maincolor} ! \edef\thiscolor{\maincolor} ! \def\lastcolordefs{} ! % ! \def\makefootline{% ! \baselineskip24pt ! \line{\pdfsetcolor{\maincolor}\the\footline}% ! } ! % ! \def\makeheadline{% ! \vbox to 0pt{% ! \vskip-22.5pt ! \line{% ! \vbox to8.5pt{}% ! % Extract \thiscolor definition from the marks. ! \getcolormarks ! % Typeset the headline with \maincolor, then restore the color. ! \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% ! }% ! \vss ! }% ! \nointerlineskip ! } ! % ! % ! \pdfcatalog{/PageMode /UseOutlines} ! % ! % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). \def\dopdfimage#1#2#3{% ! \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% ! \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% ! % ! % pdftex (and the PDF format) support .png, .jpg, .pdf (among ! % others). Let's try in that order. ! \let\pdfimgext=\empty ! \begingroup ! \openin 1 #1.png \ifeof 1 ! \openin 1 #1.jpg \ifeof 1 ! \openin 1 #1.jpeg \ifeof 1 ! \openin 1 #1.JPG \ifeof 1 ! \openin 1 #1.pdf \ifeof 1 ! \openin 1 #1.PDF \ifeof 1 ! \errhelp = \nopdfimagehelp ! \errmessage{Could not find image file #1 for pdf}% ! \else \gdef\pdfimgext{PDF}% ! \fi ! \else \gdef\pdfimgext{pdf}% ! \fi ! \else \gdef\pdfimgext{JPG}% ! \fi ! \else \gdef\pdfimgext{jpeg}% ! \fi ! \else \gdef\pdfimgext{jpg}% ! \fi ! \else \gdef\pdfimgext{png}% ! \fi ! \closein 1 ! \endgroup ! % ! % without \immediate, ancient pdftex seg faults when the same image is % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) \ifnum\pdftexversion < 14 \immediate\pdfimage \else \immediate\pdfximage \fi ! \ifdim \wd0 >0pt width \imagewidth \fi ! \ifdim \wd2 >0pt height \imageheight \fi \ifnum\pdftexversion<13 ! #1.\pdfimgext \else ! {#1.\pdfimgext}% \fi \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} + % \def\pdfmkdest#1{{% ! % We have to set dummies so commands such as @code, and characters ! % such as \, aren't expanded when present in a section title. ! \indexnofonts ! \turnoffactive ! \activebackslashdouble ! \makevalueexpandable ! \def\pdfdestname{#1}% ! \backslashparens\pdfdestname ! \safewhatsit{\pdfdest name{\pdfdestname} xyz}% }} + % + % used to mark target names; must be expandable. \def\pdfmkpgn#1{#1} ! % ! % by default, use a color that is dark enough to print on paper as ! % nearly black, but still distinguishable for online viewing. ! \def\urlcolor{\cmykDarkRed} ! \def\linkcolor{\cmykDarkRed} ! \def\endlink{\setcolor{\maincolor}\pdfendlink} ! % % Adding outlines to PDF; macros for calculating structure of outlines % come from Petr Olsak \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% *************** *** 1218,1237 **** \advance\tempnum by 1 \expandafter\xdef\csname#1\endcsname{\the\tempnum}} % ! % #1 is the section text. #2 is the pdf expression for the number ! % of subentries (or empty, for subsubsections). #3 is the node ! % text, which might be empty if this toc entry had no ! % corresponding node. #4 is the page number. % \def\dopdfoutline#1#2#3#4{% % Generate a link to the node text if that exists; else, use the % page number. We could generate a destination for the section % text in the case where a section has no node, but it doesn't ! % seem worthwhile, since most documents are normally structured. \def\pdfoutlinedest{#3}% ! \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi % ! \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}% } % \def\pdfmakeoutlines{% --- 1444,1474 ---- \advance\tempnum by 1 \expandafter\xdef\csname#1\endcsname{\the\tempnum}} % ! % #1 is the section text, which is what will be displayed in the ! % outline by the pdf viewer. #2 is the pdf expression for the number ! % of subentries (or empty, for subsubsections). #3 is the node text, ! % which might be empty if this toc entry had no corresponding node. ! % #4 is the page number % \def\dopdfoutline#1#2#3#4{% % Generate a link to the node text if that exists; else, use the % page number. We could generate a destination for the section % text in the case where a section has no node, but it doesn't ! % seem worth the trouble, since most documents are normally structured. \def\pdfoutlinedest{#3}% ! \ifx\pdfoutlinedest\empty ! \def\pdfoutlinedest{#4}% ! \else ! % Doubled backslashes in the name. ! {\activebackslashdouble \xdef\pdfoutlinedest{#3}% ! \backslashparens\pdfoutlinedest}% ! \fi ! % ! % Also double the backslashes in the display string. ! {\activebackslashdouble \xdef\pdfoutlinetext{#1}% ! \backslashparens\pdfoutlinetext}% % ! \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% } % \def\pdfmakeoutlines{% *************** *** 1272,1278 **** \def\unnsecentry{\numsecentry}% \def\unnsubsecentry{\numsubsecentry}% \def\unnsubsubsecentry{\numsubsubsecentry}% ! \input \jobname.toc % % Read toc second time, this time actually producing the outlines. % The `-' means take the \expnumber as the absolute number of --- 1509,1515 ---- \def\unnsecentry{\numsecentry}% \def\unnsubsecentry{\numsubsecentry}% \def\unnsubsubsecentry{\numsubsubsecentry}% ! \readdatafile{toc}% % % Read toc second time, this time actually producing the outlines. % The `-' means take the \expnumber as the absolute number of *************** *** 1298,1338 **** % their "best" equivalent, based on the @documentencoding. Right % now, I guess we'll just let the pdf reader have its way. \indexnofonts ! \turnoffactive ! \input \jobname.toc \endgroup } % - \def\makelinks #1,{% - \def\params{#1}\def\E{END}% - \ifx\params\E - \let\nextmakelinks=\relax - \else - \let\nextmakelinks=\makelinks - \ifnum\lnkcount>0,\fi - \picknum{#1}% - \startlink attr{/Border [0 0 0]} - goto name{\pdfmkpgn{\the\pgn}}% - \linkcolor #1% - \advance\lnkcount by 1% - \endlink - \fi - \nextmakelinks - } - \def\picknum#1{\expandafter\pn#1} - \def\pn#1{% - \def\p{#1}% - \ifx\p\lbrace - \let\nextpn=\ppn - \else - \let\nextpn=\ppnn - \def\first{#1} - \fi - \nextpn - } - \def\ppn#1{\pgn=#1\gobble} - \def\ppnn{\pgn=\first} - \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,} \def\skipspaces#1{\def\PP{#1}\def\D{|}% \ifx\PP\D\let\nextsp\relax \else\let\nextsp\skipspaces --- 1535,1546 ---- % their "best" equivalent, based on the @documentencoding. Right % now, I guess we'll just let the pdf reader have its way. \indexnofonts ! \setupdatafile ! \catcode`\\=\active \otherbackslash ! \input \tocreadfilename \endgroup } % \def\skipspaces#1{\def\PP{#1}\def\D{|}% \ifx\PP\D\let\nextsp\relax \else\let\nextsp\skipspaces *************** *** 1347,1357 **** \else \let \startlink \pdfstartlink \fi \def\pdfurl#1{% \begingroup ! \normalturnoffactive\def\@{@}% \makevalueexpandable ! \leavevmode\Red \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% \endgroup} --- 1555,1573 ---- \else \let \startlink \pdfstartlink \fi + % make a live url in pdf output. \def\pdfurl#1{% \begingroup ! % it seems we really need yet another set of dummies; have not ! % tried to figure out what each command should do in the context ! % of @url. for now, just make @/ a no-op, that's the only one ! % people have actually reported a problem with. ! % ! \normalturnoffactive ! \def\@{@}% ! \let\/=\empty \makevalueexpandable ! \leavevmode\setcolor{\urlcolor}% \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% \endgroup} *************** *** 1378,1390 **** {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} \def\pdflink#1{% \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} ! \linkcolor #1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax ! \let\linkcolor = \relax \let\pdfmakeoutlines = \relax \fi % \ifx\pdfoutput --- 1594,1607 ---- {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} \def\pdflink#1{% \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} ! \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax ! \let\setcolor = \gobble ! \let\pdfsetcolor = \gobble \let\pdfmakeoutlines = \relax \fi % \ifx\pdfoutput *************** *** 1419,1424 **** --- 1636,1642 ---- % We don't need math for this font style. \def\ttsl{\setfontstyle{ttsl}} + % Default leading. \newdimen\textleading \textleading = 13.2pt *************** *** 1430,1437 **** \def\strutheightpercent{.70833} \def\strutdepthpercent {.29167} % \def\setleading#1{% ! \normalbaselineskip = #1\relax \normallineskip = \lineskipfactor\normalbaselineskip \normalbaselines \setbox\strutbox =\hbox{% --- 1648,1659 ---- \def\strutheightpercent{.70833} \def\strutdepthpercent {.29167} % + % can get a sort of poor man's double spacing by redefining this. + \def\baselinefactor{1} + % \def\setleading#1{% ! \dimen0 = #1\relax ! \normalbaselineskip = \baselinefactor\dimen0 \normallineskip = \lineskipfactor\normalbaselineskip \normalbaselines \setbox\strutbox =\hbox{% *************** *** 1440,1449 **** }% } % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). ! % #3 is the font's design size, #4 is a scale factor ! \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4} % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix --- 1662,1940 ---- }% } + % PDF CMaps. See also LaTeX's t1.cmap. + % + % do nothing with this by default. + \expandafter\let\csname cmapOT1\endcsname\gobble + \expandafter\let\csname cmapOT1IT\endcsname\gobble + \expandafter\let\csname cmapOT1TT\endcsname\gobble + + % if we are producing pdf, and we have \pdffontattr, then define cmaps. + % (\pdffontattr was introduced many years ago, but people still run + % older pdftex's; it's easy to conditionalize, so we do.) + \ifpdf \ifx\pdffontattr\undefined \else + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap + %%DocumentNeededResources: ProcSet (CIDInit) + %%IncludeResource: ProcSet (CIDInit) + %%BeginResource: CMap (TeX-OT1-0) + %%Title: (TeX-OT1-0 TeX OT1 0) + %%Version: 1.000 + %%EndComments + /CIDInit /ProcSet findresource begin + 12 dict begin + begincmap + /CIDSystemInfo + << /Registry (TeX) + /Ordering (OT1) + /Supplement 0 + >> def + /CMapName /TeX-OT1-0 def + /CMapType 2 def + 1 begincodespacerange + <00> <7F> + endcodespacerange + 8 beginbfrange + <00> <01> <0393> + <09> <0A> <03A8> + <23> <26> <0023> + <28> <3B> <0028> + <3F> <5B> <003F> + <5D> <5E> <005D> + <61> <7A> <0061> + <7B> <7C> <2013> + endbfrange + 40 beginbfchar + <02> <0398> + <03> <039B> + <04> <039E> + <05> <03A0> + <06> <03A3> + <07> <03D2> + <08> <03A6> + <0B> <00660066> + <0C> <00660069> + <0D> <0066006C> + <0E> <006600660069> + <0F> <00660066006C> + <10> <0131> + <11> <0237> + <12> <0060> + <13> <00B4> + <14> <02C7> + <15> <02D8> + <16> <00AF> + <17> <02DA> + <18> <00B8> + <19> <00DF> + <1A> <00E6> + <1B> <0153> + <1C> <00F8> + <1D> <00C6> + <1E> <0152> + <1F> <00D8> + <21> <0021> + <22> <201D> + <27> <2019> + <3C> <00A1> + <3D> <003D> + <3E> <00BF> + <5C> <201C> + <5F> <02D9> + <60> <2018> + <7D> <02DD> + <7E> <007E> + <7F> <00A8> + endbfchar + endcmap + CMapName currentdict /CMap defineresource pop + end + end + %%EndResource + %%EOF + }\endgroup + \expandafter\edef\csname cmapOT1\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% + % + % \cmapOT1IT + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap + %%DocumentNeededResources: ProcSet (CIDInit) + %%IncludeResource: ProcSet (CIDInit) + %%BeginResource: CMap (TeX-OT1IT-0) + %%Title: (TeX-OT1IT-0 TeX OT1IT 0) + %%Version: 1.000 + %%EndComments + /CIDInit /ProcSet findresource begin + 12 dict begin + begincmap + /CIDSystemInfo + << /Registry (TeX) + /Ordering (OT1IT) + /Supplement 0 + >> def + /CMapName /TeX-OT1IT-0 def + /CMapType 2 def + 1 begincodespacerange + <00> <7F> + endcodespacerange + 8 beginbfrange + <00> <01> <0393> + <09> <0A> <03A8> + <25> <26> <0025> + <28> <3B> <0028> + <3F> <5B> <003F> + <5D> <5E> <005D> + <61> <7A> <0061> + <7B> <7C> <2013> + endbfrange + 42 beginbfchar + <02> <0398> + <03> <039B> + <04> <039E> + <05> <03A0> + <06> <03A3> + <07> <03D2> + <08> <03A6> + <0B> <00660066> + <0C> <00660069> + <0D> <0066006C> + <0E> <006600660069> + <0F> <00660066006C> + <10> <0131> + <11> <0237> + <12> <0060> + <13> <00B4> + <14> <02C7> + <15> <02D8> + <16> <00AF> + <17> <02DA> + <18> <00B8> + <19> <00DF> + <1A> <00E6> + <1B> <0153> + <1C> <00F8> + <1D> <00C6> + <1E> <0152> + <1F> <00D8> + <21> <0021> + <22> <201D> + <23> <0023> + <24> <00A3> + <27> <2019> + <3C> <00A1> + <3D> <003D> + <3E> <00BF> + <5C> <201C> + <5F> <02D9> + <60> <2018> + <7D> <02DD> + <7E> <007E> + <7F> <00A8> + endbfchar + endcmap + CMapName currentdict /CMap defineresource pop + end + end + %%EndResource + %%EOF + }\endgroup + \expandafter\edef\csname cmapOT1IT\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% + % + % \cmapOT1TT + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap + %%DocumentNeededResources: ProcSet (CIDInit) + %%IncludeResource: ProcSet (CIDInit) + %%BeginResource: CMap (TeX-OT1TT-0) + %%Title: (TeX-OT1TT-0 TeX OT1TT 0) + %%Version: 1.000 + %%EndComments + /CIDInit /ProcSet findresource begin + 12 dict begin + begincmap + /CIDSystemInfo + << /Registry (TeX) + /Ordering (OT1TT) + /Supplement 0 + >> def + /CMapName /TeX-OT1TT-0 def + /CMapType 2 def + 1 begincodespacerange + <00> <7F> + endcodespacerange + 5 beginbfrange + <00> <01> <0393> + <09> <0A> <03A8> + <21> <26> <0021> + <28> <5F> <0028> + <61> <7E> <0061> + endbfrange + 32 beginbfchar + <02> <0398> + <03> <039B> + <04> <039E> + <05> <03A0> + <06> <03A3> + <07> <03D2> + <08> <03A6> + <0B> <2191> + <0C> <2193> + <0D> <0027> + <0E> <00A1> + <0F> <00BF> + <10> <0131> + <11> <0237> + <12> <0060> + <13> <00B4> + <14> <02C7> + <15> <02D8> + <16> <00AF> + <17> <02DA> + <18> <00B8> + <19> <00DF> + <1A> <00E6> + <1B> <0153> + <1C> <00F8> + <1D> <00C6> + <1E> <0152> + <1F> <00D8> + <20> <2423> + <27> <2019> + <60> <2018> + <7F> <00A8> + endbfchar + endcmap + CMapName currentdict /CMap defineresource pop + end + end + %%EndResource + %%EOF + }\endgroup + \expandafter\edef\csname cmapOT1TT\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% + \fi\fi + + % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). ! % #3 is the font's design size, #4 is a scale factor, #5 is the CMap ! % encoding (currently only OT1, OT1IT and OT1TT are allowed, pass ! % empty to omit). ! \def\setfont#1#2#3#4#5{% ! \font#1=\fontprefix#2#3 scaled #4 ! \csname cmap#5\endcsname#1% ! } ! % This is what gets called when #5 of \setfont is empty. ! \let\cmap\gobble ! % emacs-page end of cmaps % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix *************** *** 1468,1585 **** \def\scshape{csc} \def\scbshape{csc} % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} \edef\mainmagstep{\magstephalf} ! \setfont\textrm\rmshape{10}{\mainmagstep} ! \setfont\texttt\ttshape{10}{\mainmagstep} ! \setfont\textbf\bfshape{10}{\mainmagstep} ! \setfont\textit\itshape{10}{\mainmagstep} ! \setfont\textsl\slshape{10}{\mainmagstep} ! \setfont\textsf\sfshape{10}{\mainmagstep} ! \setfont\textsc\scshape{10}{\mainmagstep} ! \setfont\textttsl\ttslshape{10}{\mainmagstep} \font\texti=cmmi10 scaled \mainmagstep \font\textsy=cmsy10 scaled \mainmagstep % A few fonts for @defun names and args. ! \setfont\defbf\bfshape{10}{\magstep1} ! \setfont\deftt\ttshape{10}{\magstep1} ! \setfont\defttsl\ttslshape{10}{\magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} % Fonts for indices, footnotes, small examples (9pt). \def\smallnominalsize{9pt} ! \setfont\smallrm\rmshape{9}{1000} ! \setfont\smalltt\ttshape{9}{1000} ! \setfont\smallbf\bfshape{10}{900} ! \setfont\smallit\itshape{9}{1000} ! \setfont\smallsl\slshape{9}{1000} ! \setfont\smallsf\sfshape{9}{1000} ! \setfont\smallsc\scshape{10}{900} ! \setfont\smallttsl\ttslshape{10}{900} \font\smalli=cmmi9 \font\smallsy=cmsy9 % Fonts for small examples (8pt). \def\smallernominalsize{8pt} ! \setfont\smallerrm\rmshape{8}{1000} ! \setfont\smallertt\ttshape{8}{1000} ! \setfont\smallerbf\bfshape{10}{800} ! \setfont\smallerit\itshape{8}{1000} ! \setfont\smallersl\slshape{8}{1000} ! \setfont\smallersf\sfshape{8}{1000} ! \setfont\smallersc\scshape{10}{800} ! \setfont\smallerttsl\ttslshape{10}{800} \font\smalleri=cmmi8 \font\smallersy=cmsy8 % Fonts for title page (20.4pt): \def\titlenominalsize{20pt} ! \setfont\titlerm\rmbshape{12}{\magstep3} ! \setfont\titleit\itbshape{10}{\magstep4} ! \setfont\titlesl\slbshape{10}{\magstep4} ! \setfont\titlett\ttbshape{12}{\magstep3} ! \setfont\titlettsl\ttslshape{10}{\magstep4} ! \setfont\titlesf\sfbshape{17}{\magstep1} \let\titlebf=\titlerm ! \setfont\titlesc\scbshape{10}{\magstep4} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 \def\authorrm{\secrm} \def\authortt{\sectt} % Chapter (and unnumbered) fonts (17.28pt). \def\chapnominalsize{17pt} ! \setfont\chaprm\rmbshape{12}{\magstep2} ! \setfont\chapit\itbshape{10}{\magstep3} ! \setfont\chapsl\slbshape{10}{\magstep3} ! \setfont\chaptt\ttbshape{12}{\magstep2} ! \setfont\chapttsl\ttslshape{10}{\magstep3} ! \setfont\chapsf\sfbshape{17}{1000} \let\chapbf=\chaprm ! \setfont\chapsc\scbshape{10}{\magstep3} \font\chapi=cmmi12 scaled \magstep2 \font\chapsy=cmsy10 scaled \magstep3 % Section fonts (14.4pt). \def\secnominalsize{14pt} ! \setfont\secrm\rmbshape{12}{\magstep1} ! \setfont\secit\itbshape{10}{\magstep2} ! \setfont\secsl\slbshape{10}{\magstep2} ! \setfont\sectt\ttbshape{12}{\magstep1} ! \setfont\secttsl\ttslshape{10}{\magstep2} ! \setfont\secsf\sfbshape{12}{\magstep1} \let\secbf\secrm ! \setfont\secsc\scbshape{10}{\magstep2} \font\seci=cmmi12 scaled \magstep1 \font\secsy=cmsy10 scaled \magstep2 % Subsection fonts (13.15pt). \def\ssecnominalsize{13pt} ! \setfont\ssecrm\rmbshape{12}{\magstephalf} ! \setfont\ssecit\itbshape{10}{1315} ! \setfont\ssecsl\slbshape{10}{1315} ! \setfont\ssectt\ttbshape{12}{\magstephalf} ! \setfont\ssecttsl\ttslshape{10}{1315} ! \setfont\ssecsf\sfbshape{12}{\magstephalf} \let\ssecbf\ssecrm ! \setfont\ssecsc\scbshape{10}{1315} \font\sseci=cmmi12 scaled \magstephalf \font\ssecsy=cmsy10 scaled 1315 % Reduced fonts for @acro in text (10pt). \def\reducednominalsize{10pt} ! \setfont\reducedrm\rmshape{10}{1000} ! \setfont\reducedtt\ttshape{10}{1000} ! \setfont\reducedbf\bfshape{10}{1000} ! \setfont\reducedit\itshape{10}{1000} ! \setfont\reducedsl\slshape{10}{1000} ! \setfont\reducedsf\sfshape{10}{1000} ! \setfont\reducedsc\scshape{10}{1000} ! \setfont\reducedttsl\ttslshape{10}{1000} \font\reducedi=cmmi10 \font\reducedsy=cmsy10 % In order for the font changes to affect most math symbols and letters, % we have to define the \textfont of the standard families. Since --- 1959,2255 ---- \def\scshape{csc} \def\scbshape{csc} + % Definitions for a main text size of 11pt. This is the default in + % Texinfo. + % + \def\definetextfontsizexi{% % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} \edef\mainmagstep{\magstephalf} ! \setfont\textrm\rmshape{10}{\mainmagstep}{OT1} ! \setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} ! \setfont\textbf\bfshape{10}{\mainmagstep}{OT1} ! \setfont\textit\itshape{10}{\mainmagstep}{OT1IT} ! \setfont\textsl\slshape{10}{\mainmagstep}{OT1} ! \setfont\textsf\sfshape{10}{\mainmagstep}{OT1} ! \setfont\textsc\scshape{10}{\mainmagstep}{OT1} ! \setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} \font\texti=cmmi10 scaled \mainmagstep \font\textsy=cmsy10 scaled \mainmagstep + \def\textecsize{1095} % A few fonts for @defun names and args. ! \setfont\defbf\bfshape{10}{\magstep1}{OT1} ! \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} ! \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} % Fonts for indices, footnotes, small examples (9pt). \def\smallnominalsize{9pt} ! \setfont\smallrm\rmshape{9}{1000}{OT1} ! \setfont\smalltt\ttshape{9}{1000}{OT1TT} ! \setfont\smallbf\bfshape{10}{900}{OT1} ! \setfont\smallit\itshape{9}{1000}{OT1IT} ! \setfont\smallsl\slshape{9}{1000}{OT1} ! \setfont\smallsf\sfshape{9}{1000}{OT1} ! \setfont\smallsc\scshape{10}{900}{OT1} ! \setfont\smallttsl\ttslshape{10}{900}{OT1TT} \font\smalli=cmmi9 \font\smallsy=cmsy9 + \def\smallecsize{0900} % Fonts for small examples (8pt). \def\smallernominalsize{8pt} ! \setfont\smallerrm\rmshape{8}{1000}{OT1} ! \setfont\smallertt\ttshape{8}{1000}{OT1TT} ! \setfont\smallerbf\bfshape{10}{800}{OT1} ! \setfont\smallerit\itshape{8}{1000}{OT1IT} ! \setfont\smallersl\slshape{8}{1000}{OT1} ! \setfont\smallersf\sfshape{8}{1000}{OT1} ! \setfont\smallersc\scshape{10}{800}{OT1} ! \setfont\smallerttsl\ttslshape{10}{800}{OT1TT} \font\smalleri=cmmi8 \font\smallersy=cmsy8 + \def\smallerecsize{0800} % Fonts for title page (20.4pt): \def\titlenominalsize{20pt} ! \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} ! \setfont\titleit\itbshape{10}{\magstep4}{OT1IT} ! \setfont\titlesl\slbshape{10}{\magstep4}{OT1} ! \setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} ! \setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} ! \setfont\titlesf\sfbshape{17}{\magstep1}{OT1} \let\titlebf=\titlerm ! \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 \def\authorrm{\secrm} \def\authortt{\sectt} + \def\titleecsize{2074} % Chapter (and unnumbered) fonts (17.28pt). \def\chapnominalsize{17pt} ! \setfont\chaprm\rmbshape{12}{\magstep2}{OT1} ! \setfont\chapit\itbshape{10}{\magstep3}{OT1IT} ! \setfont\chapsl\slbshape{10}{\magstep3}{OT1} ! \setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} ! \setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} ! \setfont\chapsf\sfbshape{17}{1000}{OT1} \let\chapbf=\chaprm ! \setfont\chapsc\scbshape{10}{\magstep3}{OT1} \font\chapi=cmmi12 scaled \magstep2 \font\chapsy=cmsy10 scaled \magstep3 + \def\chapecsize{1728} % Section fonts (14.4pt). \def\secnominalsize{14pt} ! \setfont\secrm\rmbshape{12}{\magstep1}{OT1} ! \setfont\secit\itbshape{10}{\magstep2}{OT1IT} ! \setfont\secsl\slbshape{10}{\magstep2}{OT1} ! \setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} ! \setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} ! \setfont\secsf\sfbshape{12}{\magstep1}{OT1} \let\secbf\secrm ! \setfont\secsc\scbshape{10}{\magstep2}{OT1} \font\seci=cmmi12 scaled \magstep1 \font\secsy=cmsy10 scaled \magstep2 + \def\sececsize{1440} % Subsection fonts (13.15pt). \def\ssecnominalsize{13pt} ! \setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} ! \setfont\ssecit\itbshape{10}{1315}{OT1IT} ! \setfont\ssecsl\slbshape{10}{1315}{OT1} ! \setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} ! \setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} ! \setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} \let\ssecbf\ssecrm ! \setfont\ssecsc\scbshape{10}{1315}{OT1} \font\sseci=cmmi12 scaled \magstephalf \font\ssecsy=cmsy10 scaled 1315 + \def\ssececsize{1200} % Reduced fonts for @acro in text (10pt). \def\reducednominalsize{10pt} ! \setfont\reducedrm\rmshape{10}{1000}{OT1} ! \setfont\reducedtt\ttshape{10}{1000}{OT1TT} ! \setfont\reducedbf\bfshape{10}{1000}{OT1} ! \setfont\reducedit\itshape{10}{1000}{OT1IT} ! \setfont\reducedsl\slshape{10}{1000}{OT1} ! \setfont\reducedsf\sfshape{10}{1000}{OT1} ! \setfont\reducedsc\scshape{10}{1000}{OT1} ! \setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} \font\reducedi=cmmi10 \font\reducedsy=cmsy10 + \def\reducedecsize{1000} + + % reset the current fonts + \textfonts + \rm + } % end of 11pt text font size definitions + + + % Definitions to make the main text be 10pt Computer Modern, with + % section, chapter, etc., sizes following suit. This is for the GNU + % Press printing of the Emacs 22 manual. Maybe other manuals in the + % future. Used with @smallbook, which sets the leading to 12pt. + % + \def\definetextfontsizex{% + % Text fonts (10pt). + \def\textnominalsize{10pt} + \edef\mainmagstep{1000} + \setfont\textrm\rmshape{10}{\mainmagstep}{OT1} + \setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} + \setfont\textbf\bfshape{10}{\mainmagstep}{OT1} + \setfont\textit\itshape{10}{\mainmagstep}{OT1IT} + \setfont\textsl\slshape{10}{\mainmagstep}{OT1} + \setfont\textsf\sfshape{10}{\mainmagstep}{OT1} + \setfont\textsc\scshape{10}{\mainmagstep}{OT1} + \setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} + \font\texti=cmmi10 scaled \mainmagstep + \font\textsy=cmsy10 scaled \mainmagstep + \def\textecsize{1000} + + % A few fonts for @defun names and args. + \setfont\defbf\bfshape{10}{\magstephalf}{OT1} + \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} + \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} + \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + + % Fonts for indices, footnotes, small examples (9pt). + \def\smallnominalsize{9pt} + \setfont\smallrm\rmshape{9}{1000}{OT1} + \setfont\smalltt\ttshape{9}{1000}{OT1TT} + \setfont\smallbf\bfshape{10}{900}{OT1} + \setfont\smallit\itshape{9}{1000}{OT1IT} + \setfont\smallsl\slshape{9}{1000}{OT1} + \setfont\smallsf\sfshape{9}{1000}{OT1} + \setfont\smallsc\scshape{10}{900}{OT1} + \setfont\smallttsl\ttslshape{10}{900}{OT1TT} + \font\smalli=cmmi9 + \font\smallsy=cmsy9 + \def\smallecsize{0900} + + % Fonts for small examples (8pt). + \def\smallernominalsize{8pt} + \setfont\smallerrm\rmshape{8}{1000}{OT1} + \setfont\smallertt\ttshape{8}{1000}{OT1TT} + \setfont\smallerbf\bfshape{10}{800}{OT1} + \setfont\smallerit\itshape{8}{1000}{OT1IT} + \setfont\smallersl\slshape{8}{1000}{OT1} + \setfont\smallersf\sfshape{8}{1000}{OT1} + \setfont\smallersc\scshape{10}{800}{OT1} + \setfont\smallerttsl\ttslshape{10}{800}{OT1TT} + \font\smalleri=cmmi8 + \font\smallersy=cmsy8 + \def\smallerecsize{0800} + + % Fonts for title page (20.4pt): + \def\titlenominalsize{20pt} + \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} + \setfont\titleit\itbshape{10}{\magstep4}{OT1IT} + \setfont\titlesl\slbshape{10}{\magstep4}{OT1} + \setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} + \setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} + \setfont\titlesf\sfbshape{17}{\magstep1}{OT1} + \let\titlebf=\titlerm + \setfont\titlesc\scbshape{10}{\magstep4}{OT1} + \font\titlei=cmmi12 scaled \magstep3 + \font\titlesy=cmsy10 scaled \magstep4 + \def\authorrm{\secrm} + \def\authortt{\sectt} + \def\titleecsize{2074} + + % Chapter fonts (14.4pt). + \def\chapnominalsize{14pt} + \setfont\chaprm\rmbshape{12}{\magstep1}{OT1} + \setfont\chapit\itbshape{10}{\magstep2}{OT1IT} + \setfont\chapsl\slbshape{10}{\magstep2}{OT1} + \setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} + \setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} + \setfont\chapsf\sfbshape{12}{\magstep1}{OT1} + \let\chapbf\chaprm + \setfont\chapsc\scbshape{10}{\magstep2}{OT1} + \font\chapi=cmmi12 scaled \magstep1 + \font\chapsy=cmsy10 scaled \magstep2 + \def\chapecsize{1440} + + % Section fonts (12pt). + \def\secnominalsize{12pt} + \setfont\secrm\rmbshape{12}{1000}{OT1} + \setfont\secit\itbshape{10}{\magstep1}{OT1IT} + \setfont\secsl\slbshape{10}{\magstep1}{OT1} + \setfont\sectt\ttbshape{12}{1000}{OT1TT} + \setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} + \setfont\secsf\sfbshape{12}{1000}{OT1} + \let\secbf\secrm + \setfont\secsc\scbshape{10}{\magstep1}{OT1} + \font\seci=cmmi12 + \font\secsy=cmsy10 scaled \magstep1 + \def\sececsize{1200} + + % Subsection fonts (10pt). + \def\ssecnominalsize{10pt} + \setfont\ssecrm\rmbshape{10}{1000}{OT1} + \setfont\ssecit\itbshape{10}{1000}{OT1IT} + \setfont\ssecsl\slbshape{10}{1000}{OT1} + \setfont\ssectt\ttbshape{10}{1000}{OT1TT} + \setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} + \setfont\ssecsf\sfbshape{10}{1000}{OT1} + \let\ssecbf\ssecrm + \setfont\ssecsc\scbshape{10}{1000}{OT1} + \font\sseci=cmmi10 + \font\ssecsy=cmsy10 + \def\ssececsize{1000} + + % Reduced fonts for @acro in text (9pt). + \def\reducednominalsize{9pt} + \setfont\reducedrm\rmshape{9}{1000}{OT1} + \setfont\reducedtt\ttshape{9}{1000}{OT1TT} + \setfont\reducedbf\bfshape{10}{900}{OT1} + \setfont\reducedit\itshape{9}{1000}{OT1IT} + \setfont\reducedsl\slshape{9}{1000}{OT1} + \setfont\reducedsf\sfshape{9}{1000}{OT1} + \setfont\reducedsc\scshape{10}{900}{OT1} + \setfont\reducedttsl\ttslshape{10}{900}{OT1TT} + \font\reducedi=cmmi9 + \font\reducedsy=cmsy9 + \def\reducedecsize{0900} + + % reduce space between paragraphs + \divide\parskip by 2 + + % reset the current fonts + \textfonts + \rm + } % end of 10pt text font size definitions + + + % We provide the user-level command + % @fonttextsize 10 + % (or 11) to redefine the text font size. pt is assumed. + % + \def\xword{10} + \def\xiword{11} + % + \parseargdef\fonttextsize{% + \def\textsizearg{#1}% + \wlog{doing @fonttextsize \textsizearg}% + % + % Set \globaldefs so that documents can use this inside @tex, since + % makeinfo 4.8 does not support it, but we need it nonetheless. + % + \begingroup \globaldefs=1 + \ifx\textsizearg\xword \definetextfontsizex + \else \ifx\textsizearg\xiword \definetextfontsizexi + \else + \errhelp=\EMsimple + \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} + \fi\fi + \endgroup + } + % In order for the font changes to affect most math symbols and letters, % we have to define the \textfont of the standard families. Since *************** *** 1691,1697 **** % Set up the default fonts, so we can use them for creating boxes. % ! \textfonts \rm % Define these so they can be easily changed for other fonts. \def\angleleft{$\langle$} --- 2361,2367 ---- % Set up the default fonts, so we can use them for creating boxes. % ! \definetextfontsizexi % Define these so they can be easily changed for other fonts. \def\angleleft{$\langle$} *************** *** 1701,1710 **** \newcount\fontdepth \fontdepth=0 % Fonts for short table of contents. ! \setfont\shortcontrm\rmshape{12}{1000} ! \setfont\shortcontbf\bfshape{10}{\magstep1} % no cmb12 ! \setfont\shortcontsl\slshape{12}{1000} ! \setfont\shortconttt\ttshape{12}{1000} %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic --- 2371,2380 ---- \newcount\fontdepth \fontdepth=0 % Fonts for short table of contents. ! \setfont\shortcontrm\rmshape{12}{1000}{OT1} ! \setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 ! \setfont\shortcontsl\slshape{12}{1000}{OT1} ! \setfont\shortconttt\ttshape{12}{1000}{OT1TT} %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic *************** *** 1749,1766 **** % sometimes \x has an active definition that messes things up. % \catcode`@=11 ! \def\frenchspacing{% \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m } \catcode`@=\other \def\t#1{% ! {\tt \rawbackslash \frenchspacing #1}% \null } \def\samp#1{`\tclose{#1}'\null} ! \setfont\keyrm\rmshape{8}{1000} \font\keysy=cmsy9 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% --- 2419,2443 ---- % sometimes \x has an active definition that messes things up. % \catcode`@=11 ! \def\plainfrenchspacing{% \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m + \def\endofsentencespacefactor{1000}% for @. and friends + } + \def\plainnonfrenchspacing{% + \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 + \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 + \def\endofsentencespacefactor{3000}% for @. and friends } \catcode`@=\other + \def\endofsentencespacefactor{3000}% default \def\t#1{% ! {\tt \rawbackslash \plainfrenchspacing #1}% \null } \def\samp#1{`\tclose{#1}'\null} ! \setfont\keyrm\rmshape{8}{1000}{OT1} \font\keysy=cmsy9 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% *************** *** 1768,1773 **** --- 2445,2451 ---- \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% \kern-0.4pt\hrule}% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + \def\key #1{{\nohyphenation \uppercase{#1}}\null} % The old definition, with no lozenge: %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} \def\ctrl #1{{\tt \rawbackslash \hat}#1} *************** *** 1793,1799 **** \nohyphenation % \rawbackslash ! \frenchspacing #1% }% \null --- 2471,2477 ---- \nohyphenation % \rawbackslash ! \plainfrenchspacing #1% }% \null *************** *** 1809,1820 **** % and arrange explicitly to hyphenate at a dash. % -- rms. { ! \catcode`\-=\active ! \catcode`\_=\active % \global\def\code{\begingroup ! \catcode`\-=\active \let-\codedash ! \catcode`\_=\active \let_\codeunder \codex } } --- 2487,2507 ---- % and arrange explicitly to hyphenate at a dash. % -- rms. { ! \catcode`\-=\active \catcode`\_=\active ! \catcode`\'=\active \catcode`\`=\active % \global\def\code{\begingroup ! \catcode\rquoteChar=\active \catcode\lquoteChar=\active ! \let'\codequoteright \let`\codequoteleft ! % ! \catcode\dashChar=\active \catcode\underChar=\active ! \ifallowcodebreaks ! \let-\codedash ! \let_\codeunder ! \else ! \let-\realdash ! \let_\realunder ! \fi \codex } } *************** *** 1834,1839 **** --- 2521,2548 ---- } \def\codex #1{\tclose{#1}\endgroup} + % An additional complication: the above will allow breaks after, e.g., + % each of the four underscores in __typeof__. This is undesirable in + % some manuals, especially if they don't have long identifiers in + % general. @allowcodebreaks provides a way to control this. + % + \newif\ifallowcodebreaks \allowcodebreakstrue + + \def\keywordtrue{true} + \def\keywordfalse{false} + + \parseargdef\allowcodebreaks{% + \def\txiarg{#1}% + \ifx\txiarg\keywordtrue + \allowcodebreakstrue + \else\ifx\txiarg\keywordfalse + \allowcodebreaksfalse + \else + \errhelp = \EMsimple + \errmessage{Unknown @allowcodebreaks option `\txiarg'}% + \fi\fi + } + % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. *************** *** 1841,1856 **** % `example' (@kbd uses ttsl only inside of @example and friends), % or `code' (@kbd uses normal tty font always). \parseargdef\kbdinputstyle{% ! \def\arg{#1}% ! \ifx\arg\worddistinct \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% ! \else\ifx\arg\wordexample \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% ! \else\ifx\arg\wordcode \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% \else \errhelp = \EMsimple ! \errmessage{Unknown @kbdinputstyle option `\arg'}% \fi\fi\fi } \def\worddistinct{distinct} --- 2550,2565 ---- % `example' (@kbd uses ttsl only inside of @example and friends), % or `code' (@kbd uses normal tty font always). \parseargdef\kbdinputstyle{% ! \def\txiarg{#1}% ! \ifx\txiarg\worddistinct \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% ! \else\ifx\txiarg\wordexample \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% ! \else\ifx\txiarg\wordcode \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% \else \errhelp = \EMsimple ! \errmessage{Unknown @kbdinputstyle option `\txiarg'}% \fi\fi\fi } \def\worddistinct{distinct} *************** *** 1871,1876 **** --- 2580,2592 ---- \let\env=\code \let\command=\code + % @clicksequence{File @click{} Open ...} + \def\clicksequence#1{\begingroup #1\endgroup} + + % @clickstyle @arrow (by default) + \parseargdef\clickstyle{\def\click{#1}} + \def\click{\arrow} + % @uref (abbreviation for `urlref') takes an optional (comma-separated) % second argument specifying the text to display and an optional third % arg as text to display instead of (rather than in addition to) the url *************** *** 1962,1968 **** % \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% ! {\frenchspacing #1}% \def\temp{#2}% \ifx\temp\empty \else \space ({\unsepspaces \ignorespaces \temp \unskip})% --- 2678,2684 ---- % \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% ! {\plainfrenchspacing #1}% \def\temp{#2}% \ifx\temp\empty \else \space ({\unsepspaces \ignorespaces \temp \unskip})% *************** *** 2000,2006 **** \def\eurofont{% % We set the font at each command, rather than predefining it in % \textfonts and the other font-switching commands, so that ! % installations which never need the symbold don't have to have the % font installed. % % There is only one designed size (nominal 10pt), so we always scale --- 2716,2722 ---- \def\eurofont{% % We set the font at each command, rather than predefining it in % \textfonts and the other font-switching commands, so that ! % installations which never need the symbol don't have to have the % font installed. % % There is only one designed size (nominal 10pt), so we always scale *************** *** 2021,2026 **** --- 2737,2771 ---- \thiseurofont } + % Hacks for glyphs from the EC fonts similar to \euro. We don't + % use \let for the aliases, because sometimes we redefine the original + % macro, and the alias should reflect the redefinition. + \def\guillemetleft{{\ecfont \char"13}} + \def\guillemotleft{\guillemetleft} + \def\guillemetright{{\ecfont \char"14}} + \def\guillemotright{\guillemetright} + \def\guilsinglleft{{\ecfont \char"0E}} + \def\guilsinglright{{\ecfont \char"0F}} + \def\quotedblbase{{\ecfont \char"12}} + \def\quotesinglbase{{\ecfont \char"0D}} + % + \def\ecfont{% + % We can't distinguish serif/sanserif and italic/slanted, but this + % is used for crude hacks anyway (like adding French and German + % quotes to documents typeset with CM, where we lose kerning), so + % hopefully nobody will notice/care. + \edef\ecsize{\csname\curfontsize ecsize\endcsname}% + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% + \ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi + \thisecfont + } + % @registeredsymbol - R in a circle. The font for the R should really % be smaller yet, but lllsize is the best we can do for now. % Adapted from the plain.tex definition of \copyright. *************** *** 2031,2036 **** --- 2776,2785 ---- }$% } + % @textdegree - the normal degrees sign. + % + \def\textdegree{$^\circ$} + % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. *************** *** 2039,2044 **** --- 2788,2799 ---- \def\Orb{\mathhexbox20D} \fi + % Quotes. + \chardef\quotedblleft="5C + \chardef\quotedblright=`\" + \chardef\quoteleft=`\` + \chardef\quoteright=`\' + \message{page headings,} *************** *** 2202,2213 **** % % Leave some space for the footline. Hopefully ok to assume % @evenfooting will not be used by itself. ! \global\advance\pageheight by -\baselineskip ! \global\advance\vsize by -\baselineskip } \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} % @headings double turns headings on for double-sided printing. % @headings single turns headings on for single-sided printing. --- 2957,2995 ---- % % Leave some space for the footline. Hopefully ok to assume % @evenfooting will not be used by itself. ! \global\advance\pageheight by -12pt ! \global\advance\vsize by -12pt } \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} + % @evenheadingmarks top \thischapter <- chapter at the top of a page + % @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page + % + % The same set of arguments for: + % + % @oddheadingmarks + % @evenfootingmarks + % @oddfootingmarks + % @everyheadingmarks + % @everyfootingmarks + + \def\evenheadingmarks{\headingmarks{even}{heading}} + \def\oddheadingmarks{\headingmarks{odd}{heading}} + \def\evenfootingmarks{\headingmarks{even}{footing}} + \def\oddfootingmarks{\headingmarks{odd}{footing}} + \def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} + \headingmarks{odd}{heading}{#1} } + \def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} + \headingmarks{odd}{footing}{#1} } + % #1 = even/odd, #2 = heading/footing, #3 = top/bottom. + \def\headingmarks#1#2#3 {% + \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname + \global\expandafter\let\csname get#1#2marks\endcsname \temp + } + + \everyheadingmarks bottom + \everyfootingmarks bottom % @headings double turns headings on for double-sided printing. % @headings single turns headings on for single-sided printing. *************** *** 2862,2867 **** --- 3644,3650 ---- \def\doignore#1{\begingroup % Scan in ``verbatim'' mode: + \obeylines \catcode`\@ = \other \catcode`\{ = \other \catcode`\} = \other *************** *** 2882,2897 **** \gdef\dodoignore#1{% % #1 contains the command name as a string, e.g., `ifinfo'. % ! % Define a command to find the next `@end #1', which must be on a line ! % by itself. ! \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}% % And this command to find another #1 command, at the beginning of a % line. (Otherwise, we would consider a line `@c @ifset', for % example, to count as an @ifset for nesting.) \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% % % And now expand that command. - \obeylines % \doignoretext ^^M% }% } --- 3665,3680 ---- \gdef\dodoignore#1{% % #1 contains the command name as a string, e.g., `ifinfo'. % ! % Define a command to find the next `@end #1'. ! \long\def\doignoretext##1^^M@end #1{% ! \doignoretextyyy##1^^M@#1\_STOP_}% ! % % And this command to find another #1 command, at the beginning of a % line. (Otherwise, we would consider a line `@c @ifset', for % example, to count as an @ifset for nesting.) \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% % % And now expand that command. \doignoretext ^^M% }% } *************** *** 2921,2927 **** } % Finish off ignored text. ! \def\enddoignore{\endgroup\ignorespaces} % @set VAR sets the variable VAR to an empty value. --- 3704,3715 ---- } % Finish off ignored text. ! { \obeylines% ! % Ignore anything after the last `@end #1'; this matters in verbatim ! % environments, where otherwise the newline after an ignored conditional ! % would result in a blank line in the output. ! \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% ! } % @set VAR sets the variable VAR to an empty value. *************** *** 3121,3162 **** % we have to laboriously prevent expansion for those that we don't. % \def\indexdummies{% \def\@{@}% change to @@ when we switch to @ as escape char in index files. \def\ {\realbackslash\space }% % Need these in case \tex is in effect and \{ is a \delimiter again. % But can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. \let\{ = \mylbrace \let\} = \myrbrace % ! % \definedummyword defines \#1 as \realbackslash #1\space, thus ! % effectively preventing its expansion. This is used only for control ! % words, not control letters, because the \space would be incorrect ! % for control characters, but is needed to separate the control word ! % from whatever follows. ! % ! % For control letters, we have \definedummyletter, which omits the ! % space. ! % ! % These can be used both for control words that take an argument and ! % those that do not. If it is followed by {arg} in the input, then ! % that will dutifully get written to the index (or wherever). ! % ! \def\definedummyword##1{% ! \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}% ! }% ! \def\definedummyletter##1{% ! \expandafter\def\csname ##1\endcsname{\realbackslash ##1}% ! }% ! \let\definedummyaccent\definedummyletter % % Do the redefinitions. \commondummies } ! % For the aux file, @ is the escape character. So we want to redefine ! % everything using @ instead of \realbackslash. When everything uses ! % @, this will be simpler. % \def\atdummies{% \def\@{@@}% --- 3909,3958 ---- % we have to laboriously prevent expansion for those that we don't. % \def\indexdummies{% + \escapechar = `\\ % use backslash in output files. \def\@{@}% change to @@ when we switch to @ as escape char in index files. \def\ {\realbackslash\space }% + % % Need these in case \tex is in effect and \{ is a \delimiter again. % But can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. \let\{ = \mylbrace \let\} = \myrbrace % ! % I don't entirely understand this, but when an index entry is ! % generated from a macro call, the \endinput which \scanmacro inserts ! % causes processing to be prematurely terminated. This is, ! % apparently, because \indexsorttmp is fully expanded, and \endinput ! % is an expandable command. The redefinition below makes \endinput ! % disappear altogether for that purpose -- although logging shows that ! % processing continues to some further point. On the other hand, it ! % seems \endinput does not hurt in the printed index arg, since that ! % is still getting written without apparent harm. ! % ! % Sample source (mac-idx3.tex, reported by Graham Percival to ! % help-texinfo, 22may06): ! % @macro funindex {WORD} ! % @findex xyz ! % @end macro ! % ... ! % @funindex commtest ! % ! % The above is not enough to reproduce the bug, but it gives the flavor. ! % ! % Sample whatsit resulting: ! % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} ! % ! % So: ! \let\endinput = \empty % % Do the redefinitions. \commondummies } ! % For the aux and toc files, @ is the escape character. So we want to ! % redefine everything using @ as the escape character (instead of ! % \realbackslash, still used for index files). When everything uses @, ! % this will be simpler. % \def\atdummies{% \def\@{@@}% *************** *** 3164,3310 **** \let\{ = \lbraceatcmd \let\} = \rbraceatcmd % - % (See comments in \indexdummies.) - \def\definedummyword##1{% - \expandafter\def\csname ##1\endcsname{@##1\space}% - }% - \def\definedummyletter##1{% - \expandafter\def\csname ##1\endcsname{@##1}% - }% - \let\definedummyaccent\definedummyletter - % % Do the redefinitions. \commondummies } ! % Called from \indexdummies and \atdummies. \definedummyword and ! % \definedummyletter must be defined first. % \def\commondummies{% % ! \normalturnoffactive % \commondummiesnofonts % ! \definedummyletter{_}% % % Non-English letters. ! \definedummyword{AA}% ! \definedummyword{AE}% ! \definedummyword{L}% ! \definedummyword{OE}% ! \definedummyword{O}% ! \definedummyword{aa}% ! \definedummyword{ae}% ! \definedummyword{l}% ! \definedummyword{oe}% ! \definedummyword{o}% ! \definedummyword{ss}% ! \definedummyword{exclamdown}% ! \definedummyword{questiondown}% ! \definedummyword{ordf}% ! \definedummyword{ordm}% % % Although these internal commands shouldn't show up, sometimes they do. ! \definedummyword{bf}% ! \definedummyword{gtr}% ! \definedummyword{hat}% ! \definedummyword{less}% ! \definedummyword{sf}% ! \definedummyword{sl}% ! \definedummyword{tclose}% ! \definedummyword{tt}% % ! \definedummyword{LaTeX}% ! \definedummyword{TeX}% % % Assorted special characters. ! \definedummyword{bullet}% ! \definedummyword{comma}% ! \definedummyword{copyright}% ! \definedummyword{registeredsymbol}% ! \definedummyword{dots}% ! \definedummyword{enddots}% ! \definedummyword{equiv}% ! \definedummyword{error}% ! \definedummyword{euro}% ! \definedummyword{expansion}% ! \definedummyword{minus}% ! \definedummyword{pounds}% ! \definedummyword{point}% ! \definedummyword{print}% ! \definedummyword{result}% % % Handle some cases of @value -- where it does not contain any % (non-fully-expandable) commands. \makevalueexpandable - % - % Normal spaces, not active ones. - \unsepspaces - % - % No macro expansion. - \turnoffmacros } % \commondummiesnofonts: common to \commondummies and \indexnofonts. % ! % Better have this without active chars. ! { ! \catcode`\~=\other ! \gdef\commondummiesnofonts{% ! % Control letters and accents. ! \definedummyletter{!}% ! \definedummyaccent{"}% ! \definedummyaccent{'}% ! \definedummyletter{*}% ! \definedummyaccent{,}% ! \definedummyletter{.}% ! \definedummyletter{/}% ! \definedummyletter{:}% ! \definedummyaccent{=}% ! \definedummyletter{?}% ! \definedummyaccent{^}% ! \definedummyaccent{`}% ! \definedummyaccent{~}% ! \definedummyword{u}% ! \definedummyword{v}% ! \definedummyword{H}% ! \definedummyword{dotaccent}% ! \definedummyword{ringaccent}% ! \definedummyword{tieaccent}% ! \definedummyword{ubaraccent}% ! \definedummyword{udotaccent}% ! \definedummyword{dotless}% ! % ! % Texinfo font commands. ! \definedummyword{b}% ! \definedummyword{i}% ! \definedummyword{r}% ! \definedummyword{sc}% ! \definedummyword{t}% ! % ! % Commands that take arguments. ! \definedummyword{acronym}% ! \definedummyword{cite}% ! \definedummyword{code}% ! \definedummyword{command}% ! \definedummyword{dfn}% ! \definedummyword{emph}% ! \definedummyword{env}% ! \definedummyword{file}% ! \definedummyword{kbd}% ! \definedummyword{key}% ! \definedummyword{math}% ! \definedummyword{option}% ! \definedummyword{samp}% ! \definedummyword{strong}% ! \definedummyword{tie}% ! \definedummyword{uref}% ! \definedummyword{url}% ! \definedummyword{var}% ! \definedummyword{verb}% ! \definedummyword{w}% ! } } % \indexnofonts is used when outputting the strings to sort the index --- 3960,4121 ---- \let\{ = \lbraceatcmd \let\} = \rbraceatcmd % % Do the redefinitions. \commondummies + \otherbackslash } ! % Called from \indexdummies and \atdummies. % \def\commondummies{% % ! % \definedummyword defines \#1 as \string\#1\space, thus effectively ! % preventing its expansion. This is used only for control% words, ! % not control letters, because the \space would be incorrect for ! % control characters, but is needed to separate the control word ! % from whatever follows. ! % ! % For control letters, we have \definedummyletter, which omits the ! % space. ! % ! % These can be used both for control words that take an argument and ! % those that do not. If it is followed by {arg} in the input, then ! % that will dutifully get written to the index (or wherever). ! % ! \def\definedummyword ##1{\def##1{\string##1\space}}% ! \def\definedummyletter##1{\def##1{\string##1}}% ! \let\definedummyaccent\definedummyletter % \commondummiesnofonts % ! \definedummyletter\_% % % Non-English letters. ! \definedummyword\AA ! \definedummyword\AE ! \definedummyword\L ! \definedummyword\OE ! \definedummyword\O ! \definedummyword\aa ! \definedummyword\ae ! \definedummyword\l ! \definedummyword\oe ! \definedummyword\o ! \definedummyword\ss ! \definedummyword\exclamdown ! \definedummyword\questiondown ! \definedummyword\ordf ! \definedummyword\ordm % % Although these internal commands shouldn't show up, sometimes they do. ! \definedummyword\bf ! \definedummyword\gtr ! \definedummyword\hat ! \definedummyword\less ! \definedummyword\sf ! \definedummyword\sl ! \definedummyword\tclose ! \definedummyword\tt % ! \definedummyword\LaTeX ! \definedummyword\TeX % % Assorted special characters. ! \definedummyword\bullet ! \definedummyword\comma ! \definedummyword\copyright ! \definedummyword\registeredsymbol ! \definedummyword\dots ! \definedummyword\enddots ! \definedummyword\equiv ! \definedummyword\error ! \definedummyword\euro ! \definedummyword\guillemetleft ! \definedummyword\guillemetright ! \definedummyword\guilsinglleft ! \definedummyword\guilsinglright ! \definedummyword\expansion ! \definedummyword\minus ! \definedummyword\pounds ! \definedummyword\point ! \definedummyword\print ! \definedummyword\quotedblbase ! \definedummyword\quotedblleft ! \definedummyword\quotedblright ! \definedummyword\quoteleft ! \definedummyword\quoteright ! \definedummyword\quotesinglbase ! \definedummyword\result ! \definedummyword\textdegree ! % ! % We want to disable all macros so that they are not expanded by \write. ! \macrolist ! % ! \normalturnoffactive % % Handle some cases of @value -- where it does not contain any % (non-fully-expandable) commands. \makevalueexpandable } % \commondummiesnofonts: common to \commondummies and \indexnofonts. % ! \def\commondummiesnofonts{% ! % Control letters and accents. ! \definedummyletter\!% ! \definedummyaccent\"% ! \definedummyaccent\'% ! \definedummyletter\*% ! \definedummyaccent\,% ! \definedummyletter\.% ! \definedummyletter\/% ! \definedummyletter\:% ! \definedummyaccent\=% ! \definedummyletter\?% ! \definedummyaccent\^% ! \definedummyaccent\`% ! \definedummyaccent\~% ! \definedummyword\u ! \definedummyword\v ! \definedummyword\H ! \definedummyword\dotaccent ! \definedummyword\ringaccent ! \definedummyword\tieaccent ! \definedummyword\ubaraccent ! \definedummyword\udotaccent ! \definedummyword\dotless ! % ! % Texinfo font commands. ! \definedummyword\b ! \definedummyword\i ! \definedummyword\r ! \definedummyword\sc ! \definedummyword\t ! % ! % Commands that take arguments. ! \definedummyword\acronym ! \definedummyword\cite ! \definedummyword\code ! \definedummyword\command ! \definedummyword\dfn ! \definedummyword\emph ! \definedummyword\env ! \definedummyword\file ! \definedummyword\kbd ! \definedummyword\key ! \definedummyword\math ! \definedummyword\option ! \definedummyword\pxref ! \definedummyword\ref ! \definedummyword\samp ! \definedummyword\strong ! \definedummyword\tie ! \definedummyword\uref ! \definedummyword\url ! \definedummyword\var ! \definedummyword\verb ! \definedummyword\w ! \definedummyword\xref } % \indexnofonts is used when outputting the strings to sort the index *************** *** 3314,3326 **** % \def\indexnofonts{% % Accent commands should become @asis. ! \def\definedummyaccent##1{% ! \expandafter\let\csname ##1\endcsname\asis ! }% % We can just ignore other control letters. ! \def\definedummyletter##1{% ! \expandafter\def\csname ##1\endcsname{}% ! }% % Hopefully, all control words can become @asis. \let\definedummyword\definedummyaccent % --- 4125,4133 ---- % \def\indexnofonts{% % Accent commands should become @asis. ! \def\definedummyaccent##1{\let##1\asis}% % We can just ignore other control letters. ! \def\definedummyletter##1{\let##1\empty}% % Hopefully, all control words can become @asis. \let\definedummyword\definedummyaccent % *************** *** 3367,3381 **** \def\equiv{==}% \def\error{error}% \def\euro{euro}% \def\expansion{==>}% \def\minus{-}% \def\pounds{pounds}% \def\point{.}% \def\print{-|}% \def\result{=>}% % ! % Don't write macro names. ! \emptyusermacros } \let\indexbackslash=0 %overridden during \printindex. --- 4174,4208 ---- \def\equiv{==}% \def\error{error}% \def\euro{euro}% + \def\guillemetleft{<<}% + \def\guillemetright{>>}% + \def\guilsinglleft{<}% + \def\guilsinglright{>}% \def\expansion{==>}% \def\minus{-}% \def\pounds{pounds}% \def\point{.}% \def\print{-|}% + \def\quotedblbase{"}% + \def\quotedblleft{"}% + \def\quotedblright{"}% + \def\quoteleft{`}% + \def\quoteright{'}% + \def\quotesinglbase{,}% \def\result{=>}% + \def\textdegree{degrees}% % ! % We need to get rid of all macros, leaving only the arguments (if present). ! % Of course this is not nearly correct, but it is the best we can do for now. ! % makeinfo does not expand macros in the argument to @deffn, which ends up ! % writing an index entry, and texindex isn't prepared for an index sort entry ! % that starts with \. ! % ! % Since macro invocations are followed by braces, we can just redefine them ! % to take a single TeX argument. The case of a macro invocation that ! % goes to end-of-line is not handled. ! % ! \macrolist } \let\indexbackslash=0 %overridden during \printindex. *************** *** 3403,3413 **** % \edef\writeto{\csname#1indfile\endcsname}% % ! \ifvmode ! \dosubindsanitize ! \else ! \dosubindwrite ! \fi }% \fi } --- 4230,4236 ---- % \edef\writeto{\csname#1indfile\endcsname}% % ! \safewhatsit\dosubindwrite }% \fi } *************** *** 3422,3428 **** % % Remember, we are within a group. \indexdummies % Must do this here, since \bf, etc expand at this stage - \escapechar=`\\ \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now % so it will be output as is; and it will print as backslash. % --- 4245,4250 ---- *************** *** 3445,3457 **** \temp } ! % Take care of unwanted page breaks: % % If a skip is the last thing on the list now, preserve it % by backing up by \lastskip, doing the \write, then inserting % the skip again. Otherwise, the whatsit generated by the ! % \write will make \lastskip zero. The result is that sequences ! % like this: % @end defun % @tindex whatever % @defun ... --- 4267,4279 ---- \temp } ! % Take care of unwanted page breaks/skips around a whatsit: % % If a skip is the last thing on the list now, preserve it % by backing up by \lastskip, doing the \write, then inserting % the skip again. Otherwise, the whatsit generated by the ! % \write or \pdfdest will make \lastskip zero. The result is that ! % sequences like this: % @end defun % @tindex whatever % @defun ... *************** *** 3475,3499 **** % \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} % % ..., ready, GO: % ! \def\dosubindsanitize{% % \lastskip and \lastpenalty cannot both be nonzero simultaneously. ! \skip0 = \lastskip \edef\lastskipmacro{\the\lastskip}% ! \count255 = \lastpenalty % % If \lastskip is nonzero, that means the last item was a % skip. And since a skip is discardable, that means this ! % -\skip0 glue we're inserting is preceded by a % non-discardable item, therefore it is not a potential % breakpoint, therefore no \nobreak needed. \ifx\lastskipmacro\zeroskipmacro \else ! \vskip-\skip0 \fi % ! \dosubindwrite % \ifx\lastskipmacro\zeroskipmacro % If \lastskip was zero, perhaps the last item was a penalty, and --- 4297,4327 ---- % \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} % + \newskip\whatsitskip + \newcount\whatsitpenalty + % % ..., ready, GO: % ! \def\safewhatsit#1{% ! \ifhmode ! #1% ! \else % \lastskip and \lastpenalty cannot both be nonzero simultaneously. ! \whatsitskip = \lastskip \edef\lastskipmacro{\the\lastskip}% ! \whatsitpenalty = \lastpenalty % % If \lastskip is nonzero, that means the last item was a % skip. And since a skip is discardable, that means this ! % -\whatsitskip glue we're inserting is preceded by a % non-discardable item, therefore it is not a potential % breakpoint, therefore no \nobreak needed. \ifx\lastskipmacro\zeroskipmacro \else ! \vskip-\whatsitskip \fi % ! #1% % \ifx\lastskipmacro\zeroskipmacro % If \lastskip was zero, perhaps the last item was a penalty, and *************** *** 3507,3519 **** % Description. % would allow a break between the index-whatever whatsit % and the "Description." paragraph. ! \ifnum\count255>9999 \penalty\count255 \fi \else % On the other hand, if we had a nonzero \lastskip, % this make-up glue would be preceded by a non-discardable item % (the whatsit from the \write), so we must insert a \nobreak. ! \nobreak\vskip\skip0 \fi } % The index entry written in the file actually looks like --- 4335,4348 ---- % Description. % would allow a break between the index-whatever whatsit % and the "Description." paragraph. ! \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi \else % On the other hand, if we had a nonzero \lastskip, % this make-up glue would be preceded by a non-discardable item % (the whatsit from the \write), so we must insert a \nobreak. ! \nobreak\vskip\whatsitskip \fi + \fi } % The index entry written in the file actually looks like *************** *** 3556,3561 **** --- 4385,4391 ---- % \smallfonts \rm \tolerance = 9500 + \plainfrenchspacing \everypar = {}% don't want the \kern\-parindent from indentation suppression. % % See if the index file exists and is nonempty. *************** *** 3629,3635 **** % % A straightforward implementation would start like this: % \def\entry#1#2{... ! % But this frozes the catcodes in the argument, and can cause problems to % @code, which sets - active. This problem was fixed by a kludge--- % ``-'' was active throughout whole index, but this isn't really right. % --- 4459,4465 ---- % % A straightforward implementation would start like this: % \def\entry#1#2{... ! % But this freezes the catcodes in the argument, and can cause problems to % @code, which sets - active. This problem was fixed by a kludge--- % ``-'' was active throughout whole index, but this isn't really right. % *************** *** 3685,3695 **** % The following is kludged to not output a line of dots in the index if % there are no page numbers. The next person who breaks this will be % cursed by a Unix daemon. ! \def\tempa{{\rm }}% ! \def\tempb{#1}% ! \edef\tempc{\tempa}% ! \edef\tempd{\tempb}% ! \ifx\tempc\tempd \ % \else % --- 4515,4522 ---- % The following is kludged to not output a line of dots in the index if % there are no page numbers. The next person who breaks this will be % cursed by a Unix daemon. ! \setbox\boxA = \hbox{#1}% ! \ifdim\wd\boxA = 0pt \ % \else % *************** *** 3713,3721 **** \endgroup } ! % Like \dotfill except takes at least 1 em. \def\indexdotfill{\cleaders ! \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill} \def\primary #1{\line{#1\hfil}} --- 4540,4548 ---- \endgroup } ! % Like plain.tex's \dotfill, except uses up at least 1 em. \def\indexdotfill{\cleaders ! \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} \def\primary #1{\line{#1\hfil}} *************** *** 3825,3830 **** --- 4652,4685 ---- % % All done with double columns. \def\enddoublecolumns{% + % The following penalty ensures that the page builder is exercised + % _before_ we change the output routine. This is necessary in the + % following situation: + % + % The last section of the index consists only of a single entry. + % Before this section, \pagetotal is less than \pagegoal, so no + % break occurs before the last section starts. However, the last + % section, consisting of \initial and the single \entry, does not + % fit on the page and has to be broken off. Without the following + % penalty the page builder will not be exercised until \eject + % below, and by that time we'll already have changed the output + % routine to the \balancecolumns version, so the next-to-last + % double-column page will be processed with \balancecolumns, which + % is wrong: The two columns will go to the main vertical list, with + % the broken-off section in the recent contributions. As soon as + % the output routine finishes, TeX starts reconsidering the page + % break. The two columns and the broken-off section both fit on the + % page, because the two columns now take up only half of the page + % goal. When TeX sees \eject from below which follows the final + % section, it invokes the new output routine that we've set after + % \balancecolumns below; \onepageout will try to fit the two columns + % and the final section into the vbox of \pageheight (see + % \pagebody), causing an overfull box. + % + % Note that glue won't work here, because glue does not exercise the + % page builder, unlike penalties (see The TeXbook, pp. 280-281). + \penalty0 + % \output = {% % Split the last of the double-column material. Leave it on the % current page, no automatic page break. *************** *** 3934,3944 **** \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} ! % Each @chapter defines this as the name of the chapter. ! % page headings and footings can use it. @section does likewise. ! % However, they are not reliable, because we don't use marks. \def\thischapter{} \def\thissection{} \newcount\absseclevel % used to calculate proper heading level \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count --- 4789,4803 ---- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} ! % Each @chapter defines these (using marks) as the number+name, number ! % and name of the chapter. Page headings and footings can use ! % these. @section does likewise. \def\thischapter{} + \def\thischapternum{} + \def\thischaptername{} \def\thissection{} + \def\thissectionnum{} + \def\thissectionname{} \newcount\absseclevel % used to calculate proper heading level \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count *************** *** 4239,4245 **** \def\chapbreak{\dobreak \chapheadingskip {-4000}} \def\chappager{\par\vfill\supereject} ! \def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi} \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} --- 5098,5117 ---- \def\chapbreak{\dobreak \chapheadingskip {-4000}} \def\chappager{\par\vfill\supereject} ! % Because \domark is called before \chapoddpage, the filler page will ! % get the headings for the next chapter, which is wrong. But we don't ! % care -- we just disable all headings on the filler page. ! \def\chapoddpage{% ! \chappager ! \ifodd\pageno \else ! \begingroup ! \evenheadline={\hfil}\evenfootline={\hfil}% ! \oddheadline={\hfil}\oddfootline={\hfil}% ! \hbox to 0pt{}% ! \chappager ! \endgroup ! \fi ! } \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} *************** *** 4273,4313 **** \def\Yappendixkeyword{Yappendix} % \def\chapmacro#1#2#3{% \pchapsepmacro {% \chapfonts \rm % ! % Have to define \thissection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called % after \pchapsepmacro, or the headline will change too soon. ! \gdef\thissection{#1}% ! \gdef\thischaptername{#1}% % % Only insert the separating space if we have a chapter/appendix % number, and don't print the unnumbered ``number''. - \def\temptype{#2}% \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unnchap}% - \def\thischapter{#1}% \else\ifx\temptype\Yomitfromtockeyword \setbox0 = \hbox{}% contents like unnumbered, but no toc entry \def\toctype{omit}% - \xdef\thischapter{}% \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% \def\toctype{app}% - % We don't substitute the actual chapter name into \thischapter - % because we don't want its macros evaluated now. And we don't - % use \thissection because that changes with each section. - % - \xdef\thischapter{\putwordAppendix{} \appendixletter: - \noexpand\thischaptername}% \else \setbox0 = \hbox{#3\enspace}% \def\toctype{numchap}% - \xdef\thischapter{\putwordChapter{} \the\chapno: - \noexpand\thischaptername}% \fi\fi\fi % % Write the toc entry for this chapter. Must come before the --- 5145,5216 ---- \def\Yappendixkeyword{Yappendix} % \def\chapmacro#1#2#3{% + % Insert the first mark before the heading break (see notes for \domark). + \let\prevchapterdefs=\lastchapterdefs + \let\prevsectiondefs=\lastsectiondefs + \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% + \gdef\thissection{}}% + % + \def\temptype{#2}% + \ifx\temptype\Ynothingkeyword + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{\thischaptername}}% + \else\ifx\temptype\Yomitfromtockeyword + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{}}% + \else\ifx\temptype\Yappendixkeyword + \toks0={#1}% + \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\appendixletter}% + \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum: + \noexpand\thischaptername}% + }% + \else + \toks0={#1}% + \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\the\chapno}% + \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum: + \noexpand\thischaptername}% + }% + \fi\fi\fi + % + % Output the mark. Pass it through \safewhatsit, to take care of + % the preceding space. + \safewhatsit\domark + % + % Insert the chapter heading break. \pchapsepmacro + % + % Now the second mark, after the heading break. No break points + % between here and the heading. + \let\prevchapterdefs=\lastchapterdefs + \let\prevsectiondefs=\lastsectiondefs + \domark + % {% \chapfonts \rm % ! % Have to define \lastsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called % after \pchapsepmacro, or the headline will change too soon. ! \gdef\lastsection{#1}% % % Only insert the separating space if we have a chapter/appendix % number, and don't print the unnumbered ``number''. \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unnchap}% \else\ifx\temptype\Yomitfromtockeyword \setbox0 = \hbox{}% contents like unnumbered, but no toc entry \def\toctype{omit}% \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% \def\toctype{app}% \else \setbox0 = \hbox{#3\enspace}% \def\toctype{numchap}% \fi\fi\fi % % Write the toc entry for this chapter. Must come before the *************** *** 4323,4328 **** --- 5226,5232 ---- \donoderef{#2}% % % Typeset the actual heading. + \nobreak % Avoid page breaks at the interline glue. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% *************** *** 4385,4429 **** % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the % section number. % \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. \csname #2fonts\endcsname \rm % % Insert space above the heading. \csname #2headingbreak\endcsname % ! % Only insert the space after the number if we have a section number. ! \def\sectionlevel{#2}% ! \def\temptype{#3}% % \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unn}% ! \gdef\thissection{#1}% \else\ifx\temptype\Yomitfromtockeyword % for @headings -- no section number, don't include in toc, ! % and don't redefine \thissection. \setbox0 = \hbox{}% \def\toctype{omit}% \let\sectionlevel=\empty \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{#4\enspace}% \def\toctype{app}% ! \gdef\thissection{#1}% \else \setbox0 = \hbox{#4\enspace}% \def\toctype{num}% ! \gdef\thissection{#1}% \fi\fi\fi % ! % Write the toc entry (before \donoderef). See comments in \chfplain. \writetocentry{\toctype\sectionlevel}{#1}{#4}% % % Write the node reference (= pdf destination for pdftex). ! % Again, see comments in \chfplain. \donoderef{#3}% % % Output the actual section heading. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \hangindent=\wd0 % zero if no section number --- 5289,5383 ---- % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the % section number. % + \def\seckeyword{sec} + % \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. \csname #2fonts\endcsname \rm % + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + % Insert first mark before the heading break (see notes for \domark). + \let\prevsectiondefs=\lastsectiondefs + \ifx\temptype\Ynothingkeyword + \ifx\sectionlevel\seckeyword + \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% + \gdef\thissection{\thissectionname}}% + \fi + \else\ifx\temptype\Yomitfromtockeyword + % Don't redefine \thissection. + \else\ifx\temptype\Yappendixkeyword + \ifx\sectionlevel\seckeyword + \toks0={#1}% + \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% + \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + \noexpand\thissectionname}% + }% + \fi + \else + \ifx\sectionlevel\seckeyword + \toks0={#1}% + \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% + \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + \noexpand\thissectionname}% + }% + \fi + \fi\fi\fi + % + % Output the mark. Pass it through \safewhatsit, to take care of + % the preceding space. + \safewhatsit\domark + % % Insert space above the heading. \csname #2headingbreak\endcsname % ! % Now the second mark, after the heading break. No break points ! % between here and the heading. ! \let\prevsectiondefs=\lastsectiondefs ! \domark % + % Only insert the space after the number if we have a section number. \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unn}% ! \gdef\lastsection{#1}% \else\ifx\temptype\Yomitfromtockeyword % for @headings -- no section number, don't include in toc, ! % and don't redefine \lastsection. \setbox0 = \hbox{}% \def\toctype{omit}% \let\sectionlevel=\empty \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{#4\enspace}% \def\toctype{app}% ! \gdef\lastsection{#1}% \else \setbox0 = \hbox{#4\enspace}% \def\toctype{num}% ! \gdef\lastsection{#1}% \fi\fi\fi % ! % Write the toc entry (before \donoderef). See comments in \chapmacro. \writetocentry{\toctype\sectionlevel}{#1}{#4}% % % Write the node reference (= pdf destination for pdftex). ! % Again, see comments in \chapmacro. \donoderef{#3}% % + % Interline glue will be inserted when the vbox is completed. + % That glue will be a valid breakpoint for the page, since it'll be + % preceded by a whatsit (usually from the \donoderef, or from the + % \writetocentry if there was no node). We don't want to allow that + % break, since then the whatsits could end up on page n while the + % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. + \nobreak + % % Output the actual section heading. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \hangindent=\wd0 % zero if no section number *************** *** 4482,4492 **** \fi % \iflinks ! \toks0 = {#2}% ! \toks2 = \expandafter{\lastnode}% ! \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}% ! {\the\toks2}{\noexpand\folio}}}% ! \temp \fi \fi % --- 5436,5446 ---- \fi % \iflinks ! {\atdummies ! \edef\temp{% ! \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% ! \temp ! }% \fi \fi % *************** *** 4499,4504 **** --- 5453,5483 ---- \ifpdf \global\pdfmakepagedesttrue \fi } + + % These characters do not print properly in the Computer Modern roman + % fonts, so we must take special care. This is more or less redundant + % with the Texinfo input format setup at the end of this file. + % + \def\activecatcodes{% + \catcode`\"=\active + \catcode`\$=\active + \catcode`\<=\active + \catcode`\>=\active + \catcode`\\=\active + \catcode`\^=\active + \catcode`\_=\active + \catcode`\|=\active + \catcode`\~=\active + } + + + % Read the toc file, which is essentially Texinfo input. + \def\readtocfile{% + \setupdatafile + \activecatcodes + \input \tocreadfilename + } + \newskip\contentsrightmargin \contentsrightmargin=1in \newcount\savepageno \newcount\lastnegativepageno \lastnegativepageno = -1 *************** *** 4515,4543 **** % % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. - \def\thischapter{}% \chapmacro{#1}{Yomitfromtoc}{}% % \savepageno = \pageno \begingroup % Set up to handle contents files properly. ! \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 ! % We can't do this, because then an actual ^ in a section ! % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97. ! %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi ! \raggedbottom % Worry more about breakpoints than the bottom. \advance\hsize by -\contentsrightmargin % Don't use the full line length. % % Roman numerals for page numbers. \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi } % Normal (long) toc. \def\contents{% \startcontents{\putwordTOC}% ! \openin 1 \jobname.toc \ifeof 1 \else ! \input \jobname.toc \fi \vfill \eject \contentsalignmacro % in case @setchapternewpage odd is in effect --- 5494,5522 ---- % % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. \chapmacro{#1}{Yomitfromtoc}{}% % \savepageno = \pageno \begingroup % Set up to handle contents files properly. ! \raggedbottom % Worry more about breakpoints than the bottom. \advance\hsize by -\contentsrightmargin % Don't use the full line length. % % Roman numerals for page numbers. \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi } + % redefined for the two-volume lispref. We always output on + % \jobname.toc even if this is redefined. + % + \def\tocreadfilename{\jobname.toc} % Normal (long) toc. + % \def\contents{% \startcontents{\putwordTOC}% ! \openin 1 \tocreadfilename\space \ifeof 1 \else ! \readtocfile \fi \vfill \eject \contentsalignmacro % in case @setchapternewpage odd is in effect *************** *** 4573,4581 **** \let\numsubsubsecentry = \numsecentry \let\appsubsubsecentry = \numsecentry \let\unnsubsubsecentry = \numsecentry ! \openin 1 \jobname.toc \ifeof 1 \else ! \input \jobname.toc \fi \closein 1 \vfill \eject --- 5552,5560 ---- \let\numsubsubsecentry = \numsecentry \let\appsubsubsecentry = \numsecentry \let\unnsubsubsecentry = \numsecentry ! \openin 1 \tocreadfilename\space \ifeof 1 \else ! \readtocfile \fi \closein 1 \vfill \eject *************** *** 4700,4713 **** % @point{}, @result{}, @expansion{}, @print{}, @equiv{}. % ! % Since these characters are used in examples, it should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. % \def\point{$\star$} ! \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} ! \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}} \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} ! \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}} % The @error{} command. % Adapted from the TeXbook's \boxit. --- 5679,5693 ---- % @point{}, @result{}, @expansion{}, @print{}, @equiv{}. % ! % Since these characters are used in examples, they should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. % \def\point{$\star$} ! \def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} ! \def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} ! \def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} ! \def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} % The @error{} command. % Adapted from the TeXbook's \boxit. *************** *** 4717,4723 **** {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) ! \setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} % \setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. --- 5697,5703 ---- {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) ! \setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} % \setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. *************** *** 4765,4770 **** --- 5745,5752 ---- \let\/=\ptexslash \let\*=\ptexstar \let\t=\ptext + \expandafter \let\csname top\endcsname=\ptextop % outer + \let\frenchspacing=\plainfrenchspacing % \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% *************** *** 4810,4816 **** \let\afterenvbreak = \aboveenvbreak ! % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins. \let\nonarrowing=\relax % @cartouche ... @end cartouche: draw rectangle w/rounded corners around --- 5792,5799 ---- \let\afterenvbreak = \aboveenvbreak ! % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will ! % also clear it, so that its embedded environments do the narrowing again. \let\nonarrowing=\relax % @cartouche ... @end cartouche: draw rectangle w/rounded corners around *************** *** 4847,4853 **** % each corner char, and rule thickness \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % Flag to tell @lisp, etc., not to narrow margin. ! \let\nonarrowing=\comment \vbox\bgroup \baselineskip=0pt\parskip=0pt\lineskip=0pt \carttop --- 5830,5836 ---- % each corner char, and rule thickness \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % Flag to tell @lisp, etc., not to narrow margin. ! \let\nonarrowing = t% \vbox\bgroup \baselineskip=0pt\parskip=0pt\lineskip=0pt \carttop *************** *** 4887,4897 **** \parskip = 0pt \parindent = 0pt \emergencystretch = 0pt % don't try to avoid overfull boxes - % @cartouche defines \nonarrowing to inhibit narrowing - % at next level down. \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing \exdentamount=\lispnarrowing \fi \let\exdent=\nofillexdent } --- 5870,5880 ---- \parskip = 0pt \parindent = 0pt \emergencystretch = 0pt % don't try to avoid overfull boxes \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing \exdentamount=\lispnarrowing + \else + \let\nonarrowing = \relax \fi \let\exdent=\nofillexdent } *************** *** 4906,4917 **** --- 5889,5906 ---- \let\SETdispenvsize\relax \def\setnormaldispenv{% \ifx\SETdispenvsize\smallword + % end paragraph for sake of leading, in case document has no blank + % line. This is redundant with what happens in \aboveenvbreak, but + % we need to do it before changing the fonts, and it's inconvenient + % to change the fonts afterward. + \ifnum \lastpenalty=10000 \else \endgraf \fi \smallexamplefonts \rm \fi } \def\setsmalldispenv{% \ifx\SETdispenvsize\nosmallword \else + \ifnum \lastpenalty=10000 \else \endgraf \fi \smallexamplefonts \rm \fi } *************** *** 4938,4948 **** % \maketwodispenvs {lisp}{example}{% \nonfillstart ! \tt \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } - % @display/@smalldisplay: same as @lisp except keep current font. % \makedispenv {display}{% --- 5927,5936 ---- % \maketwodispenvs {lisp}{example}{% \nonfillstart ! \tt\quoteexpand \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } % @display/@smalldisplay: same as @lisp except keep current font. % \makedispenv {display}{% *************** *** 4991,4996 **** --- 5979,5985 ---- \advance\leftskip by \lispnarrowing \advance\rightskip by \lispnarrowing \exdentamount = \lispnarrowing + \else \let\nonarrowing = \relax \fi \parsearg\quotationlabel *************** *** 5069,5074 **** --- 6058,6091 ---- \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} + + % Allow an option to not replace quotes with a regular directed right + % quote/apostrophe (char 0x27), but instead use the undirected quote + % from cmtt (char 0x0d). The undirected quote is ugly, so don't make it + % the default, but it works for pasting with more pdf viewers (at least + % evince), the lilypond developers report. xpdf does work with the + % regular 0x27. + % + \def\codequoteright{% + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi + } + % + % and a similar option for the left quote char vs. a grave accent. + % Modern fonts display ASCII 0x60 as a grave accent, so some people like + % the code environments to do likewise. + % + \def\codequoteleft{% + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + `% + \else \char'22 \fi + \else \char'22 \fi + } + % \begingroup \catcode`\^^I=\active \gdef\tabexpand{% *************** *** 5081,5095 **** \wd0=\dimen0 \box0 \starttabbox }% } \endgroup \def\setupverbatim{% \nonfillstart - \advance\leftskip by -\defbodyindent % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% \catcode`\`=\active \tabexpand % Respect line breaks, % print special symbols as themselves, and % make each space count --- 6098,6122 ---- \wd0=\dimen0 \box0 \starttabbox }% } + \catcode`\'=\active + \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% + % + \catcode`\`=\active + \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% + % + \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% \endgroup + + % start the verbatim environment. \def\setupverbatim{% + \let\nonarrowing = t% \nonfillstart % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% \catcode`\`=\active \tabexpand + \quoteexpand % Respect line breaks, % print special symbols as themselves, and % make each space count *************** *** 5174,5200 **** \endgroup } \message{defuns,} % @defun etc. \newskip\defbodyindent \defbodyindent=.4in \newskip\defargsindent \defargsindent=50pt \newskip\deflastargmargin \deflastargmargin=18pt % Start the processing of @deffn: \def\startdefun{% \ifnum\lastpenalty<10000 \medbreak \else % If there are two @def commands in a row, we'll have a \nobreak, % which is there to keep the function description together with its % header. But if there's nothing but headers, we need to allow a % break somewhere. Check specifically for penalty 10002, inserted ! % by \defargscommonending, instead of 10000, since the sectioning % commands also insert a nobreak penalty, and we don't want to allow % a break between a section heading and a defun. ! % ! \ifnum\lastpenalty=10002 \penalty2000 \fi % % Similarly, after a section heading, do not allow a break. % But do insert the glue. --- 6201,6235 ---- \endgroup } + \message{defuns,} % @defun etc. \newskip\defbodyindent \defbodyindent=.4in \newskip\defargsindent \defargsindent=50pt \newskip\deflastargmargin \deflastargmargin=18pt + \newcount\defunpenalty % Start the processing of @deffn: \def\startdefun{% \ifnum\lastpenalty<10000 \medbreak + \defunpenalty=10003 % Will keep this @deffn together with the + % following @def command, see below. \else % If there are two @def commands in a row, we'll have a \nobreak, % which is there to keep the function description together with its % header. But if there's nothing but headers, we need to allow a % break somewhere. Check specifically for penalty 10002, inserted ! % by \printdefunline, instead of 10000, since the sectioning % commands also insert a nobreak penalty, and we don't want to allow % a break between a section heading and a defun. ! % ! % As a minor refinement, we avoid "club" headers by signalling ! % with penalty of 10003 after the very first @deffn in the ! % sequence (see above), and penalty of 10002 after any following ! % @def command. ! \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi % % Similarly, after a section heading, do not allow a break. % But do insert the glue. *************** *** 5212,5218 **** % % As above, allow line break if we have multiple x headers in a row. % It's not a great place, though. ! \ifnum\lastpenalty=10002 \penalty3000 \fi % % And now, it's time to reuse the body of the original defun: \expandafter\gobbledefun#1% --- 6247,6253 ---- % % As above, allow line break if we have multiple x headers in a row. % It's not a great place, though. ! \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi % % And now, it's time to reuse the body of the original defun: \expandafter\gobbledefun#1% *************** *** 5230,5236 **** \advance\rightskip by 0pt plus 1fil \endgraf \nobreak\vskip -\parskip ! \penalty 10002 % signal to \startdefun and \dodefunx % Some of the @defun-type tags do not enable magic parentheses, % rendering the following check redundant. But we don't optimize. \checkparencounts --- 6265,6271 ---- \advance\rightskip by 0pt plus 1fil \endgraf \nobreak\vskip -\parskip ! \penalty\defunpenalty % signal to \startdefun and \dodefunx % Some of the @defun-type tags do not enable magic parentheses, % rendering the following check redundant. But we don't optimize. \checkparencounts *************** *** 5240,5246 **** \def\Edefun{\endgraf\medbreak} % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; ! % the only thing remainnig is to define \deffnheader. % \def\makedefun#1{% \expandafter\let\csname E#1\endcsname = \Edefun --- 6275,6281 ---- \def\Edefun{\endgraf\medbreak} % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; ! % the only thing remaining is to define \deffnheader. % \def\makedefun#1{% \expandafter\let\csname E#1\endcsname = \Edefun *************** *** 5499,5510 **** \ifnum\parencount=0 \else \badparencount \fi \ifnum\brackcount=0 \else \badbrackcount \fi } \def\badparencount{% ! \errmessage{Unbalanced parentheses in @def}% \global\parencount=0 } \def\badbrackcount{% ! \errmessage{Unbalanced square braces in @def}% \global\brackcount=0 } --- 6534,6547 ---- \ifnum\parencount=0 \else \badparencount \fi \ifnum\brackcount=0 \else \badbrackcount \fi } + % these should not use \errmessage; the glibc manual, at least, actually + % has such constructs (when documenting function pointers). \def\badparencount{% ! \message{Warning: unbalanced parentheses in @def...}% \global\parencount=0 } \def\badbrackcount{% ! \message{Warning: unbalanced square brackets in @def...}% \global\brackcount=0 } *************** *** 5539,5545 **** \spaceisspace % % Append \endinput to make sure that TeX does not see the ending newline. - % % I've verified that it is necessary both for e-TeX and for ordinary TeX % --kasal, 29nov03 \scantokens{#1\endinput}% --- 6576,6581 ---- *************** *** 5554,5561 **** \newcount\paramno % Count of parameters \newtoks\macname % Macro name \newif\ifrecursive % Is it recursive? ! \def\macrolist{} % List of all defined macros in the form ! % \do\macro1\do\macro2... % Utility routines. % This does \let #1 = #2, with \csnames; that is, --- 6590,6608 ---- \newcount\paramno % Count of parameters \newtoks\macname % Macro name \newif\ifrecursive % Is it recursive? ! ! % List of all defined macros in the form ! % \definedummyword\macro1\definedummyword\macro2... ! % Currently is also contains all @aliases; the list can be split ! % if there is a need. ! \def\macrolist{} ! ! % Add the macro to \macrolist ! \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} ! \def\addtomacrolistxxx#1{% ! \toks0 = \expandafter{\macrolist\definedummyword#1}% ! \xdef\macrolist{\the\toks0}% ! } % Utility routines. % This does \let #1 = #2, with \csnames; that is, *************** *** 5589,5594 **** --- 6636,6645 ---- % all characters are catcode 10, 11 or 12, except \ which is active % (as in normal texinfo). It is necessary to change the definition of \. + % Non-ASCII encodings make 8-bit characters active, so un-activate + % them to avoid their expansion. Must do this non-globally, to + % confine the change to the current group. + % It's necessary to have hard CRs when the macro is executed. This is % done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. *************** *** 5603,5608 **** --- 6654,6660 ---- \catcode`\_=\other \catcode`\|=\other \catcode`\~=\other + \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi } \def\scanargctxt{% *************** *** 5653,5662 **** \else \errmessage{Macro name \the\macname\space already defined}\fi \global\cslet{macsave.\the\macname}{\the\macname}% \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% ! % Add the macroname to \macrolist ! \toks0 = \expandafter{\macrolist\do}% ! \xdef\macrolist{\the\toks0 ! \expandafter\noexpand\csname\the\macname\endcsname}% \fi \begingroup \macrobodyctxt \ifrecursive \expandafter\parsermacbody --- 6705,6711 ---- \else \errmessage{Macro name \the\macname\space already defined}\fi \global\cslet{macsave.\the\macname}{\the\macname}% \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% ! \addtomacrolist{\the\macname}% \fi \begingroup \macrobodyctxt \ifrecursive \expandafter\parsermacbody *************** *** 5670,5676 **** % Remove the macro name from \macrolist: \begingroup \expandafter\let\csname#1\endcsname \relax ! \let\do\unmacrodo \xdef\macrolist{\macrolist}% \endgroup \else --- 6719,6725 ---- % Remove the macro name from \macrolist: \begingroup \expandafter\let\csname#1\endcsname \relax ! \let\definedummyword\unmacrodo \xdef\macrolist{\macrolist}% \endgroup \else *************** *** 5682,5691 **** % macro definitions that have been changed to \relax. % \def\unmacrodo#1{% ! \ifx#1\relax % remove this \else ! \noexpand\do \noexpand #1% \fi } --- 6731,6740 ---- % macro definitions that have been changed to \relax. % \def\unmacrodo#1{% ! \ifx #1\relax % remove this \else ! \noexpand\definedummyword \noexpand#1% \fi } *************** *** 5798,5827 **** % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence % as an argument (by \parsebrace or \parsearg) ! \def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else \expandafter\parsearg ! \fi \next} ! ! % We want to disable all macros during \shipout so that they are not ! % expanded by \write. ! \def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}% ! \edef\next{\macrolist}\expandafter\endgroup\next} ! ! % For \indexnofonts, we need to get rid of all macros, leaving only the ! % arguments (if present). Of course this is not nearly correct, but it ! % is the best we can do for now. makeinfo does not expand macros in the ! % argument to @deffn, which ends up writing an index entry, and texindex ! % isn't prepared for an index sort entry that starts with \. ! % ! % Since macro invocations are followed by braces, we can just redefine them ! % to take a single TeX argument. The case of a macro invocation that ! % goes to end-of-line is not handled. ! % ! \def\emptyusermacros{\begingroup ! \def\do##1{\let\noexpand##1=\noexpand\asis}% ! \edef\next{\macrolist}\expandafter\endgroup\next} % @alias. --- 6847,6857 ---- % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence % as an argument (by \parsebrace or \parsearg) ! \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else \expandafter\parsearg ! \fi \macnamexxx} % @alias. *************** *** 5832,5837 **** --- 6862,6868 ---- \def\aliasyyy #1=#2\relax{% {% \expandafter\let\obeyedspace=\empty + \addtomacrolist{#1}% \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% }% \next *************** *** 5841,5847 **** \message{cross references,} \newwrite\auxfile - \newif\ifhavexrefs % True if xref values are known. \newif\ifwarnedxrefs % True if we warned once that they aren't known. --- 6872,6877 ---- *************** *** 5886,5892 **** % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an % anchor), which consists of three parts: ! % 1) NAME-title - the current sectioning name taken from \thissection, % or the anchor name. % 2) NAME-snt - section number and type, passed as the SNT arg, or % empty for anchors. --- 6916,6922 ---- % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an % anchor), which consists of three parts: ! % 1) NAME-title - the current sectioning name taken from \lastsection, % or the anchor name. % 2) NAME-snt - section number and type, passed as the SNT arg, or % empty for anchors. *************** *** 5901,5916 **** \iflinks {% \atdummies % preserve commands, but don't expand them - \turnoffactive - \otherbackslash \edef\writexrdef##1##2{% \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef ##1}{##2}}% these are parameters of \writexrdef }% ! \toks0 = \expandafter{\thissection}% \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. ! \writexrdef{pg}{\folio}% will be written later, during \shipout }% \fi } --- 6931,6944 ---- \iflinks {% \atdummies % preserve commands, but don't expand them \edef\writexrdef##1##2{% \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef ##1}{##2}}% these are parameters of \writexrdef }% ! \toks0 = \expandafter{\lastsection}% \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. ! \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout }% \fi } *************** *** 5954,5971 **** % % Make link in pdf output. \ifpdf ! \leavevmode ! \getfilename{#4}% ! {\turnoffactive \otherbackslash \ifnum\filenamelength>0 ! \startlink attr{/Border [0 0 0]}% ! goto file{\the\filename.pdf} name{#1}% \else ! \startlink attr{/Border [0 0 0]}% ! goto name{\pdfmkpgn{#1}}% \fi }% ! \linkcolor \fi % % Float references are printed completely differently: "Figure 1.2" --- 6982,7006 ---- % % Make link in pdf output. \ifpdf ! {\indexnofonts ! \turnoffactive ! % This expands tokens, so do it after making catcode changes, so _ ! % etc. don't get their TeX definitions. ! \getfilename{#4}% ! % ! % See comments at \activebackslashdouble. ! {\activebackslashdouble \xdef\pdfxrefdest{#1}% ! \backslashparens\pdfxrefdest}% ! % ! \leavevmode ! \startlink attr{/Border [0 0 0]}% \ifnum\filenamelength>0 ! goto file{\the\filename.pdf} name{\pdfxrefdest}% \else ! goto name{\pdfmkpgn{\pdfxrefdest}}% \fi }% ! \setcolor{\linkcolor}% \fi % % Float references are printed completely differently: "Figure 1.2" *************** *** 5976,5982 **** % include an _ in the xref name, etc. \indexnofonts \turnoffactive - \otherbackslash \expandafter\global\expandafter\let\expandafter\Xthisreftitle \csname XR#1-title\endcsname }% --- 7011,7016 ---- *************** *** 5984,5990 **** % If the user specified the print name (third arg) to the ref, % print it instead of our usual "Figure 1.2". \ifdim\wd0 = 0pt ! \refx{#1-snt}% \else \printedrefname \fi --- 7018,7024 ---- % If the user specified the print name (third arg) to the ref, % print it instead of our usual "Figure 1.2". \ifdim\wd0 = 0pt ! \refx{#1-snt}{}% \else \printedrefname \fi *************** *** 6004,6017 **** % is a loss. Therefore, we give the text of the node name again, so it % is as if TeX is seeing it for the first time. \ifdim \wd1 > 0pt ! \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% \else % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand % into the usual \leavevmode...\vrule stuff for purposes of % printing. So we \turnoffactive for the \refx-snt, back on for the % printing, back off for the \refx-pg. ! {\turnoffactive \otherbackslash % Only output a following space if the -snt ref is nonempty; for % @unnumbered and @anchor, it won't be. \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% --- 7038,7051 ---- % is a loss. Therefore, we give the text of the node name again, so it % is as if TeX is seeing it for the first time. \ifdim \wd1 > 0pt ! \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% \else % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand % into the usual \leavevmode...\vrule stuff for purposes of % printing. So we \turnoffactive for the \refx-snt, back on for the % printing, back off for the \refx-pg. ! {\turnoffactive % Only output a following space if the -snt ref is nonempty; for % @unnumbered and @anchor, it won't be. \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% *************** *** 6024,6030 **** ,\space % % output the `page 3'. ! \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}% \fi \fi \endlink --- 7058,7064 ---- ,\space % % output the `page 3'. ! \turnoffactive \putwordpage\tie\refx{#1-pg}{}% \fi \fi \endlink *************** *** 6100,6109 **** % collisions). But if this is a float type, we have more work to do. % \def\xrdef#1#2{% ! \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value. % % Was that xref control sequence that we just defined for a float? ! \expandafter\iffloat\csname XR#1\endcsname % it was a float, and we have the (safe) float type in \iffloattype. \expandafter\let\expandafter\floatlist \csname floatlist\iffloattype\endcsname --- 7134,7151 ---- % collisions). But if this is a float type, we have more work to do. % \def\xrdef#1#2{% ! {% The node name might contain 8-bit characters, which in our current ! % implementation are changed to commands like @'e. Don't let these ! % mess up the control sequence name. ! \indexnofonts ! \turnoffactive ! \xdef\safexrefname{#1}% ! }% ! % ! \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref % % Was that xref control sequence that we just defined for a float? ! \expandafter\iffloat\csname XR\safexrefname\endcsname % it was a float, and we have the (safe) float type in \iffloattype. \expandafter\let\expandafter\floatlist \csname floatlist\iffloattype\endcsname *************** *** 6118,6124 **** % % Remember this xref in the control sequence \floatlistFLOATTYPE, % for later use in \listoffloats. ! \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}% \fi } --- 7160,7167 ---- % % Remember this xref in the control sequence \floatlistFLOATTYPE, % for later use in \listoffloats. ! \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 ! {\safexrefname}}% \fi } *************** *** 6127,6139 **** \def\tryauxfile{% \openin 1 \jobname.aux \ifeof 1 \else ! \readauxfile \global\havexrefstrue \fi \closein 1 } ! \def\readauxfile{\begingroup \catcode`\^^@=\other \catcode`\^^A=\other \catcode`\^^B=\other --- 7170,7182 ---- \def\tryauxfile{% \openin 1 \jobname.aux \ifeof 1 \else ! \readdatafile{aux}% \global\havexrefstrue \fi \closein 1 } ! \def\setupdatafile{% \catcode`\^^@=\other \catcode`\^^A=\other \catcode`\^^B=\other *************** *** 6202,6212 **** % % Make the characters 128-255 be printing characters. {% ! \count 1=128 \def\loop{% ! \catcode\count 1=\other ! \advance\count 1 by 1 ! \ifnum \count 1<256 \loop \fi }% }% % --- 7245,7255 ---- % % Make the characters 128-255 be printing characters. {% ! \count1=128 \def\loop{% ! \catcode\count1=\other ! \advance\count1 by 1 ! \ifnum \count1<256 \loop \fi }% }% % *************** *** 6214,6221 **** \catcode`\{=1 \catcode`\}=2 \catcode`\@=0 ! % ! \input \jobname.aux \endgroup} --- 7257,7268 ---- \catcode`\{=1 \catcode`\}=2 \catcode`\@=0 ! } ! ! \def\readdatafile#1{% ! \begingroup ! \setupdatafile ! \input\jobname.#1 \endgroup} *************** *** 6301,6307 **** % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. ! % Similarily, if a @footnote appears inside an alignment, save the footnote % text to a box and make the \insert when a row of the table is finished. % And the same can be done for other insert classes. --kasal, 16nov03. --- 7348,7354 ---- % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. ! % Similarly, if a @footnote appears inside an alignment, save the footnote % text to a box and make the \insert when a row of the table is finished. % And the same can be done for other insert classes. --kasal, 16nov03. *************** *** 6405,6419 **** % If the image is by itself, center it. \ifvmode \imagevmodetrue ! \nobreak\bigskip % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space % above and below. \nobreak\vskip\parskip \nobreak - \line\bgroup\hss \fi % % Output the image. \ifpdf \dopdfimage{#1}{#2}{#3}% --- 7452,7470 ---- % If the image is by itself, center it. \ifvmode \imagevmodetrue ! \nobreak\medskip % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space % above and below. \nobreak\vskip\parskip \nobreak \fi % + % Leave vertical mode so that indentation from an enclosing + % environment such as @quotation is respected. On the other hand, if + % it's at the top level, we don't want the normal paragraph indentation. + \noindent + % % Output the image. \ifpdf \dopdfimage{#1}{#2}{#3}% *************** *** 6424,6430 **** \epsfbox{#1.eps}% \fi % ! \ifimagevmode \hss \egroup \bigbreak \fi % space after the image \endgroup} --- 7475,7481 ---- \epsfbox{#1.eps}% \fi % ! \ifimagevmode \medskip \fi % space after the standalone image \endgroup} *************** *** 6491,6503 **** \global\advance\floatno by 1 % {% ! % This magic value for \thissection is output by \setref as the % XREFLABEL-title value. \xrefX uses it to distinguish float % labels (which have a completely different output format) from % node and anchor labels. And \xrdef uses it to construct the % lists of floats. % ! \edef\thissection{\floatmagic=\safefloattype}% \setref{\floatlabel}{Yfloat}% }% \fi --- 7542,7554 ---- \global\advance\floatno by 1 % {% ! % This magic value for \lastsection is output by \setref as the % XREFLABEL-title value. \xrefX uses it to distinguish float % labels (which have a completely different output format) from % node and anchor labels. And \xrdef uses it to construct the % lists of floats. % ! \edef\lastsection{\floatmagic=\safefloattype}% \setref{\floatlabel}{Yfloat}% }% \fi *************** *** 6564,6570 **** % \floatlabel-lof. Besides \floatident, we include the short % caption if specified, else the full caption if specified, else nothing. {% ! \atdummies \turnoffactive \otherbackslash % since we read the caption text in the macro world, where ^^M % is turned into a normal character, we have to scan it back, so % we don't write the literal three characters "^^M" into the aux file. --- 7615,7622 ---- % \floatlabel-lof. Besides \floatident, we include the short % caption if specified, else the full caption if specified, else nothing. {% ! \atdummies ! % % since we read the caption text in the macro world, where ^^M % is turned into a normal character, we have to scan it back, so % we don't write the literal three characters "^^M" into the aux file. *************** *** 6585,6592 **** % % place the captured inserts % ! % BEWARE: when the floats start float, we have to issue warning whenever an ! % insert appears inside a float which could possibly float. --kasal, 26may04 % \checkinserts } --- 7637,7645 ---- % % place the captured inserts % ! % BEWARE: when the floats start floating, we have to issue warning ! % whenever an insert appears inside a float which could possibly ! % float. --kasal, 26may04 % \checkinserts } *************** *** 6630,6636 **** % #1 is the control sequence we are passed; we expand into a conditional % which is true if #1 represents a float ref. That is, the magic ! % \thissection value which we \setref above. % \def\iffloat#1{\expandafter\doiffloat#1==\finish} % --- 7683,7689 ---- % #1 is the control sequence we are passed; we expand into a conditional % which is true if #1 represents a float ref. That is, the magic ! % \lastsection value which we \setref above. % \def\iffloat#1{\expandafter\doiffloat#1==\finish} % *************** *** 6691,6729 **** \writeentry }} \message{localization,} - % and i18n. % @documentlanguage is usually given very early, just after % @setfilename. If done too late, it may not override everything ! % properly. Single argument is the language abbreviation. ! % It would be nice if we could set up a hyphenation file here. % ! \parseargdef\documentlanguage{% \tex % read txi-??.tex file in plain TeX. ! % Read the file if it exists. \openin 1 txi-#1.tex \ifeof 1 ! \errhelp = \nolanghelp ! \errmessage{Cannot read language file txi-#1.tex}% \else \input txi-#1.tex \fi \closein 1 \endgroup } \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? In the current directory should work if nowhere else does.} ! % @documentencoding should change something in TeX eventually, most ! % likely, but for now just recognize it. ! \let\documentencoding = \comment ! % Page size parameters. % \newdimen\defaultparindent \defaultparindent = 15pt \chapheadingskip = 15pt plus 4pt minus 2pt --- 7744,8614 ---- \writeentry }} + \message{localization,} % @documentlanguage is usually given very early, just after % @setfilename. If done too late, it may not override everything ! % properly. Single argument is the language (de) or locale (de_DE) ! % abbreviation. It would be nice if we could set up a hyphenation file. % ! { ! \catcode`\_ = \active ! \globaldefs=1 ! \parseargdef\documentlanguage{\begingroup ! \let_=\normalunderscore % normal _ character for filenames \tex % read txi-??.tex file in plain TeX. ! % Read the file by the name they passed if it exists. \openin 1 txi-#1.tex \ifeof 1 ! \documentlanguagetrywithoutunderscore{#1_\finish}% \else \input txi-#1.tex \fi \closein 1 \endgroup + \endgroup} + } + % + % If they passed de_DE, and txi-de_DE.tex doesn't exist, + % try txi-de.tex. + % + \def\documentlanguagetrywithoutunderscore#1_#2\finish{% + \openin 1 txi-#1.tex + \ifeof 1 + \errhelp = \nolanghelp + \errmessage{Cannot read language file txi-#1.tex}% + \else + \input txi-#1.tex + \fi + \closein 1 } + % \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? In the current directory should work if nowhere else does.} + % Set the catcode of characters 128 through 255 to the specified number. + % + \def\setnonasciicharscatcode#1{% + \count255=128 + \loop\ifnum\count255<256 + \global\catcode\count255=#1\relax + \advance\count255 by 1 + \repeat + } + + \def\setnonasciicharscatcodenonglobal#1{% + \count255=128 + \loop\ifnum\count255<256 + \catcode\count255=#1\relax + \advance\count255 by 1 + \repeat + } + + % @documentencoding sets the definition of non-ASCII characters + % according to the specified encoding. + % + \parseargdef\documentencoding{% + % Encoding being declared for the document. + \def\declaredencoding{\csname #1.enc\endcsname}% + % + % Supported encodings: names converted to tokens in order to be able + % to compare them with \ifx. + \def\ascii{\csname US-ASCII.enc\endcsname}% + \def\latnine{\csname ISO-8859-15.enc\endcsname}% + \def\latone{\csname ISO-8859-1.enc\endcsname}% + \def\lattwo{\csname ISO-8859-2.enc\endcsname}% + \def\utfeight{\csname UTF-8.enc\endcsname}% + % + \ifx \declaredencoding \ascii + \asciichardefs + % + \else \ifx \declaredencoding \lattwo + \setnonasciicharscatcode\active + \lattwochardefs + % + \else \ifx \declaredencoding \latone + \setnonasciicharscatcode\active + \latonechardefs + % + \else \ifx \declaredencoding \latnine + \setnonasciicharscatcode\active + \latninechardefs + % + \else \ifx \declaredencoding \utfeight + \setnonasciicharscatcode\active + \utfeightchardefs + % + \else + \message{Unknown document encoding #1, ignoring.}% + % + \fi % utfeight + \fi % latnine + \fi % latone + \fi % lattwo + \fi % ascii + } + + % A message to be logged when using a character that isn't available + % the default font encoding (OT1). + % + \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} + + % Take account of \c (plain) vs. \, (Texinfo) difference. + \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} + + % First, make active non-ASCII characters in order for them to be + % correctly categorized when TeX reads the replacement text of + % macros containing the character definitions. + \setnonasciicharscatcode\active + % + % Latin1 (ISO-8859-1) character definitions. + \def\latonechardefs{% + \gdef^^a0{~} + \gdef^^a1{\exclamdown} + \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a3{{\pounds}} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\missingcharmsg{YEN SIGN}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} + \gdef^^aa{\ordf} + \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^ac{$\lnot$} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} + \gdef^^af{\={}} + % + \gdef^^b0{\textdegree} + \gdef^^b1{$\pm$} + \gdef^^b2{$^2$} + \gdef^^b3{$^3$} + \gdef^^b4{\'{}} + \gdef^^b5{$\mu$} + \gdef^^b6{\P} + % + \gdef^^b7{$^.$} + \gdef^^b8{\cedilla\ } + \gdef^^b9{$^1$} + \gdef^^ba{\ordm} + % + \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^bc{$1\over4$} + \gdef^^bd{$1\over2$} + \gdef^^be{$3\over4$} + \gdef^^bf{\questiondown} + % + \gdef^^c0{\`A} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\~A} + \gdef^^c4{\"A} + \gdef^^c5{\ringaccent A} + \gdef^^c6{\AE} + \gdef^^c7{\cedilla C} + \gdef^^c8{\`E} + \gdef^^c9{\'E} + \gdef^^ca{\^E} + \gdef^^cb{\"E} + \gdef^^cc{\`I} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\"I} + % + \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} + \gdef^^d1{\~N} + \gdef^^d2{\`O} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\~O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\O} + \gdef^^d9{\`U} + \gdef^^da{\'U} + \gdef^^db{\^U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} + \gdef^^df{\ss} + % + \gdef^^e0{\`a} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\~a} + \gdef^^e4{\"a} + \gdef^^e5{\ringaccent a} + \gdef^^e6{\ae} + \gdef^^e7{\cedilla c} + \gdef^^e8{\`e} + \gdef^^e9{\'e} + \gdef^^ea{\^e} + \gdef^^eb{\"e} + \gdef^^ec{\`{\dotless i}} + \gdef^^ed{\'{\dotless i}} + \gdef^^ee{\^{\dotless i}} + \gdef^^ef{\"{\dotless i}} + % + \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} + \gdef^^f1{\~n} + \gdef^^f2{\`o} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\~o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\o} + \gdef^^f9{\`u} + \gdef^^fa{\'u} + \gdef^^fb{\^u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} + \gdef^^ff{\"y} + } + + % Latin9 (ISO-8859-15) encoding character definitions. + \def\latninechardefs{% + % Encoding is almost identical to Latin1. + \latonechardefs + % + \gdef^^a4{\euro} + \gdef^^a6{\v S} + \gdef^^a8{\v s} + \gdef^^b4{\v Z} + \gdef^^b8{\v z} + \gdef^^bc{\OE} + \gdef^^bd{\oe} + \gdef^^be{\"Y} + } + + % Latin2 (ISO-8859-2) character definitions. + \def\lattwochardefs{% + \gdef^^a0{~} + \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}} + \gdef^^a2{\u{}} + \gdef^^a3{\L} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\v L} + \gdef^^a6{\'S} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\v S} + \gdef^^aa{\cedilla S} + \gdef^^ab{\v T} + \gdef^^ac{\'Z} + \gdef^^ad{\-} + \gdef^^ae{\v Z} + \gdef^^af{\dotaccent Z} + % + \gdef^^b0{\textdegree} + \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}} + \gdef^^b2{\missingcharmsg{OGONEK}} + \gdef^^b3{\l} + \gdef^^b4{\'{}} + \gdef^^b5{\v l} + \gdef^^b6{\'s} + \gdef^^b7{\v{}} + \gdef^^b8{\cedilla\ } + \gdef^^b9{\v s} + \gdef^^ba{\cedilla s} + \gdef^^bb{\v t} + \gdef^^bc{\'z} + \gdef^^bd{\H{}} + \gdef^^be{\v z} + \gdef^^bf{\dotaccent z} + % + \gdef^^c0{\'R} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\u A} + \gdef^^c4{\"A} + \gdef^^c5{\'L} + \gdef^^c6{\'C} + \gdef^^c7{\cedilla C} + \gdef^^c8{\v C} + \gdef^^c9{\'E} + \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}} + \gdef^^cb{\"E} + \gdef^^cc{\v E} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\v D} + % + \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} + \gdef^^d1{\'N} + \gdef^^d2{\v N} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\H O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\v R} + \gdef^^d9{\ringaccent U} + \gdef^^da{\'U} + \gdef^^db{\H U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\cedilla T} + \gdef^^df{\ss} + % + \gdef^^e0{\'r} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\u a} + \gdef^^e4{\"a} + \gdef^^e5{\'l} + \gdef^^e6{\'c} + \gdef^^e7{\cedilla c} + \gdef^^e8{\v c} + \gdef^^e9{\'e} + \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}} + \gdef^^eb{\"e} + \gdef^^ec{\v e} + \gdef^^ed{\'\i} + \gdef^^ee{\^\i} + \gdef^^ef{\v d} + % + \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} + \gdef^^f1{\'n} + \gdef^^f2{\v n} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\H o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\v r} + \gdef^^f9{\ringaccent u} + \gdef^^fa{\'u} + \gdef^^fb{\H u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\cedilla t} + \gdef^^ff{\dotaccent{}} + } + + % UTF-8 character definitions. + % + % This code to support UTF-8 is based on LaTeX's utf8.def, with some + % changes for Texinfo conventions. It is included here under the GPL by + % permission from Frank Mittelbach and the LaTeX team. + % + \newcount\countUTFx + \newcount\countUTFy + \newcount\countUTFz + + \gdef\UTFviiiTwoOctets#1#2{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\endcsname} + % + \gdef\UTFviiiThreeOctets#1#2#3{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} + % + \gdef\UTFviiiFourOctets#1#2#3#4{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} + + \gdef\UTFviiiDefined#1{% + \ifx #1\relax + \message{\linenumber Unicode char \string #1 not defined for Texinfo}% + \else + \expandafter #1% + \fi + } + + \begingroup + \catcode`\~13 + \catcode`\"12 + + \def\UTFviiiLoop{% + \global\catcode\countUTFx\active + \uccode`\~\countUTFx + \uppercase\expandafter{\UTFviiiTmp}% + \advance\countUTFx by 1 + \ifnum\countUTFx < \countUTFy + \expandafter\UTFviiiLoop + \fi} ! \countUTFx = "C2 ! \countUTFy = "E0 ! \def\UTFviiiTmp{% ! \xdef~{\noexpand\UTFviiiTwoOctets\string~}} ! \UTFviiiLoop ! ! \countUTFx = "E0 ! \countUTFy = "F0 ! \def\UTFviiiTmp{% ! \xdef~{\noexpand\UTFviiiThreeOctets\string~}} ! \UTFviiiLoop ! ! \countUTFx = "F0 ! \countUTFy = "F4 ! \def\UTFviiiTmp{% ! \xdef~{\noexpand\UTFviiiFourOctets\string~}} ! \UTFviiiLoop ! \endgroup + \begingroup + \catcode`\"=12 + \catcode`\<=12 + \catcode`\.=12 + \catcode`\,=12 + \catcode`\;=12 + \catcode`\!=12 + \catcode`\~=13 + + \gdef\DeclareUnicodeCharacter#1#2{% + \countUTFz = "#1\relax + \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% + \begingroup + \parseXMLCharref + \def\UTFviiiTwoOctets##1##2{% + \csname u8:##1\string ##2\endcsname}% + \def\UTFviiiThreeOctets##1##2##3{% + \csname u8:##1\string ##2\string ##3\endcsname}% + \def\UTFviiiFourOctets##1##2##3##4{% + \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter + \gdef\UTFviiiTmp{#2}% + \endgroup} ! \gdef\parseXMLCharref{% ! \ifnum\countUTFz < "A0\relax ! \errhelp = \EMsimple ! \errmessage{Cannot define Unicode char value < 00A0}% ! \else\ifnum\countUTFz < "800\relax ! \parseUTFviiiA,% ! \parseUTFviiiB C\UTFviiiTwoOctets.,% ! \else\ifnum\countUTFz < "10000\relax ! \parseUTFviiiA;% ! \parseUTFviiiA,% ! \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% ! \else ! \parseUTFviiiA;% ! \parseUTFviiiA,% ! \parseUTFviiiA!% ! \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% ! \fi\fi\fi ! } ! ! \gdef\parseUTFviiiA#1{% ! \countUTFx = \countUTFz ! \divide\countUTFz by 64 ! \countUTFy = \countUTFz ! \multiply\countUTFz by 64 ! \advance\countUTFx by -\countUTFz ! \advance\countUTFx by 128 ! \uccode `#1\countUTFx ! \countUTFz = \countUTFy} ! ! \gdef\parseUTFviiiB#1#2#3#4{% ! \advance\countUTFz by "#10\relax ! \uccode `#3\countUTFz ! \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} ! \endgroup ! ! \def\utfeightchardefs{% ! \DeclareUnicodeCharacter{00A0}{\tie} ! \DeclareUnicodeCharacter{00A1}{\exclamdown} ! \DeclareUnicodeCharacter{00A3}{\pounds} ! \DeclareUnicodeCharacter{00A8}{\"{ }} ! \DeclareUnicodeCharacter{00A9}{\copyright} ! \DeclareUnicodeCharacter{00AA}{\ordf} ! \DeclareUnicodeCharacter{00AB}{\guillemetleft} ! \DeclareUnicodeCharacter{00AD}{\-} ! \DeclareUnicodeCharacter{00AE}{\registeredsymbol} ! \DeclareUnicodeCharacter{00AF}{\={ }} ! ! \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} ! \DeclareUnicodeCharacter{00B4}{\'{ }} ! \DeclareUnicodeCharacter{00B8}{\cedilla{ }} ! \DeclareUnicodeCharacter{00BA}{\ordm} ! \DeclareUnicodeCharacter{00BB}{\guillemetright} ! \DeclareUnicodeCharacter{00BF}{\questiondown} ! ! \DeclareUnicodeCharacter{00C0}{\`A} ! \DeclareUnicodeCharacter{00C1}{\'A} ! \DeclareUnicodeCharacter{00C2}{\^A} ! \DeclareUnicodeCharacter{00C3}{\~A} ! \DeclareUnicodeCharacter{00C4}{\"A} ! \DeclareUnicodeCharacter{00C5}{\AA} ! \DeclareUnicodeCharacter{00C6}{\AE} ! \DeclareUnicodeCharacter{00C7}{\cedilla{C}} ! \DeclareUnicodeCharacter{00C8}{\`E} ! \DeclareUnicodeCharacter{00C9}{\'E} ! \DeclareUnicodeCharacter{00CA}{\^E} ! \DeclareUnicodeCharacter{00CB}{\"E} ! \DeclareUnicodeCharacter{00CC}{\`I} ! \DeclareUnicodeCharacter{00CD}{\'I} ! \DeclareUnicodeCharacter{00CE}{\^I} ! \DeclareUnicodeCharacter{00CF}{\"I} ! ! \DeclareUnicodeCharacter{00D1}{\~N} ! \DeclareUnicodeCharacter{00D2}{\`O} ! \DeclareUnicodeCharacter{00D3}{\'O} ! \DeclareUnicodeCharacter{00D4}{\^O} ! \DeclareUnicodeCharacter{00D5}{\~O} ! \DeclareUnicodeCharacter{00D6}{\"O} ! \DeclareUnicodeCharacter{00D8}{\O} ! \DeclareUnicodeCharacter{00D9}{\`U} ! \DeclareUnicodeCharacter{00DA}{\'U} ! \DeclareUnicodeCharacter{00DB}{\^U} ! \DeclareUnicodeCharacter{00DC}{\"U} ! \DeclareUnicodeCharacter{00DD}{\'Y} ! \DeclareUnicodeCharacter{00DF}{\ss} ! ! \DeclareUnicodeCharacter{00E0}{\`a} ! \DeclareUnicodeCharacter{00E1}{\'a} ! \DeclareUnicodeCharacter{00E2}{\^a} ! \DeclareUnicodeCharacter{00E3}{\~a} ! \DeclareUnicodeCharacter{00E4}{\"a} ! \DeclareUnicodeCharacter{00E5}{\aa} ! \DeclareUnicodeCharacter{00E6}{\ae} ! \DeclareUnicodeCharacter{00E7}{\cedilla{c}} ! \DeclareUnicodeCharacter{00E8}{\`e} ! \DeclareUnicodeCharacter{00E9}{\'e} ! \DeclareUnicodeCharacter{00EA}{\^e} ! \DeclareUnicodeCharacter{00EB}{\"e} ! \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} ! \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} ! \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} ! \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} ! ! \DeclareUnicodeCharacter{00F1}{\~n} ! \DeclareUnicodeCharacter{00F2}{\`o} ! \DeclareUnicodeCharacter{00F3}{\'o} ! \DeclareUnicodeCharacter{00F4}{\^o} ! \DeclareUnicodeCharacter{00F5}{\~o} ! \DeclareUnicodeCharacter{00F6}{\"o} ! \DeclareUnicodeCharacter{00F8}{\o} ! \DeclareUnicodeCharacter{00F9}{\`u} ! \DeclareUnicodeCharacter{00FA}{\'u} ! \DeclareUnicodeCharacter{00FB}{\^u} ! \DeclareUnicodeCharacter{00FC}{\"u} ! \DeclareUnicodeCharacter{00FD}{\'y} ! \DeclareUnicodeCharacter{00FF}{\"y} ! ! \DeclareUnicodeCharacter{0100}{\=A} ! \DeclareUnicodeCharacter{0101}{\=a} ! \DeclareUnicodeCharacter{0102}{\u{A}} ! \DeclareUnicodeCharacter{0103}{\u{a}} ! \DeclareUnicodeCharacter{0106}{\'C} ! \DeclareUnicodeCharacter{0107}{\'c} ! \DeclareUnicodeCharacter{0108}{\^C} ! \DeclareUnicodeCharacter{0109}{\^c} ! \DeclareUnicodeCharacter{010A}{\dotaccent{C}} ! \DeclareUnicodeCharacter{010B}{\dotaccent{c}} ! \DeclareUnicodeCharacter{010C}{\v{C}} ! \DeclareUnicodeCharacter{010D}{\v{c}} ! \DeclareUnicodeCharacter{010E}{\v{D}} ! ! \DeclareUnicodeCharacter{0112}{\=E} ! \DeclareUnicodeCharacter{0113}{\=e} ! \DeclareUnicodeCharacter{0114}{\u{E}} ! \DeclareUnicodeCharacter{0115}{\u{e}} ! \DeclareUnicodeCharacter{0116}{\dotaccent{E}} ! \DeclareUnicodeCharacter{0117}{\dotaccent{e}} ! \DeclareUnicodeCharacter{011A}{\v{E}} ! \DeclareUnicodeCharacter{011B}{\v{e}} ! \DeclareUnicodeCharacter{011C}{\^G} ! \DeclareUnicodeCharacter{011D}{\^g} ! \DeclareUnicodeCharacter{011E}{\u{G}} ! \DeclareUnicodeCharacter{011F}{\u{g}} ! ! \DeclareUnicodeCharacter{0120}{\dotaccent{G}} ! \DeclareUnicodeCharacter{0121}{\dotaccent{g}} ! \DeclareUnicodeCharacter{0124}{\^H} ! \DeclareUnicodeCharacter{0125}{\^h} ! \DeclareUnicodeCharacter{0128}{\~I} ! \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} ! \DeclareUnicodeCharacter{012A}{\=I} ! \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} ! \DeclareUnicodeCharacter{012C}{\u{I}} ! \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} ! ! \DeclareUnicodeCharacter{0130}{\dotaccent{I}} ! \DeclareUnicodeCharacter{0131}{\dotless{i}} ! \DeclareUnicodeCharacter{0132}{IJ} ! \DeclareUnicodeCharacter{0133}{ij} ! \DeclareUnicodeCharacter{0134}{\^J} ! \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} ! \DeclareUnicodeCharacter{0139}{\'L} ! \DeclareUnicodeCharacter{013A}{\'l} ! ! \DeclareUnicodeCharacter{0141}{\L} ! \DeclareUnicodeCharacter{0142}{\l} ! \DeclareUnicodeCharacter{0143}{\'N} ! \DeclareUnicodeCharacter{0144}{\'n} ! \DeclareUnicodeCharacter{0147}{\v{N}} ! \DeclareUnicodeCharacter{0148}{\v{n}} ! \DeclareUnicodeCharacter{014C}{\=O} ! \DeclareUnicodeCharacter{014D}{\=o} ! \DeclareUnicodeCharacter{014E}{\u{O}} ! \DeclareUnicodeCharacter{014F}{\u{o}} ! ! \DeclareUnicodeCharacter{0150}{\H{O}} ! \DeclareUnicodeCharacter{0151}{\H{o}} ! \DeclareUnicodeCharacter{0152}{\OE} ! \DeclareUnicodeCharacter{0153}{\oe} ! \DeclareUnicodeCharacter{0154}{\'R} ! \DeclareUnicodeCharacter{0155}{\'r} ! \DeclareUnicodeCharacter{0158}{\v{R}} ! \DeclareUnicodeCharacter{0159}{\v{r}} ! \DeclareUnicodeCharacter{015A}{\'S} ! \DeclareUnicodeCharacter{015B}{\'s} ! \DeclareUnicodeCharacter{015C}{\^S} ! \DeclareUnicodeCharacter{015D}{\^s} ! \DeclareUnicodeCharacter{015E}{\cedilla{S}} ! \DeclareUnicodeCharacter{015F}{\cedilla{s}} ! ! \DeclareUnicodeCharacter{0160}{\v{S}} ! \DeclareUnicodeCharacter{0161}{\v{s}} ! \DeclareUnicodeCharacter{0162}{\cedilla{t}} ! \DeclareUnicodeCharacter{0163}{\cedilla{T}} ! \DeclareUnicodeCharacter{0164}{\v{T}} ! ! \DeclareUnicodeCharacter{0168}{\~U} ! \DeclareUnicodeCharacter{0169}{\~u} ! \DeclareUnicodeCharacter{016A}{\=U} ! \DeclareUnicodeCharacter{016B}{\=u} ! \DeclareUnicodeCharacter{016C}{\u{U}} ! \DeclareUnicodeCharacter{016D}{\u{u}} ! \DeclareUnicodeCharacter{016E}{\ringaccent{U}} ! \DeclareUnicodeCharacter{016F}{\ringaccent{u}} ! ! \DeclareUnicodeCharacter{0170}{\H{U}} ! \DeclareUnicodeCharacter{0171}{\H{u}} ! \DeclareUnicodeCharacter{0174}{\^W} ! \DeclareUnicodeCharacter{0175}{\^w} ! \DeclareUnicodeCharacter{0176}{\^Y} ! \DeclareUnicodeCharacter{0177}{\^y} ! \DeclareUnicodeCharacter{0178}{\"Y} ! \DeclareUnicodeCharacter{0179}{\'Z} ! \DeclareUnicodeCharacter{017A}{\'z} ! \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} ! \DeclareUnicodeCharacter{017C}{\dotaccent{z}} ! \DeclareUnicodeCharacter{017D}{\v{Z}} ! \DeclareUnicodeCharacter{017E}{\v{z}} ! ! \DeclareUnicodeCharacter{01C4}{D\v{Z}} ! \DeclareUnicodeCharacter{01C5}{D\v{z}} ! \DeclareUnicodeCharacter{01C6}{d\v{z}} ! \DeclareUnicodeCharacter{01C7}{LJ} ! \DeclareUnicodeCharacter{01C8}{Lj} ! \DeclareUnicodeCharacter{01C9}{lj} ! \DeclareUnicodeCharacter{01CA}{NJ} ! \DeclareUnicodeCharacter{01CB}{Nj} ! \DeclareUnicodeCharacter{01CC}{nj} ! \DeclareUnicodeCharacter{01CD}{\v{A}} ! \DeclareUnicodeCharacter{01CE}{\v{a}} ! \DeclareUnicodeCharacter{01CF}{\v{I}} ! ! \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} ! \DeclareUnicodeCharacter{01D1}{\v{O}} ! \DeclareUnicodeCharacter{01D2}{\v{o}} ! \DeclareUnicodeCharacter{01D3}{\v{U}} ! \DeclareUnicodeCharacter{01D4}{\v{u}} ! ! \DeclareUnicodeCharacter{01E2}{\={\AE}} ! \DeclareUnicodeCharacter{01E3}{\={\ae}} ! \DeclareUnicodeCharacter{01E6}{\v{G}} ! \DeclareUnicodeCharacter{01E7}{\v{g}} ! \DeclareUnicodeCharacter{01E8}{\v{K}} ! \DeclareUnicodeCharacter{01E9}{\v{k}} ! ! \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} ! \DeclareUnicodeCharacter{01F1}{DZ} ! \DeclareUnicodeCharacter{01F2}{Dz} ! \DeclareUnicodeCharacter{01F3}{dz} ! \DeclareUnicodeCharacter{01F4}{\'G} ! \DeclareUnicodeCharacter{01F5}{\'g} ! \DeclareUnicodeCharacter{01F8}{\`N} ! \DeclareUnicodeCharacter{01F9}{\`n} ! \DeclareUnicodeCharacter{01FC}{\'{\AE}} ! \DeclareUnicodeCharacter{01FD}{\'{\ae}} ! \DeclareUnicodeCharacter{01FE}{\'{\O}} ! \DeclareUnicodeCharacter{01FF}{\'{\o}} ! ! \DeclareUnicodeCharacter{021E}{\v{H}} ! \DeclareUnicodeCharacter{021F}{\v{h}} ! ! \DeclareUnicodeCharacter{0226}{\dotaccent{A}} ! \DeclareUnicodeCharacter{0227}{\dotaccent{a}} ! \DeclareUnicodeCharacter{0228}{\cedilla{E}} ! \DeclareUnicodeCharacter{0229}{\cedilla{e}} ! \DeclareUnicodeCharacter{022E}{\dotaccent{O}} ! \DeclareUnicodeCharacter{022F}{\dotaccent{o}} ! ! \DeclareUnicodeCharacter{0232}{\=Y} ! \DeclareUnicodeCharacter{0233}{\=y} ! \DeclareUnicodeCharacter{0237}{\dotless{j}} ! ! \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} ! \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} ! \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} ! \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} ! \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} ! \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} ! \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} ! \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} ! \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} ! \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} ! \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} ! \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} ! ! \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} ! \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} ! ! \DeclareUnicodeCharacter{1E20}{\=G} ! \DeclareUnicodeCharacter{1E21}{\=g} ! \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} ! \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} ! \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} ! \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} ! \DeclareUnicodeCharacter{1E26}{\"H} ! \DeclareUnicodeCharacter{1E27}{\"h} ! ! \DeclareUnicodeCharacter{1E30}{\'K} ! \DeclareUnicodeCharacter{1E31}{\'k} ! \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} ! \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} ! \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} ! \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} ! \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} ! \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} ! \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} ! \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} ! \DeclareUnicodeCharacter{1E3E}{\'M} ! \DeclareUnicodeCharacter{1E3F}{\'m} ! ! \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} ! \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} ! \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} ! \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} ! \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} ! \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} ! \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} ! \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} ! \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} ! \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} ! ! \DeclareUnicodeCharacter{1E54}{\'P} ! \DeclareUnicodeCharacter{1E55}{\'p} ! \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} ! \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} ! \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} ! \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} ! \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} ! \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} ! \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} ! \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} ! ! \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} ! \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} ! \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} ! \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} ! \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} ! \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} ! \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} ! \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} ! \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} ! \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} ! ! \DeclareUnicodeCharacter{1E7C}{\~V} ! \DeclareUnicodeCharacter{1E7D}{\~v} ! \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} ! \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} ! ! \DeclareUnicodeCharacter{1E80}{\`W} ! \DeclareUnicodeCharacter{1E81}{\`w} ! \DeclareUnicodeCharacter{1E82}{\'W} ! \DeclareUnicodeCharacter{1E83}{\'w} ! \DeclareUnicodeCharacter{1E84}{\"W} ! \DeclareUnicodeCharacter{1E85}{\"w} ! \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} ! \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} ! \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} ! \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} ! \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} ! \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} ! \DeclareUnicodeCharacter{1E8C}{\"X} ! \DeclareUnicodeCharacter{1E8D}{\"x} ! \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} ! \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} ! ! \DeclareUnicodeCharacter{1E90}{\^Z} ! \DeclareUnicodeCharacter{1E91}{\^z} ! \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} ! \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} ! \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} ! \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} ! \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} ! \DeclareUnicodeCharacter{1E97}{\"t} ! \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} ! \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} ! ! \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} ! \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} ! ! \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} ! \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} ! \DeclareUnicodeCharacter{1EBC}{\~E} ! \DeclareUnicodeCharacter{1EBD}{\~e} ! ! \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} ! \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} ! \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} ! \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} ! ! \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} ! \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} ! ! \DeclareUnicodeCharacter{1EF2}{\`Y} ! \DeclareUnicodeCharacter{1EF3}{\`y} ! \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} ! ! \DeclareUnicodeCharacter{1EF8}{\~Y} ! \DeclareUnicodeCharacter{1EF9}{\~y} ! ! \DeclareUnicodeCharacter{2013}{--} ! \DeclareUnicodeCharacter{2014}{---} ! \DeclareUnicodeCharacter{2018}{\quoteleft} ! \DeclareUnicodeCharacter{2019}{\quoteright} ! \DeclareUnicodeCharacter{201A}{\quotesinglbase} ! \DeclareUnicodeCharacter{201C}{\quotedblleft} ! \DeclareUnicodeCharacter{201D}{\quotedblright} ! \DeclareUnicodeCharacter{201E}{\quotedblbase} ! \DeclareUnicodeCharacter{2022}{\bullet} ! \DeclareUnicodeCharacter{2026}{\dots} ! \DeclareUnicodeCharacter{2039}{\guilsinglleft} ! \DeclareUnicodeCharacter{203A}{\guilsinglright} ! \DeclareUnicodeCharacter{20AC}{\euro} ! ! \DeclareUnicodeCharacter{2192}{\expansion} ! \DeclareUnicodeCharacter{21D2}{\result} ! ! \DeclareUnicodeCharacter{2212}{\minus} ! \DeclareUnicodeCharacter{2217}{\point} ! \DeclareUnicodeCharacter{2261}{\equiv} ! }% end of \utfeightchardefs ! ! ! % US-ASCII character definitions. ! \def\asciichardefs{% nothing need be done ! \relax ! } ! ! % Make non-ASCII characters printable again for compatibility with ! % existing Texinfo documents that may use them, even without declaring a ! % document encoding. % + \setnonasciicharscatcode \other + + + \message{formatting,} + \newdimen\defaultparindent \defaultparindent = 15pt \chapheadingskip = 15pt plus 4pt minus 2pt *************** *** 6736,6742 **** % Don't be so finicky about underfull hboxes, either. \hbadness = 2000 ! % Following George Bush, just get rid of widows and orphans. \widowpenalty=10000 \clubpenalty=10000 --- 8621,8627 ---- % Don't be so finicky about underfull hboxes, either. \hbadness = 2000 ! % Following George Bush, get rid of widows and orphans. \widowpenalty=10000 \clubpenalty=10000 *************** *** 6754,6762 **** \fi } ! % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; ! % 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8) ! % physical page width. % % We also call \setleading{\textleading}, so the caller should define % \textleading. The caller should also set \parskip. --- 8639,8647 ---- \fi } ! % Parameters in order: 1) textheight; 2) textwidth; ! % 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; ! % 7) physical page height; 8) physical page width. % % We also call \setleading{\textleading}, so the caller should define % \textleading. The caller should also set \parskip. *************** *** 6783,6788 **** --- 8668,8677 ---- \ifpdf \pdfpageheight #7\relax \pdfpagewidth #8\relax + % if we don't reset these, they will remain at "1 true in" of + % whatever layout pdftex was dumped with. + \pdfhorigin = 1 true in + \pdfvorigin = 1 true in \fi % \setleading{\textleading} *************** *** 6797,6815 **** \textleading = 13.2pt % % If page is nothing but text, make it come out even. ! \internalpagesizes{46\baselineskip}{6in}% {\voffset}{.25in}% {\bindingoffset}{36pt}% {11in}{8.5in}% }} ! % Use @smallbook to reset parameters for 7x9.5 (or so) format. \def\smallbook{{\globaldefs = 1 \parskip = 2pt plus 1pt \textleading = 12pt % \internalpagesizes{7.5in}{5in}% ! {\voffset}{.25in}% {\bindingoffset}{16pt}% {9.25in}{7in}% % --- 8686,8704 ---- \textleading = 13.2pt % % If page is nothing but text, make it come out even. ! \internalpagesizes{607.2pt}{6in}% that's 46 lines {\voffset}{.25in}% {\bindingoffset}{36pt}% {11in}{8.5in}% }} ! % Use @smallbook to reset parameters for 7x9.25 trim size. \def\smallbook{{\globaldefs = 1 \parskip = 2pt plus 1pt \textleading = 12pt % \internalpagesizes{7.5in}{5in}% ! {-.2in}{0in}% {\bindingoffset}{16pt}% {9.25in}{7in}% % *************** *** 6820,6825 **** --- 8709,8732 ---- \defbodyindent = .5cm }} + % Use @smallerbook to reset parameters for 6x9 trim size. + % (Just testing, parameters still in flux.) + \def\smallerbook{{\globaldefs = 1 + \parskip = 1.5pt plus 1pt + \textleading = 12pt + % + \internalpagesizes{7.4in}{4.8in}% + {-.2in}{-.4in}% + {0pt}{14pt}% + {9in}{6in}% + % + \lispnarrowing = 0.25in + \tolerance = 700 + \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = .4cm + }} + % Use @afourpaper to print on European A4 paper. \def\afourpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt *************** *** 6835,6841 **** % \global\normaloffset = -6mm % \global\bindingoffset = 10mm % @end tex ! \internalpagesizes{51\baselineskip}{160mm} {\voffset}{\hoffset}% {\bindingoffset}{44pt}% {297mm}{210mm}% --- 8742,8748 ---- % \global\normaloffset = -6mm % \global\bindingoffset = 10mm % @end tex ! \internalpagesizes{673.2pt}{160mm}% that's 51 lines {\voffset}{\hoffset}% {\bindingoffset}{44pt}% {297mm}{210mm}% *************** *** 6900,6906 **** \parskip = 3pt plus 2pt minus 1pt \setleading{\textleading}% % ! \dimen0 = #1 \advance\dimen0 by \voffset % \dimen2 = \hsize --- 8807,8813 ---- \parskip = 3pt plus 2pt minus 1pt \setleading{\textleading}% % ! \dimen0 = #1\relax \advance\dimen0 by \voffset % \dimen2 = \hsize *************** *** 6972,6977 **** --- 8879,8885 ---- \catcode`\_=\active \def_{\ifusingtt\normalunderscore\_} + \let\realunder=_ % Subroutine for the previous macro. \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } *************** *** 6994,6999 **** --- 8902,8914 ---- % \otherifyactive is called near the end of this file. \def\otherifyactive{\catcode`+=\other \catcode`\_=\other} + % Used sometimes to turn off (effectively) the active characters even after + % parsing them. + \def\turnoffactive{% + \normalturnoffactive + \otherbackslash + } + \catcode`\@=0 % \backslashcurfont outputs one backslash character in current font, *************** *** 7001,7027 **** \global\chardef\backslashcurfont=`\\ \global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work % \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with % catcode other. ! {\catcode`\\=\active ! @gdef@rawbackslash{@let\=@backslashcurfont} ! @gdef@otherbackslash{@let\=@realbackslash} ! } ! ! % \realbackslash is an actual character `\' with catcode other. ! {\catcode`\\=\other @gdef@realbackslash{\}} ! ! % \normalbackslash outputs one backslash in fixed width font. ! \def\normalbackslash{{\tt\backslashcurfont}} ! ! \catcode`\\=\active ! % Used sometimes to turn off (effectively) the active characters ! % even after parsing them. ! @def@turnoffactive{% @let"=@normaldoublequote - @let\=@realbackslash @let~=@normaltilde @let^=@normalcaret @let_=@normalunderscore --- 8916,8944 ---- \global\chardef\backslashcurfont=`\\ \global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work + % \realbackslash is an actual character `\' with catcode other, and + % \doublebackslash is two of them (for the pdf outlines). + {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} + + % In texinfo, backslash is an active character; it prints the backslash + % in fixed width font. + \catcode`\\=\active + @def@normalbackslash{{@tt@backslashcurfont}} + % On startup, @fixbackslash assigns: + % @let \ = @normalbackslash + % \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with % catcode other. ! @gdef@rawbackslash{@let\=@backslashcurfont} ! @gdef@otherbackslash{@let\=@realbackslash} ! % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of ! % the literal character `\'. ! % ! @def@normalturnoffactive{% ! @let\=@normalbackslash @let"=@normaldoublequote @let~=@normaltilde @let^=@normalcaret @let_=@normalunderscore *************** *** 7033,7044 **** @unsepspaces } - % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of - % the literal character `\'. (Thus, \ is not expandable when this is in - % effect.) - % - @def@normalturnoffactive{@turnoffactive @let\=@normalbackslash} - % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. @otherifyactive --- 8950,8955 ---- *************** *** 7051,7059 **** @global@let\ = @eatinput % On the other hand, perhaps the file did not have a `\input texinfo'. Then ! % the first `\{ in the file would cause an error. This macro tries to fix % that, assuming it is called before the first `\' could plausibly occur. ! % Also back turn on active characters that might appear in the input % file name, in case not using a pre-dumped format. % @gdef@fixbackslash{% --- 8962,8970 ---- @global@let\ = @eatinput % On the other hand, perhaps the file did not have a `\input texinfo'. Then ! % the first `\' in the file would cause an error. This macro tries to fix % that, assuming it is called before the first `\' could plausibly occur. ! % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. % @gdef@fixbackslash{% diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/vectors.texi gsl-1.14/doc/vectors.texi *** gsl-1.13/doc/vectors.texi Mon Jun 29 12:30:17 2009 --- gsl-1.14/doc/vectors.texi Wed Mar 10 10:57:13 2010 *************** *** 1359,1365 **** @cindex diagonal, of a matrix @deftypefun gsl_vector_view gsl_matrix_diagonal (gsl_matrix * @var{m}) @deftypefunx {gsl_vector_const_view} gsl_matrix_const_diagonal (const gsl_matrix * @var{m}) ! These functions returns a vector view of the diagonal of the matrix @var{m}. The matrix @var{m} is not required to be square. For a rectangular matrix the length of the diagonal is the same as the smaller dimension of the matrix. --- 1359,1365 ---- @cindex diagonal, of a matrix @deftypefun gsl_vector_view gsl_matrix_diagonal (gsl_matrix * @var{m}) @deftypefunx {gsl_vector_const_view} gsl_matrix_const_diagonal (const gsl_matrix * @var{m}) ! These functions return a vector view of the diagonal of the matrix @var{m}. The matrix @var{m} is not required to be square. For a rectangular matrix the length of the diagonal is the same as the smaller dimension of the matrix. *************** *** 1668,1674 **** model of C++. A description of this model can be found in the following reference, ! @itemize @asis @item B. Stroustrup, @cite{The C++ Programming Language} (3rd Ed), --- 1668,1674 ---- model of C++. A description of this model can be found in the following reference, ! @itemize @w{} @item B. Stroustrup, @cite{The C++ Programming Language} (3rd Ed), diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/doc/version.texi gsl-1.14/doc/version.texi *** gsl-1.13/doc/version.texi Tue Sep 8 10:33:45 2009 --- gsl-1.14/doc/version.texi Wed Mar 10 12:53:19 2010 *************** *** 1,4 **** ! @set UPDATED 25 August 2009 ! @set UPDATED-MONTH August 2009 ! @set EDITION 1.13 ! @set VERSION 1.13 --- 1,4 ---- ! @set UPDATED 10 March 2010 ! @set UPDATED-MONTH March 2010 ! @set EDITION 1.14 ! @set VERSION 1.14 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/eigen/ChangeLog gsl-1.14/eigen/ChangeLog *** gsl-1.13/eigen/ChangeLog Thu Jul 9 20:24:38 2009 --- gsl-1.14/eigen/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,8 ---- + 2009-11-26 Brian Gough + + * qrstep.c (qrstep): handle the case where |mu| >> |d0| + |sd0| to + prevent infinite loop + 2009-07-09 Brian Gough * symmv.c (gsl_eigen_symmv_free): handle NULL argument in free diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/eigen/Makefile.in gsl-1.14/eigen/Makefile.in *** gsl-1.13/eigen/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/eigen/Makefile.in Wed Mar 10 10:58:18 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 64,71 **** ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la \ ../sort/libgslsort.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 64,72 ---- ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la \ ../sort/libgslsort.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 113,123 **** --- 114,126 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 131,136 **** --- 134,141 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 190,196 **** --- 195,203 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 255,263 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps eigen/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps eigen/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 262,270 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu eigen/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu eigen/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 306,319 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 313,356 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/francis.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genherm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genhermv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gensymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gensymmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hermv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jacobi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonsymm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonsymmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schur.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symmv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 555,560 **** --- 592,598 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 600,605 **** --- 638,644 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/eigen/TODO gsl-1.14/eigen/TODO *** gsl-1.13/eigen/TODO Wed Nov 19 09:13:46 2008 --- gsl-1.14/eigen/TODO Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,5 ---- + * Merge improvements from SVD qrstep to eigen - these should be + combined somehow as we only need one version of them. * dlae2.f has better handling of 2x2 eigenvalues than our qrstep.c diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/eigen/qrstep.c gsl-1.14/eigen/qrstep.c *** gsl-1.13/eigen/qrstep.c Wed Nov 19 09:13:46 2008 --- gsl-1.14/eigen/qrstep.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* eigen/qrstep.c * ! * Copyright (C) 2007 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* eigen/qrstep.c * ! * Copyright (C) 2007, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 104,109 **** --- 104,119 ---- double mu = trailing_eigenvalue (n, d, sd); + /* If mu is large relative to d_0 and sd_0 then the Givens rotation + will have no effect, leading to an infinite loop. + + We set mu to zero in this case, which at least diagonalises the + submatrix [d_0, sd_0 ; sd_0, d_0] and allows further progress. */ + + if (GSL_DBL_EPSILON * fabs(mu) > (fabs(d[0]) + fabs(sd[0]))) { + mu = 0; + } + x = d[0] - mu; z = sd[0]; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/err/Makefile.in gsl-1.14/err/Makefile.in *** gsl-1.13/err/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/err/Makefile.in Wed Mar 10 10:58:18 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 56,63 **** test_DEPENDENCIES = libgslerr.la ../test/libgsltest.la \ ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 56,64 ---- test_DEPENDENCIES = libgslerr.la ../test/libgsltest.la \ ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 105,115 **** --- 106,118 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 123,128 **** --- 126,133 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 182,188 **** --- 187,195 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 245,253 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps err/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps err/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 252,260 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu err/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu err/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 296,309 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 303,334 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 545,550 **** --- 570,576 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 590,595 **** --- 616,622 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/fft/Makefile.in gsl-1.14/fft/Makefile.in *** gsl-1.13/fft/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/fft/Makefile.in Wed Mar 10 10:58:18 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps fft/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps fft/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fft/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu fft/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,336 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dft.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 572,578 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 618,624 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/fit/Makefile.in gsl-1.14/fit/Makefile.in *** gsl-1.13/fit/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/fit/Makefile.in Wed Mar 10 10:58:19 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 247,255 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps fit/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps fit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 254,262 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fit/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu fit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 298,311 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 305,333 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 547,552 **** --- 569,575 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 592,597 **** --- 615,621 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/gsl/Makefile.in gsl-1.14/gsl/Makefile.in *** gsl-1.13/gsl/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/gsl/Makefile.in Wed Mar 10 10:58:19 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 43,50 **** CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = - depcomp = - am__depfiles_maybe = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- 43,48 ---- *************** *** 56,66 **** --- 54,66 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 74,79 **** --- 74,81 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 133,139 **** --- 135,143 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 189,197 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps gsl/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps gsl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 193,201 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gsl/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu gsl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/gsl_version.h gsl-1.14/gsl_version.h *** gsl-1.13/gsl_version.h Tue Sep 8 10:33:38 2009 --- gsl-1.14/gsl_version.h Wed Mar 10 12:51:54 2010 *************** *** 15,21 **** __BEGIN_DECLS ! #define GSL_VERSION "1.13" GSL_VAR const char * gsl_version; --- 15,23 ---- __BEGIN_DECLS ! #define GSL_VERSION "1.14" ! #define GSL_MAJOR_VERSION 1 ! #define GSL_MINOR_VERSION 14 GSL_VAR const char * gsl_version; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/gsl_version.h.in gsl-1.14/gsl_version.h.in *** gsl-1.13/gsl_version.h.in Wed Nov 19 09:13:46 2008 --- gsl-1.14/gsl_version.h.in Wed Mar 10 10:57:13 2010 *************** *** 16,21 **** --- 16,23 ---- #define GSL_VERSION "@VERSION@" + #define GSL_MAJOR_VERSION @GSL_MAJOR_VERSION@ + #define GSL_MINOR_VERSION @GSL_MINOR_VERSION@ GSL_VAR const char * gsl_version; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/histogram/Makefile.in gsl-1.14/histogram/Makefile.in *** gsl-1.13/histogram/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/histogram/Makefile.in Wed Mar 10 10:58:19 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 63,70 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 63,71 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 112,122 **** --- 113,125 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 130,135 **** --- 133,140 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 189,195 **** --- 194,202 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 256,264 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps histogram/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps histogram/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 263,271 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu histogram/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu histogram/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 307,320 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 314,371 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calloc_range.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calloc_range2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxval.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxval2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oper2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/params.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/params2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat2d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test1d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test1d_resample.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test1d_trap.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test2d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test2d_resample.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test2d_trap.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 557,562 **** --- 608,614 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 602,607 **** --- 654,660 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/histogram/stat.c gsl-1.14/histogram/stat.c *** gsl-1.13/histogram/stat.c Wed Nov 19 09:13:46 2008 --- gsl-1.14/histogram/stat.c Wed Mar 10 10:57:13 2010 *************** *** 80,87 **** long double wmean = 0; long double W = 0; ! /* FIXME: should use a single pass formula here, as given in ! N.J.Higham 'Accuracy and Stability of Numerical Methods', p.12 */ /* Compute the mean */ --- 80,88 ---- long double wmean = 0; long double W = 0; ! /* Use a two-pass algorithm for stability. Could also use a single ! pass formula, as given in N.J.Higham 'Accuracy and Stability of ! Numerical Methods', p.12 */ /* Compute the mean */ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/ieee-utils/Makefile.in gsl-1.14/ieee-utils/Makefile.in *** gsl-1.13/ieee-utils/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/ieee-utils/Makefile.in Wed Mar 10 10:58:20 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** test_DEPENDENCIES = libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- test_DEPENDENCIES = libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps ieee-utils/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps ieee-utils/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ieee-utils/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu ieee-utils/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,338 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_rep.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 574,580 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 620,626 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/install-sh gsl-1.14/install-sh *** gsl-1.13/install-sh Tue Feb 5 13:22:10 2008 --- gsl-1.14/install-sh Wed Mar 10 10:57:13 2010 *************** *** 1,7 **** ! #! /bin/sh ! # # install - install a program, script, or datafile ! # This comes from X11R5. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it --- 1,38 ---- ! #!/bin/sh # install - install a program, script, or datafile ! ! scriptversion=2009-04-28.21; # UTC ! ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. ! # ! # Copyright (C) 1994 X Consortium ! # ! # Permission is hereby granted, free of charge, to any person obtaining a copy ! # of this software and associated documentation files (the "Software"), to ! # deal in the Software without restriction, including without limitation the ! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ! # sell copies of the Software, and to permit persons to whom the Software is ! # furnished to do so, subject to the following conditions: ! # ! # The above copyright notice and this permission notice shall be included in ! # all copies or substantial portions of the Software. ! # ! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. ! # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it *************** *** 9,238 **** # # This script is compatible with the BSD install script, but was written # from scratch. - # # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. ! doit="${DOITPROG-}" ! # put in absolute paths if you don't have them in your path; or use env. vars. ! mvprog="${MVPROG-mv}" ! cpprog="${CPPROG-cp}" ! chmodprog="${CHMODPROG-chmod}" ! chownprog="${CHOWNPROG-chown}" ! chgrpprog="${CHGRPPROG-chgrp}" ! stripprog="${STRIPPROG-strip}" ! rmprog="${RMPROG-rm}" ! mkdirprog="${MKDIRPROG-mkdir}" ! ! transformbasename="" ! transform_arg="" ! instcmd="$mvprog" ! chmodcmd="$chmodprog 0755" ! chowncmd="" ! chgrpcmd="" ! stripcmd="" rmcmd="$rmprog -f" ! mvcmd="$mvprog" ! src="" ! dst="" ! dir_arg="" ! ! while [ x"$1" != x ]; do ! case $1 in ! -c) instcmd="$cpprog" ! shift ! continue;; ! ! -d) dir_arg=true ! shift ! continue;; ! ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! ! -o) chowncmd="$chownprog $2" ! shift ! shift ! continue;; ! ! -g) chgrpcmd="$chgrpprog $2" ! shift ! shift ! continue;; ! ! -s) stripcmd="$stripprog" ! shift ! continue;; ! ! -t=*) transformarg=`echo $1 | sed 's/-t=//'` ! shift ! continue;; ! ! -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ! shift ! continue;; ! *) if [ x"$src" = x ] ! then ! src=$1 ! else ! # this colon is to work around a 386BSD /bin/sh bug ! : ! dst=$1 ! fi ! shift ! continue;; ! esac ! done ! if [ x"$src" = x ] ! then ! echo "install: no input file specified" ! exit 1 ! else ! true ! fi ! if [ x"$dir_arg" != x ]; then ! dst=$src ! src="" ! ! if [ -d $dst ]; then ! instcmd=: ! else ! instcmd=mkdir ! fi ! else ! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! ! if [ -f $src -o -d $src ] ! then ! true ! else ! echo "install: $src does not exist" ! exit 1 ! fi ! ! if [ x"$dst" = x ] ! then ! echo "install: no destination specified" ! exit 1 ! else ! true ! fi ! # If destination is a directory, append the input filename; if your system ! # does not like double slashes in filenames, you may need to add some logic ! if [ -d $dst ] ! then ! dst="$dst"/`basename $src` ! else ! true ! fi ! fi ! ## this sed command emulates the dirname command ! dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ! # Make sure that the destination directory exists. ! # this part is taken from Noah Friedman's mkinstalldirs script ! # Skip lots of stat calls in the usual case. ! if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' ! IFS="${IFS-${defaultIFS}}" ! oIFS="${IFS}" ! # Some sh's can't handle IFS=/ for some reason. ! IFS='%' ! set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` ! IFS="${oIFS}" ! ! pathcomp='' ! ! while [ $# -ne 0 ] ; do ! pathcomp="${pathcomp}${1}" ! shift ! ! if [ ! -d "${pathcomp}" ] ; ! then ! $mkdirprog "${pathcomp}" ! else ! true ! fi ! pathcomp="${pathcomp}/" ! done ! fi ! if [ x"$dir_arg" != x ] ! then ! $doit $instcmd $dst && ! ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi ! else ! # If we're going to rename the final executable, determine the name now. ! if [ x"$transformarg" = x ] ! then ! dstfile=`basename $dst` ! else ! dstfile=`basename $dst $transformbasename | ! sed $transformarg`$transformbasename ! fi ! # don't allow the sed command to completely eliminate the filename ! if [ x"$dstfile" = x ] ! then ! dstfile=`basename $dst` ! else ! true ! fi ! # Make a temp file name in the proper directory. ! dsttmp=$dstdir/#inst.$$# ! # Move or copy the file name to the temp name ! $doit $instcmd $src $dsttmp && ! trap "rm -f ${dsttmp}" 0 && ! # and set any options; do chmod last to preserve setuid bits ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && ! # Now rename the file to the real destination. ! $doit $rmcmd -f $dstdir/$dstfile && ! $doit $mvcmd $dsttmp $dstdir/$dstfile ! fi && ! exit 0 --- 40,520 ---- # # This script is compatible with the BSD install script, but was written # from scratch. + nl=' + ' + IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. ! doit=${DOITPROG-} ! if test -z "$doit"; then ! doit_exec=exec ! else ! doit_exec=$doit ! fi ! ! # Put in absolute file names if you don't have them in your path; ! # or use environment vars. ! ! chgrpprog=${CHGRPPROG-chgrp} ! chmodprog=${CHMODPROG-chmod} ! chownprog=${CHOWNPROG-chown} ! cmpprog=${CMPPROG-cmp} ! cpprog=${CPPROG-cp} ! mkdirprog=${MKDIRPROG-mkdir} ! mvprog=${MVPROG-mv} ! rmprog=${RMPROG-rm} ! stripprog=${STRIPPROG-strip} ! ! posix_glob='?' ! initialize_posix_glob=' ! test "$posix_glob" != "?" || { ! if (set -f) 2>/dev/null; then ! posix_glob= ! else ! posix_glob=: ! fi ! } ! ' + posix_mkdir= ! # Desired mode of installed file. ! mode=0755 ! chgrpcmd= ! chmodcmd=$chmodprog ! chowncmd= ! mvcmd=$mvprog rmcmd="$rmprog -f" ! stripcmd= ! src= ! dst= ! dir_arg= ! dst_arg= ! copy_on_change=false ! no_target_directory= ! usage="\ ! Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ! or: $0 [OPTION]... SRCFILES... DIRECTORY ! or: $0 [OPTION]... -t DIRECTORY SRCFILES... ! or: $0 [OPTION]... -d DIRECTORIES... ! In the 1st form, copy SRCFILE to DSTFILE. ! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ! In the 4th, create DIRECTORIES. ! Options: ! --help display this help and exit. ! --version display version info and exit. ! -c (ignored) ! -C install only if different (preserve the last data modification time) ! -d create directories instead of installing files. ! -g GROUP $chgrpprog installed files to GROUP. ! -m MODE $chmodprog installed files to MODE. ! -o USER $chownprog installed files to USER. ! -s $stripprog installed files. ! -t DIRECTORY install into DIRECTORY. ! -T report an error if DSTFILE is a directory. ! Environment variables override the default commands: ! CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ! RMPROG STRIPPROG ! " ! while test $# -ne 0; do ! case $1 in ! -c) ;; ! -C) copy_on_change=true;; ! -d) dir_arg=true;; ! -g) chgrpcmd="$chgrpprog $2" ! shift;; ! --help) echo "$usage"; exit $?;; ! -m) mode=$2 ! case $mode in ! *' '* | *' '* | *' ! '* | *'*'* | *'?'* | *'['*) ! echo "$0: invalid mode: $mode" >&2 ! exit 1;; ! esac ! shift;; ! -o) chowncmd="$chownprog $2" ! shift;; ! -s) stripcmd=$stripprog;; ! -t) dst_arg=$2 ! shift;; ! ! -T) no_target_directory=true;; ! ! --version) echo "$0 $scriptversion"; exit $?;; ! ! --) shift ! break;; ! -*) echo "$0: invalid option: $1" >&2 ! exit 1;; ! *) break;; ! esac ! shift ! done ! ! if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ! # When -d is used, all remaining arguments are directories to create. ! # When -t is used, the destination is already specified. ! # Otherwise, the last argument is the destination. Remove it from $@. ! for arg ! do ! if test -n "$dst_arg"; then ! # $@ is not empty: it contains at least $arg. ! set fnord "$@" "$dst_arg" ! shift # fnord ! fi ! shift # arg ! dst_arg=$arg ! done ! fi ! if test $# -eq 0; then ! if test -z "$dir_arg"; then ! echo "$0: no input file specified." >&2 ! exit 1 ! fi ! # It's OK to call `install-sh -d' without argument. ! # This can happen when creating conditional directories. ! exit 0 ! fi ! if test -z "$dir_arg"; then ! trap '(exit $?); exit' 1 2 13 15 ! # Set umask so as not to create temps with too-generous modes. ! # However, 'strip' requires both read and write access to temps. ! case $mode in ! # Optimize common cases. ! *644) cp_umask=133;; ! *755) cp_umask=22;; ! ! *[0-7]) ! if test -z "$stripcmd"; then ! u_plus_rw= ! else ! u_plus_rw='% 200' ! fi ! cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ! *) ! if test -z "$stripcmd"; then ! u_plus_rw= ! else ! u_plus_rw=,u+rw ! fi ! cp_umask=$mode$u_plus_rw;; ! esac ! fi ! for src ! do ! # Protect names starting with `-'. ! case $src in ! -*) src=./$src;; ! esac ! ! if test -n "$dir_arg"; then ! dst=$src ! dstdir=$dst ! test -d "$dstdir" ! dstdir_status=$? ! else ! ! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! if test ! -f "$src" && test ! -d "$src"; then ! echo "$0: $src does not exist." >&2 ! exit 1 ! fi ! ! if test -z "$dst_arg"; then ! echo "$0: no destination specified." >&2 ! exit 1 ! fi ! ! dst=$dst_arg ! # Protect names starting with `-'. ! case $dst in ! -*) dst=./$dst;; ! esac ! # If destination is a directory, append the input filename; won't work ! # if double slashes aren't ignored. ! if test -d "$dst"; then ! if test -n "$no_target_directory"; then ! echo "$0: $dst_arg: Is a directory" >&2 ! exit 1 ! fi ! dstdir=$dst ! dst=$dstdir/`basename "$src"` ! dstdir_status=0 ! else ! # Prefer dirname, but fall back on a substitute if dirname fails. ! dstdir=` ! (dirname "$dst") 2>/dev/null || ! expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$dst" : 'X\(//\)[^/]' \| \ ! X"$dst" : 'X\(//\)$' \| \ ! X"$dst" : 'X\(/\)' \| . 2>/dev/null || ! echo X"$dst" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ! s//\1/ ! q ! } ! /^X\(\/\/\)[^/].*/{ ! s//\1/ ! q ! } ! /^X\(\/\/\)$/{ ! s//\1/ ! q ! } ! /^X\(\/\).*/{ ! s//\1/ ! q ! } ! s/.*/./; q' ! ` ! ! test -d "$dstdir" ! dstdir_status=$? ! fi ! fi ! ! obsolete_mkdir_used=false ! ! if test $dstdir_status != 0; then ! case $posix_mkdir in ! '') ! # Create intermediate dirs using mode 755 as modified by the umask. ! # This is like FreeBSD 'install' as of 1997-10-28. ! umask=`umask` ! case $stripcmd.$umask in ! # Optimize common cases. ! *[2367][2367]) mkdir_umask=$umask;; ! .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ! ! *[0-7]) ! mkdir_umask=`expr $umask + 22 \ ! - $umask % 100 % 40 + $umask % 20 \ ! - $umask % 10 % 4 + $umask % 2 ! `;; ! *) mkdir_umask=$umask,go-w;; ! esac ! ! # With -d, create the new directory with the user-specified mode. ! # Otherwise, rely on $mkdir_umask. ! if test -n "$dir_arg"; then ! mkdir_mode=-m$mode ! else ! mkdir_mode= ! fi ! posix_mkdir=false ! case $umask in ! *[123567][0-7][0-7]) ! # POSIX mkdir -p sets u+wx bits regardless of umask, which ! # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ! ;; ! *) ! tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ! trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ! if (umask $mkdir_umask && ! exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ! then ! if test -z "$dir_arg" || { ! # Check for POSIX incompatibilities with -m. ! # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ! # other-writeable bit of parent directory when it shouldn't. ! # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ! ls_ld_tmpdir=`ls -ld "$tmpdir"` ! case $ls_ld_tmpdir in ! d????-?r-*) different_mode=700;; ! d????-?--*) different_mode=755;; ! *) false;; ! esac && ! $mkdirprog -m$different_mode -p -- "$tmpdir" && { ! ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ! test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ! } ! } ! then posix_mkdir=: ! fi ! rmdir "$tmpdir/d" "$tmpdir" ! else ! # Remove any dirs left behind by ancient mkdir implementations. ! rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ! fi ! trap '' 0;; ! esac;; ! esac ! if ! $posix_mkdir && ( ! umask $mkdir_umask && ! $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ! ) ! then : ! else ! ! # The umask is ridiculous, or mkdir does not conform to POSIX, ! # or it failed possibly due to a race condition. Create the ! # directory the slow way, step by step, checking for races as we go. ! ! case $dstdir in ! /*) prefix='/';; ! -*) prefix='./';; ! *) prefix='';; ! esac ! ! eval "$initialize_posix_glob" ! ! oIFS=$IFS ! IFS=/ ! $posix_glob set -f ! set fnord $dstdir ! shift ! $posix_glob set +f ! IFS=$oIFS ! ! prefixes= ! ! for d ! do ! test -z "$d" && continue ! ! prefix=$prefix$d ! if test -d "$prefix"; then ! prefixes= ! else ! if $posix_mkdir; then ! (umask=$mkdir_umask && ! $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ! # Don't fail if two instances are running concurrently. ! test -d "$prefix" || exit 1 ! else ! case $prefix in ! *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ! *) qprefix=$prefix;; ! esac ! prefixes="$prefixes '$qprefix'" ! fi ! fi ! prefix=$prefix/ ! done ! if test -n "$prefixes"; then ! # Don't fail if two instances are running concurrently. ! (umask $mkdir_umask && ! eval "\$doit_exec \$mkdirprog $prefixes") || ! test -d "$dstdir" || exit 1 ! obsolete_mkdir_used=true ! fi ! fi ! fi ! ! if test -n "$dir_arg"; then ! { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ! { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ! { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ! test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 ! else ! ! # Make a couple of temp file names in the proper directory. ! dsttmp=$dstdir/_inst.$$_ ! rmtmp=$dstdir/_rm.$$_ ! ! # Trap to clean up those temp files at exit. ! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ! ! # Copy the file name to the temp name. ! (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && ! ! # and set any options; do chmod last to preserve setuid bits. ! # ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $cpprog $src $dsttmp" command. ! # ! { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ! { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ! { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ! { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ! ! # If -C, don't bother to copy if it wouldn't change the file. ! if $copy_on_change && ! old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ! new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ! ! eval "$initialize_posix_glob" && ! $posix_glob set -f && ! set X $old && old=:$2:$4:$5:$6 && ! set X $new && new=:$2:$4:$5:$6 && ! $posix_glob set +f && ! ! test "$old" = "$new" && ! $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ! then ! rm -f "$dsttmp" ! else ! # Rename the file to the real destination. ! $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ! ! # The rename failed, perhaps because mv can't rename something else ! # to itself, or perhaps because mv is so ancient that it does not ! # support -f. ! { ! # Now remove or move aside any old file at destination location. ! # We try this two ways since rm can't unlink itself on some ! # systems and the destination file might be busy for other ! # reasons. In this case, the final cleanup might fail but the new ! # file should still install successfully. ! { ! test ! -f "$dst" || ! $doit $rmcmd -f "$dst" 2>/dev/null || ! { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ! { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ! } || ! { echo "$0: cannot unlink or rename $dst" >&2 ! (exit 1); exit 1 ! } ! } && ! ! # Now rename the file to the real destination. ! $doit $mvcmd "$dsttmp" "$dst" ! } ! fi || exit 1 + trap '' 0 + fi + done ! # Local variables: ! # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "scriptversion=" ! # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-time-zone: "UTC" ! # time-stamp-end: "; # UTC" ! # End: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/ChangeLog gsl-1.14/integration/ChangeLog *** gsl-1.13/integration/ChangeLog Sun Aug 23 10:43:39 2009 --- gsl-1.14/integration/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-03-09 Brian Gough + + * glfixed.c (gauss_legendre_tbl): made this function static + 2009-08-23 Brian Gough * test.c (main): increase tolerance for qawc(f459) elist test diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/Makefile.am gsl-1.14/integration/Makefile.am *** gsl-1.13/integration/Makefile.am Mon Jun 29 12:30:17 2009 --- gsl-1.14/integration/Makefile.am Wed Mar 10 10:57:13 2010 *************** *** 2,8 **** INCLUDES = -I$(top_srcdir) ! libgslintegration_la_SOURCES = qk15.c qk21.c qk31.c qk41.c qk51.c qk61.c qk.c qng.c qng.h qag.c qags.c qagp.c workspace.c qcheb.c qawc.c qmomo.c qaws.c qmomof.c qawo.c qawf.c pkginclude_HEADERS = gsl_integration.h noinst_HEADERS = qpsrt.c qpsrt2.c qelg.c qc25c.c qc25s.c qc25f.c ptsort.c util.c err.c positivity.c append.c initialise.c set_initial.c reset.c --- 2,8 ---- INCLUDES = -I$(top_srcdir) ! libgslintegration_la_SOURCES = qk15.c qk21.c qk31.c qk41.c qk51.c qk61.c qk.c qng.c qng.h qag.c qags.c qagp.c workspace.c qcheb.c qawc.c qmomo.c qaws.c qmomof.c qawo.c qawf.c glfixed.c pkginclude_HEADERS = gsl_integration.h noinst_HEADERS = qpsrt.c qpsrt2.c qelg.c qc25c.c qc25s.c qc25f.c ptsort.c util.c err.c positivity.c append.c initialise.c set_initial.c reset.c diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/Makefile.in gsl-1.14/integration/Makefile.in *** gsl-1.13/integration/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/integration/Makefile.in Wed Mar 10 10:58:20 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 52,58 **** am_libgslintegration_la_OBJECTS = qk15.lo qk21.lo qk31.lo qk41.lo \ qk51.lo qk61.lo qk.lo qng.lo qag.lo qags.lo qagp.lo \ workspace.lo qcheb.lo qawc.lo qmomo.lo qaws.lo qmomof.lo \ ! qawo.lo qawf.lo libgslintegration_la_OBJECTS = $(am_libgslintegration_la_OBJECTS) am_test_OBJECTS = test.$(OBJEXT) tests.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) --- 52,58 ---- am_libgslintegration_la_OBJECTS = qk15.lo qk21.lo qk31.lo qk41.lo \ qk51.lo qk61.lo qk.lo qng.lo qag.lo qags.lo qagp.lo \ workspace.lo qcheb.lo qawc.lo qmomo.lo qaws.lo qmomof.lo \ ! qawo.lo qawf.lo glfixed.lo libgslintegration_la_OBJECTS = $(am_libgslintegration_la_OBJECTS) am_test_OBJECTS = test.$(OBJEXT) tests.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) *************** *** 60,67 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 60,68 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 109,119 **** --- 110,122 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 127,132 **** --- 130,137 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 186,192 **** --- 191,199 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 232,238 **** top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libgslintegration.la INCLUDES = -I$(top_srcdir) ! libgslintegration_la_SOURCES = qk15.c qk21.c qk31.c qk41.c qk51.c qk61.c qk.c qng.c qng.h qag.c qags.c qagp.c workspace.c qcheb.c qawc.c qmomo.c qaws.c qmomof.c qawo.c qawf.c pkginclude_HEADERS = gsl_integration.h noinst_HEADERS = qpsrt.c qpsrt2.c qelg.c qc25c.c qc25s.c qc25f.c ptsort.c util.c err.c positivity.c append.c initialise.c set_initial.c reset.c TESTS = $(check_PROGRAMS) --- 239,245 ---- top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libgslintegration.la INCLUDES = -I$(top_srcdir) ! libgslintegration_la_SOURCES = qk15.c qk21.c qk31.c qk41.c qk51.c qk61.c qk.c qng.c qng.h qag.c qags.c qagp.c workspace.c qcheb.c qawc.c qmomo.c qaws.c qmomof.c qawo.c qawf.c glfixed.c pkginclude_HEADERS = gsl_integration.h noinst_HEADERS = qpsrt.c qpsrt2.c qelg.c qc25c.c qc25s.c qc25f.c ptsort.c util.c err.c positivity.c append.c initialise.c set_initial.c reset.c TESTS = $(check_PROGRAMS) *************** *** 251,259 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps integration/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps integration/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 258,266 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu integration/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu integration/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 302,315 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 309,357 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glfixed.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qag.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qagp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qags.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qawc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qawf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qawo.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qaws.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qcheb.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk15.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk21.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk31.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk41.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk51.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qk61.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qmomo.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qmomof.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qng.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 551,556 **** --- 593,599 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 596,601 **** --- 639,645 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/glfixed.c gsl-1.14/integration/glfixed.c *** gsl-1.13/integration/glfixed.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/integration/glfixed.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,436 ---- + /* + * Numerical Integration by Gauss-Legendre Quadrature Formulas of high orders. + * High-precision abscissas and weights are used. + * + * Original project homepage: http://www.holoborodko.com/pavel/?page_id=679 + * Original contact e-mail: pavel@holoborodko.com + * + * Copyright (c)2007-2008 Pavel Holoborodko + * + * This program 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. + * + * This program 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributors: + * Konstantin Holoborodko - Optimization of Legendre polynomial computing. + * Rhys Ulerich - Inclusion within GNU Scientific Library. + * + */ + + #include + #include + #include + #include + #include + #include + + static void gauss_legendre_tbl(int n, double* x, double* w, double eps); + + /* n = 2 */ + static double x2[1] = {0.5773502691896257645091488}; + static double w2[1] = {1.0000000000000000000000000}; + + /* n = 4 */ + static double x4[2] = {0.3399810435848562648026658, 0.8611363115940525752239465}; + static double w4[2] = {0.6521451548625461426269361, 0.3478548451374538573730639}; + + /* n = 6 */ + static double x6[3] = {0.2386191860831969086305017, 0.6612093864662645136613996, 0.9324695142031520278123016}; + static double w6[3] = {0.4679139345726910473898703, 0.3607615730481386075698335, 0.1713244923791703450402961}; + + /* n = 8 */ + static double x8[4] = {0.1834346424956498049394761, 0.5255324099163289858177390, 0.7966664774136267395915539, 0.9602898564975362316835609}; + static double w8[4] = {0.3626837833783619829651504, 0.3137066458778872873379622, 0.2223810344533744705443560, 0.1012285362903762591525314}; + + /* n = 10 */ + static double x10[5] = {0.1488743389816312108848260, 0.4333953941292471907992659, 0.6794095682990244062343274, 0.8650633666889845107320967, 0.9739065285171717200779640}; + static double w10[5] = {0.2955242247147528701738930, 0.2692667193099963550912269, 0.2190863625159820439955349, 0.1494513491505805931457763, 0.0666713443086881375935688}; + + /* n = 12 */ + static double x12[6] = {0.1252334085114689154724414, 0.3678314989981801937526915, 0.5873179542866174472967024, 0.7699026741943046870368938, 0.9041172563704748566784659, 0.9815606342467192506905491}; + static double w12[6] = {0.2491470458134027850005624, 0.2334925365383548087608499, 0.2031674267230659217490645, 0.1600783285433462263346525, 0.1069393259953184309602547, 0.0471753363865118271946160}; + + /* n = 14 */ + static double x14[7] = {0.1080549487073436620662447, 0.3191123689278897604356718, 0.5152486363581540919652907, 0.6872929048116854701480198, 0.8272013150697649931897947, 0.9284348836635735173363911, 0.9862838086968123388415973}; + static double w14[7] = {0.2152638534631577901958764, 0.2051984637212956039659241, 0.1855383974779378137417166, 0.1572031671581935345696019, 0.1215185706879031846894148, 0.0801580871597602098056333, 0.0351194603317518630318329}; + + /* n = 16 */ + static double x16[8] = {0.0950125098376374401853193, 0.2816035507792589132304605, 0.4580167776572273863424194, 0.6178762444026437484466718, 0.7554044083550030338951012, 0.8656312023878317438804679, 0.9445750230732325760779884, 0.9894009349916499325961542}; + static double w16[8] = {0.1894506104550684962853967, 0.1826034150449235888667637, 0.1691565193950025381893121, 0.1495959888165767320815017, 0.1246289712555338720524763, 0.0951585116824927848099251, 0.0622535239386478928628438, 0.0271524594117540948517806}; + + /* n = 18 */ + static double x18[9] = {0.0847750130417353012422619, 0.2518862256915055095889729, 0.4117511614628426460359318, 0.5597708310739475346078715, 0.6916870430603532078748911, 0.8037049589725231156824175, 0.8926024664975557392060606, 0.9558239495713977551811959, 0.9915651684209309467300160}; + static double w18[9] = {0.1691423829631435918406565, 0.1642764837458327229860538, 0.1546846751262652449254180, 0.1406429146706506512047313, 0.1225552067114784601845191, 0.1009420441062871655628140, 0.0764257302548890565291297, 0.0497145488949697964533349, 0.0216160135264833103133427}; + + /* n = 20 */ + static double x20[10] = {0.0765265211334973337546404, 0.2277858511416450780804962, 0.3737060887154195606725482, 0.5108670019508270980043641, 0.6360536807265150254528367, 0.7463319064601507926143051, 0.8391169718222188233945291, 0.9122344282513259058677524, 0.9639719272779137912676661, 0.9931285991850949247861224}; + static double w20[10] = {0.1527533871307258506980843, 0.1491729864726037467878287, 0.1420961093183820513292983, 0.1316886384491766268984945, 0.1181945319615184173123774, 0.1019301198172404350367501, 0.0832767415767047487247581, 0.0626720483341090635695065, 0.0406014298003869413310400, 0.0176140071391521183118620}; + + /* n = 32 */ + static double x32[16] = {0.0483076656877383162348126, 0.1444719615827964934851864, 0.2392873622521370745446032, 0.3318686022821276497799168, 0.4213512761306353453641194, 0.5068999089322293900237475, 0.5877157572407623290407455, 0.6630442669302152009751152, 0.7321821187402896803874267, 0.7944837959679424069630973, 0.8493676137325699701336930, 0.8963211557660521239653072, 0.9349060759377396891709191, 0.9647622555875064307738119, 0.9856115115452683354001750, 0.9972638618494815635449811}; + static double w32[16] = {0.0965400885147278005667648, 0.0956387200792748594190820, 0.0938443990808045656391802, 0.0911738786957638847128686, 0.0876520930044038111427715, 0.0833119242269467552221991, 0.0781938957870703064717409, 0.0723457941088485062253994, 0.0658222227763618468376501, 0.0586840934785355471452836, 0.0509980592623761761961632, 0.0428358980222266806568786, 0.0342738629130214331026877, 0.0253920653092620594557526, 0.0162743947309056706051706, 0.0070186100094700966004071}; + + /* n = 64 */ + static double x64[32] = {0.0243502926634244325089558, 0.0729931217877990394495429, 0.1214628192961205544703765, 0.1696444204239928180373136, 0.2174236437400070841496487, 0.2646871622087674163739642, 0.3113228719902109561575127, 0.3572201583376681159504426, 0.4022701579639916036957668, 0.4463660172534640879849477, 0.4894031457070529574785263, 0.5312794640198945456580139, 0.5718956462026340342838781, 0.6111553551723932502488530, 0.6489654712546573398577612, 0.6852363130542332425635584, 0.7198818501716108268489402, 0.7528199072605318966118638, 0.7839723589433414076102205, 0.8132653151227975597419233, 0.8406292962525803627516915, 0.8659993981540928197607834, 0.8893154459951141058534040, 0.9105221370785028057563807, 0.9295691721319395758214902, 0.9464113748584028160624815, 0.9610087996520537189186141, 0.9733268277899109637418535, 0.9833362538846259569312993, 0.9910133714767443207393824, 0.9963401167719552793469245, 0.9993050417357721394569056}; + static double w64[32] = {0.0486909570091397203833654, 0.0485754674415034269347991, 0.0483447622348029571697695, 0.0479993885964583077281262, 0.0475401657148303086622822, 0.0469681828162100173253263, 0.0462847965813144172959532, 0.0454916279274181444797710, 0.0445905581637565630601347, 0.0435837245293234533768279, 0.0424735151236535890073398, 0.0412625632426235286101563, 0.0399537411327203413866569, 0.0385501531786156291289625, 0.0370551285402400460404151, 0.0354722132568823838106931, 0.0338051618371416093915655, 0.0320579283548515535854675, 0.0302346570724024788679741, 0.0283396726142594832275113, 0.0263774697150546586716918, 0.0243527025687108733381776, 0.0222701738083832541592983, 0.0201348231535302093723403, 0.0179517157756973430850453, 0.0157260304760247193219660, 0.0134630478967186425980608, 0.0111681394601311288185905, 0.0088467598263639477230309, 0.0065044579689783628561174, 0.0041470332605624676352875, 0.0017832807216964329472961}; + + /* n = 96 */ + static double x96[48] = {0.0162767448496029695791346, 0.0488129851360497311119582, 0.0812974954644255589944713, 0.1136958501106659209112081, 0.1459737146548969419891073, 0.1780968823676186027594026, 0.2100313104605672036028472, 0.2417431561638400123279319, 0.2731988125910491414872722, 0.3043649443544963530239298, 0.3352085228926254226163256, 0.3656968614723136350308956, 0.3957976498289086032850002, 0.4254789884073005453648192, 0.4547094221677430086356761, 0.4834579739205963597684056, 0.5116941771546676735855097, 0.5393881083243574362268026, 0.5665104185613971684042502, 0.5930323647775720806835558, 0.6189258401254685703863693, 0.6441634037849671067984124, 0.6687183100439161539525572, 0.6925645366421715613442458, 0.7156768123489676262251441, 0.7380306437444001328511657, 0.7596023411766474987029704, 0.7803690438674332176036045, 0.8003087441391408172287961, 0.8194003107379316755389996, 0.8376235112281871214943028, 0.8549590334346014554627870, 0.8713885059092965028737748, 0.8868945174024204160568774, 0.9014606353158523413192327, 0.9150714231208980742058845, 0.9277124567223086909646905, 0.9393703397527552169318574, 0.9500327177844376357560989, 0.9596882914487425393000680, 0.9683268284632642121736594, 0.9759391745851364664526010, 0.9825172635630146774470458, 0.9880541263296237994807628, 0.9925439003237626245718923, 0.9959818429872092906503991, 0.9983643758631816777241494, 0.9996895038832307668276901}; + static double w96[48] = {0.0325506144923631662419614, 0.0325161187138688359872055, 0.0324471637140642693640128, 0.0323438225685759284287748, 0.0322062047940302506686671, 0.0320344562319926632181390, 0.0318287588944110065347537, 0.0315893307707271685580207, 0.0313164255968613558127843, 0.0310103325863138374232498, 0.0306713761236691490142288, 0.0302999154208275937940888, 0.0298963441363283859843881, 0.0294610899581679059704363, 0.0289946141505552365426788, 0.0284974110650853856455995, 0.0279700076168483344398186, 0.0274129627260292428234211, 0.0268268667255917621980567, 0.0262123407356724139134580, 0.0255700360053493614987972, 0.0249006332224836102883822, 0.0242048417923646912822673, 0.0234833990859262198422359, 0.0227370696583293740013478, 0.0219666444387443491947564, 0.0211729398921912989876739, 0.0203567971543333245952452, 0.0195190811401450224100852, 0.0186606796274114673851568, 0.0177825023160452608376142, 0.0168854798642451724504775, 0.0159705629025622913806165, 0.0150387210269949380058763, 0.0140909417723148609158616, 0.0131282295669615726370637, 0.0121516046710883196351814, 0.0111621020998384985912133, 0.0101607705350084157575876, 0.0091486712307833866325846, 0.0081268769256987592173824, 0.0070964707911538652691442, 0.0060585455042359616833167, 0.0050142027429275176924702, 0.0039645543384446866737334, 0.0029107318179349464084106, 0.0018539607889469217323359, 0.0007967920655520124294381}; + + /* n = 100 */ + static double x100[50] = {0.0156289844215430828722167, 0.0468716824215916316149239, 0.0780685828134366366948174, 0.1091892035800611150034260, 0.1402031372361139732075146, 0.1710800805386032748875324, 0.2017898640957359972360489, 0.2323024818449739696495100, 0.2625881203715034791689293, 0.2926171880384719647375559, 0.3223603439005291517224766, 0.3517885263724217209723438, 0.3808729816246299567633625, 0.4095852916783015425288684, 0.4378974021720315131089780, 0.4657816497733580422492166, 0.4932107892081909335693088, 0.5201580198817630566468157, 0.5465970120650941674679943, 0.5725019326213811913168704, 0.5978474702471787212648065, 0.6226088602037077716041908, 0.6467619085141292798326303, 0.6702830156031410158025870, 0.6931491993558019659486479, 0.7153381175730564464599671, 0.7368280898020207055124277, 0.7575981185197071760356680, 0.7776279096494954756275514, 0.7968978923903144763895729, 0.8153892383391762543939888, 0.8330838798884008235429158, 0.8499645278795912842933626, 0.8660146884971646234107400, 0.8812186793850184155733168, 0.8955616449707269866985210, 0.9090295709825296904671263, 0.9216092981453339526669513, 0.9332885350430795459243337, 0.9440558701362559779627747, 0.9539007829254917428493369, 0.9628136542558155272936593, 0.9707857757637063319308979, 0.9778093584869182885537811, 0.9838775407060570154961002, 0.9889843952429917480044187, 0.9931249370374434596520099, 0.9962951347331251491861317, 0.9984919506395958184001634, 0.9997137267734412336782285}; + static double w100[50] = {0.0312554234538633569476425, 0.0312248842548493577323765, 0.0311638356962099067838183, 0.0310723374275665165878102, 0.0309504788504909882340635, 0.0307983790311525904277139, 0.0306161865839804484964594, 0.0304040795264548200165079, 0.0301622651051691449190687, 0.0298909795933328309168368, 0.0295904880599126425117545, 0.0292610841106382766201190, 0.0289030896011252031348762, 0.0285168543223950979909368, 0.0281027556591011733176483, 0.0276611982207923882942042, 0.0271926134465768801364916, 0.0266974591835709626603847, 0.0261762192395456763423087, 0.0256294029102081160756420, 0.0250575444815795897037642, 0.0244612027079570527199750, 0.0238409602659682059625604, 0.0231974231852541216224889, 0.0225312202563362727017970, 0.0218430024162473863139537, 0.0211334421125276415426723, 0.0204032326462094327668389, 0.0196530874944353058653815, 0.0188837396133749045529412, 0.0180959407221281166643908, 0.0172904605683235824393442, 0.0164680861761452126431050, 0.0156296210775460027239369, 0.0147758845274413017688800, 0.0139077107037187726879541, 0.0130259478929715422855586, 0.0121314576629794974077448, 0.0112251140231859771172216, 0.0103078025748689695857821, 0.0093804196536944579514182, 0.0084438714696689714026208, 0.0074990732554647115788287, 0.0065469484508453227641521, 0.0055884280038655151572119, 0.0046244500634221193510958, 0.0036559612013263751823425, 0.0026839253715534824194396, 0.0017093926535181052395294, 0.0007346344905056717304063}; + + /* n = 128 */ + static double x128[64] = {0.0122236989606157641980521, 0.0366637909687334933302153, 0.0610819696041395681037870, 0.0854636405045154986364980, 0.1097942311276437466729747, 0.1340591994611877851175753, 0.1582440427142249339974755, 0.1823343059853371824103826, 0.2063155909020792171540580, 0.2301735642266599864109866, 0.2538939664226943208556180, 0.2774626201779044028062316, 0.3008654388776772026671541, 0.3240884350244133751832523, 0.3471177285976355084261628, 0.3699395553498590266165917, 0.3925402750332674427356482, 0.4149063795522750154922739, 0.4370245010371041629370429, 0.4588814198335521954490891, 0.4804640724041720258582757, 0.5017595591361444642896063, 0.5227551520511754784539479, 0.5434383024128103634441936, 0.5637966482266180839144308, 0.5838180216287630895500389, 0.6034904561585486242035732, 0.6228021939105849107615396, 0.6417416925623075571535249, 0.6602976322726460521059468, 0.6784589224477192593677557, 0.6962147083695143323850866, 0.7135543776835874133438599, 0.7304675667419088064717369, 0.7469441667970619811698824, 0.7629743300440947227797691, 0.7785484755064119668504941, 0.7936572947621932902433329, 0.8082917575079136601196422, 0.8224431169556438424645942, 0.8361029150609068471168753, 0.8492629875779689691636001, 0.8619154689395484605906323, 0.8740527969580317986954180, 0.8856677173453972174082924, 0.8967532880491581843864474, 0.9073028834017568139214859, 0.9173101980809605370364836, 0.9267692508789478433346245, 0.9356743882779163757831268, 0.9440202878302201821211114, 0.9518019613412643862177963, 0.9590147578536999280989185, 0.9656543664319652686458290, 0.9717168187471365809043384, 0.9771984914639073871653744, 0.9820961084357185360247656, 0.9864067427245862088712355, 0.9901278184917343833379303, 0.9932571129002129353034372, 0.9957927585349811868641612, 0.9977332486255140198821574, 0.9990774599773758950119878, 0.9998248879471319144736081}; + static double w128[64] = {0.0244461801962625182113259, 0.0244315690978500450548486, 0.0244023556338495820932980, 0.0243585572646906258532685, 0.0243002001679718653234426, 0.0242273192228152481200933, 0.0241399579890192849977167, 0.0240381686810240526375873, 0.0239220121367034556724504, 0.0237915577810034006387807, 0.0236468835844476151436514, 0.0234880760165359131530253, 0.0233152299940627601224157, 0.0231284488243870278792979, 0.0229278441436868469204110, 0.0227135358502364613097126, 0.0224856520327449668718246, 0.0222443288937997651046291, 0.0219897106684604914341221, 0.0217219495380520753752610, 0.0214412055392084601371119, 0.0211476464682213485370195, 0.0208414477807511491135839, 0.0205227924869600694322850, 0.0201918710421300411806732, 0.0198488812328308622199444, 0.0194940280587066028230219, 0.0191275236099509454865185, 0.0187495869405447086509195, 0.0183604439373313432212893, 0.0179603271850086859401969, 0.0175494758271177046487069, 0.0171281354231113768306810, 0.0166965578015892045890915, 0.0162550009097851870516575, 0.0158037286593993468589656, 0.0153430107688651440859909, 0.0148731226021473142523855, 0.0143943450041668461768239, 0.0139069641329519852442880, 0.0134112712886163323144890, 0.0129075627392673472204428, 0.0123961395439509229688217, 0.0118773073727402795758911, 0.0113513763240804166932817, 0.0108186607395030762476596, 0.0102794790158321571332153, 0.0097341534150068058635483, 0.0091830098716608743344787, 0.0086263777986167497049788, 0.0080645898904860579729286, 0.0074979819256347286876720, 0.0069268925668988135634267, 0.0063516631617071887872143, 0.0057726375428656985893346, 0.0051901618326763302050708, 0.0046045842567029551182905, 0.0040162549837386423131943, 0.0034255260409102157743378, 0.0028327514714579910952857, 0.0022382884309626187436221, 0.0016425030186690295387909, 0.0010458126793403487793129, 0.0004493809602920903763943}; + + /* n = 256 */ + static double x256[128] = {0.0061239123751895295011702, 0.0183708184788136651179263, 0.0306149687799790293662786, 0.0428545265363790983812423, 0.0550876556946339841045614, 0.0673125211657164002422903, 0.0795272891002329659032271, 0.0917301271635195520311456, 0.1039192048105094036391969, 0.1160926935603328049407349, 0.1282487672706070947420496, 0.1403856024113758859130249, 0.1525013783386563953746068, 0.1645942775675538498292845, 0.1766624860449019974037218, 0.1887041934213888264615036, 0.2007175933231266700680007, 0.2127008836226259579370402, 0.2246522667091319671478783, 0.2365699497582840184775084, 0.2484521450010566668332427, 0.2602970699919425419785609, 0.2721029478763366095052447, 0.2838680076570817417997658, 0.2955904844601356145637868, 0.3072686197993190762586103, 0.3189006618401062756316834, 0.3304848656624169762291870, 0.3420194935223716364807297, 0.3535028151129699895377902, 0.3649331078236540185334649, 0.3763086569987163902830557, 0.3876277561945155836379846, 0.3988887074354591277134632, 0.4100898214687165500064336, 0.4212294180176238249768124, 0.4323058260337413099534411, 0.4433173839475273572169258, 0.4542624399175899987744552, 0.4651393520784793136455705, 0.4759464887869833063907375, 0.4866822288668903501036214, 0.4973449618521814771195124, 0.5079330882286160362319249, 0.5184450196736744762216617, 0.5288791792948222619514764, 0.5392340018660591811279362, 0.5495079340627185570424269, 0.5596994346944811451369074, 0.5698069749365687590576675, 0.5798290385590829449218317, 0.5897641221544543007857861, 0.5996107353629683217303882, 0.6093674010963339395223108, 0.6190326557592612194309676, 0.6286050494690149754322099, 0.6380831462729113686686886, 0.6474655243637248626170162, 0.6567507762929732218875002, 0.6659375091820485599064084, 0.6750243449311627638559187, 0.6840099204260759531248771, 0.6928928877425769601053416, 0.7016719143486851594060835, 0.7103456833045433133945663, 0.7189128934599714483726399, 0.7273722596496521265868944, 0.7357225128859178346203729, 0.7439624005491115684556831, 0.7520906865754920595875297, 0.7601061516426554549419068, 0.7680075933524456359758906, 0.7757938264113257391320526, 0.7834636828081838207506702, 0.7910160119895459945467075, 0.7984496810321707587825429, 0.8057635748129986232573891, 0.8129565961764315431364104, 0.8200276660989170674034781, 0.8269757238508125142890929, 0.8337997271555048943484439, 0.8404986523457627138950680, 0.8470714945172962071870724, 0.8535172676795029650730355, 0.8598350049033763506961731, 0.8660237584665545192975154, 0.8720825999954882891300459, 0.8780106206047065439864349, 0.8838069310331582848598262, 0.8894706617776108888286766, 0.8950009632230845774412228, 0.9003970057703035447716200, 0.9056579799601446470826819, 0.9107830965950650118909072, 0.9157715868574903845266696, 0.9206227024251464955050471, 0.9253357155833162028727303, 0.9299099193340056411802456, 0.9343446275020030942924765, 0.9386391748378148049819261, 0.9427929171174624431830761, 0.9468052312391274813720517, 0.9506755153166282763638521, 0.9544031887697162417644479, 0.9579876924111781293657904, 0.9614284885307321440064075, 0.9647250609757064309326123, 0.9678769152284894549090038, 0.9708835784807430293209233, 0.9737445997043704052660786, 0.9764595497192341556210107, 0.9790280212576220388242380, 0.9814496290254644057693031, 0.9837240097603154961666861, 0.9858508222861259564792451, 0.9878297475648606089164877, 0.9896604887450652183192437, 0.9913427712075830869221885, 0.9928763426088221171435338, 0.9942609729224096649628775, 0.9954964544810963565926471, 0.9965826020233815404305044, 0.9975192527567208275634088, 0.9983062664730064440555005, 0.9989435258434088565550263, 0.9994309374662614082408542, 0.9997684374092631861048786, 0.9999560500189922307348012}; + static double w256[128] = {0.0122476716402897559040703, 0.0122458343697479201424639, 0.0122421601042728007697281, 0.0122366493950401581092426, 0.0122293030687102789041463, 0.0122201222273039691917087, 0.0122091082480372404075141, 0.0121962627831147135181810, 0.0121815877594817721740476, 0.0121650853785355020613073, 0.0121467581157944598155598, 0.0121266087205273210347185, 0.0121046402153404630977578, 0.0120808558957245446559752, 0.0120552593295601498143471, 0.0120278543565825711612675, 0.0119986450878058119345367, 0.0119676359049058937290073, 0.0119348314595635622558732, 0.0119002366727664897542872, 0.0118638567340710787319046, 0.0118256971008239777711607, 0.0117857634973434261816901, 0.0117440619140605503053767, 0.0117005986066207402881898, 0.0116553800949452421212989, 0.0116084131622531057220847, 0.0115597048540436357726687, 0.0115092624770394979585864, 0.0114570935980906391523344, 0.0114032060430391859648471, 0.0113476078955454919416257, 0.0112903074958755095083676, 0.0112313134396496685726568, 0.0111706345765534494627109, 0.0111082800090098436304608, 0.0110442590908139012635176, 0.0109785814257295706379882, 0.0109112568660490397007968, 0.0108422955111147959952935, 0.0107717077058046266366536, 0.0106995040389797856030482, 0.0106256953418965611339617, 0.0105502926865814815175336, 0.0104733073841704030035696, 0.0103947509832117289971017, 0.0103146352679340150682607, 0.0102329722564782196569549, 0.0101497741990948656546341, 0.0100650535763063833094610, 0.0099788230970349101247339, 0.0098910956966958286026307, 0.0098018845352573278254988, 0.0097112029952662799642497, 0.0096190646798407278571622, 0.0095254834106292848118297, 0.0094304732257377527473528, 0.0093340483776232697124660, 0.0092362233309563026873787, 0.0091370127604508064020005, 0.0090364315486628736802278, 0.0089344947837582075484084, 0.0088312177572487500253183, 0.0087266159616988071403366, 0.0086207050884010143053688, 0.0085135010250224906938384, 0.0084050198532215357561803, 0.0082952778462352254251714, 0.0081842914664382699356198, 0.0080720773628734995009470, 0.0079586523687543483536132, 0.0078440334989397118668103, 0.0077282379473815556311102, 0.0076112830845456594616187, 0.0074931864548058833585998, 0.0073739657738123464375724, 0.0072536389258339137838291, 0.0071322239610753900716724, 0.0070097390929698226212344, 0.0068862026954463203467133, 0.0067616333001737987809279, 0.0066360495937810650445900, 0.0065094704150536602678099, 0.0063819147521078805703752, 0.0062534017395424012720636, 0.0061239506555679325423891, 0.0059935809191153382211277, 0.0058623120869226530606616, 0.0057301638506014371773844, 0.0055971560336829100775514, 0.0054633085886443102775705, 0.0053286415939159303170811, 0.0051931752508692809303288, 0.0050569298807868423875578, 0.0049199259218138656695588, 0.0047821839258926913729317, 0.0046437245556800603139791, 0.0045045685814478970686418, 0.0043647368779680566815684, 0.0042242504213815362723565, 0.0040831302860526684085998, 0.0039413976414088336277290, 0.0037990737487662579981170, 0.0036561799581425021693892, 0.0035127377050563073309711, 0.0033687685073155510120191, 0.0032242939617941981570107, 0.0030793357411993375832054, 0.0029339155908297166460123, 0.0027880553253277068805748, 0.0026417768254274905641208, 0.0024951020347037068508395, 0.0023480529563273120170065, 0.0022006516498399104996849, 0.0020529202279661431745488, 0.0019048808534997184044191, 0.0017565557363307299936069, 0.0016079671307493272424499, 0.0014591373333107332010884, 0.0013100886819025044578317, 0.0011608435575677247239706, 0.0010114243932084404526058, 0.0008618537014200890378141, 0.0007121541634733206669090, 0.0005623489540314098028152, 0.0004124632544261763284322, 0.0002625349442964459062875, 0.0001127890178222721755125}; + + /* n = 512 */ + static double x512[256] = {0.0030649621851593961529232, 0.0091947713864329108047442, 0.0153242350848981855249677, 0.0214531229597748745137841, 0.0275812047119197840615246, 0.0337082500724805951232271, 0.0398340288115484476830396, 0.0459583107468090617788760, 0.0520808657521920701127271, 0.0582014637665182372392330, 0.0643198748021442404045319, 0.0704358689536046871990309, 0.0765492164062510452915674, 0.0826596874448871596284651, 0.0887670524624010326092165, 0.0948710819683925428909483, 0.1009715465977967786264323, 0.1070682171195026611052004, 0.1131608644449665349442888, 0.1192492596368204011642726, 0.1253331739174744696875513, 0.1314123786777137080093018, 0.1374866454852880630171099, 0.1435557460934960331730353, 0.1496194524497612685217272, 0.1556775367042018762501969, 0.1617297712181921097989489, 0.1677759285729161198103670, 0.1738157815779134454985394, 0.1798491032796159253350647, 0.1858756669698757062678115, 0.1918952461944840310240859, 0.1979076147616804833961808, 0.2039125467506523717658375, 0.2099098165200239314947094, 0.2158991987163350271904893, 0.2218804682825090362529109, 0.2278534004663095955103621, 0.2338177708287858931763260, 0.2397733552527061887852891, 0.2457199299509792442100997, 0.2516572714750633493170137, 0.2575851567233626262808095, 0.2635033629496102970603704, 0.2694116677712385990250046, 0.2753098491777350342234845, 0.2811976855389846383013106, 0.2870749556135979555970354, 0.2929414385572244074855835, 0.2987969139308507415853707, 0.3046411617090842500066247, 0.3104739622884204453906292, 0.3162950964954948840736281, 0.3221043455953188263048133, 0.3279014912994984240551598, 0.3336863157744371275728377, 0.3394586016495210024715049, 0.3452181320252866497799379, 0.3509646904815714220351686, 0.3566980610856456291665404, 0.3624180284003264285948478, 0.3681243774920730946589582, 0.3738168939390633631820054, 0.3794953638392505477003659, 0.3851595738184011246011504, 0.3908093110381124851478484, 0.3964443632038105531190080, 0.4020645185727269675414064, 0.4076695659618555307670286, 0.4132592947558876229222955, 0.4188334949151262845483445, 0.4243919569833786700527309, 0.4299344720958265754056529, 0.4354608319868747443376920, 0.4409708289979766581310498, 0.4464642560854375149423431, 0.4519409068281941054521446, 0.4574005754355712925046003, 0.4628430567550148032795831, 0.4682681462798000434299255, 0.4736756401567166435172692, 0.4790653351937284489919577, 0.4844370288676086658851277, 0.4897905193315498753147078, 0.4951256054227486308513615, 0.5004420866699643537454866, 0.5057397633010522419821678, 0.5110184362504699101074361, 0.5162779071667574777562819, 0.5215179784199908258105606, 0.5267384531092077401231844, 0.5319391350698066637637706, 0.5371198288809177797701793, 0.5422803398727461474300859, 0.5474204741338866161668468, 0.5525400385186102421644070, 0.5576388406541219339368088, 0.5627166889477890541289656, 0.5677733925943407059267120, 0.5728087615830374335557009, 0.5778226067048110674604360, 0.5828147395593744458765762, 0.5877849725623007456415722, 0.5927331189520721562306608, 0.5976589927970976321572046, 0.6025624090026994600382737, 0.6074431833180683777981926, 0.6123011323431869846644595, 0.6171360735357211818019505, 0.6219478252178793846326095, 0.6267362065832392490988318, 0.6315010377035416553494506, 0.6362421395354516935575740, 0.6409593339272863978194482, 0.6456524436257089753330001, 0.6503212922823892793136899, 0.6549657044606302753737317, 0.6595855056419602523685720, 0.6641805222326905300017078, 0.6687505815704384167754210, 0.6732955119306151731807642, 0.6778151425328787363350998, 0.6823093035475509635996236, 0.6867778261019991540425409, 0.6912205422869816079558685, 0.6956372851629569859851427, 0.7000278887663572307915895, 0.7043921881158238155354902, 0.7087300192184070848475163, 0.7130412190757284553416507, 0.7173256256901052441189100, 0.7215830780706378951153816, 0.7258134162392593745610389, 0.7300164812367465082373380, 0.7341921151286930346516885, 0.7383401610114441496854630, 0.7424604630179923197192207, 0.7465528663238341416942072, 0.7506172171527880300329109, 0.7546533627827725118134392, 0.7586611515515449130726824, 0.7626404328624002206015913, 0.7665910571898299050923647, 0.7705128760851404930018538, 0.7744057421820316760079998, 0.7782695092021337484565606, 0.7821040319605041647237048, 0.7859091663710830099561901, 0.7896847694521071791947507, 0.7934306993314830614379285, 0.7971468152521175267628422, 0.8008329775772070161862372, 0.8044890477954845355235412, 0.8081148885264243560855026, 0.8117103635254042266412553, 0.8152753376888249026732770, 0.8188096770591868005536242, 0.8223132488301235858819787, 0.8257859213513925068443721, 0.8292275641338212850768968, 0.8326380478542113781512150, 0.8360172443601974294381733, 0.8393650266750627227522641, 0.8426812690025104608329811, 0.8459658467313906883792422, 0.8492186364403826820199251, 0.8524395159026326312771384, 0.8556283640903464362590494, 0.8587850611793374495058711, 0.8619094885535289911058997, 0.8650015288094114678982387, 0.8680610657604539292849800, 0.8710879844414698938880857, 0.8740821711129372830049576, 0.8770435132652722985416439, 0.8799718996230570848337538, 0.8828672201492210155023745, 0.8857293660491754482355527, 0.8885582297749017921351663, 0.8913537050289927340242104, 0.8941156867686464718706125, 0.8968440712096138052506156, 0.8995387558300979345474886, 0.9021996393746068223597927, 0.9048266218577579723776075, 0.9074196045680354827749729, 0.9099784900714992329623006, 0.9125031822154460643436214, 0.9149935861320228175302595, 0.9174496082417910902748409, 0.9198711562572435822074657, 0.9222581391862718942794141, 0.9246104673355856526489486, 0.9269280523140828285786768, 0.9292108070361711277546193, 0.9314586457250403242837002, 0.9336714839158854164789745, 0.9358492384590804834007204, 0.9379918275233031229867813, 0.9400991705986093544775539, 0.9421711884994588697201555, 0.9442078033676905198230562, 0.9462089386754479255274304, 0.9481745192280551015654245, 0.9501044711668419871894147, 0.9519987219719197769813274, 0.9538572004649059479887372, 0.9556798368115988811866200, 0.9574665625246019772327448, 0.9592173104658971684737507, 0.9609320148493677311718534, 0.9626106112432703039637754, 0.9642530365726560206402068, 0.9658592291217406674540047, 0.9674291285362237773389233, 0.9689626758255565756615864, 0.9704598133651586944555050, 0.9719204848985835745206522, 0.9733446355396324773464471, 0.9747322117744170315712560, 0.9760831614633702416830300, 0.9773974338432058899681861, 0.9786749795288262664309572, 0.9799157505151781656726285, 0.9811197001790570947322311, 0.9822867832808596419166429, 0.9834169559662839640681455, 0.9845101757679783590716126, 0.9855664016071379024692622, 0.9865855937950491429603684, 0.9875677140345828729848910, 0.9885127254216350200148487, 0.9894205924465157453777048, 0.9902912809952868962106899, 0.9911247583510480415528399, 0.9919209931951714500244370, 0.9926799556084865573546763, 0.9934016170724147657859271, 0.9940859504700558793702825, 0.9947329300872282225027936, 0.9953425316134657151476031, 0.9959147321429772566997088, 0.9964495101755774022837600, 0.9969468456176038804367370, 0.9974067197828498321611183, 0.9978291153935628466036470, 0.9982140165816127953876923, 0.9985614088900397275573677, 0.9988712792754494246541769, 0.9991436161123782382453400, 0.9993784092025992514480161, 0.9995756497983108555936109, 0.9997353306710426625827368, 0.9998574463699794385446275, 0.9999419946068456536361287, 0.9999889909843818679872841}; + static double w512[256] = {0.0061299051754057857591564, 0.0061296748380364986664278, 0.0061292141719530834395471, 0.0061285231944655327693402, 0.0061276019315380226384508, 0.0061264504177879366912426, 0.0061250686964845654506976, 0.0061234568195474804311878, 0.0061216148475445832082156, 0.0061195428496898295184288, 0.0061172409038406284754329, 0.0061147090964949169991245, 0.0061119475227879095684795, 0.0061089562864885234199252, 0.0061057354999954793256260, 0.0061022852843330780981965, 0.0060986057691466529805468, 0.0060946970926976980917399, 0.0060905594018586731119147, 0.0060861928521074844014940, 0.0060815976075216427620556, 0.0060767738407720980583934, 0.0060717217331167509334394, 0.0060664414743936418598512, 0.0060609332630138177841916, 0.0060551973059538766317450, 0.0060492338187481899521175, 0.0060430430254808039978627, 0.0060366251587770195404584, 0.0060299804597946507400317, 0.0060231091782149633972884, 0.0060160115722332929281516, 0.0060086879085493424136484, 0.0060011384623571610896056, 0.0059933635173348036527221, 0.0059853633656336707715812, 0.0059771383078675312031423, 0.0059686886531012259272183, 0.0059600147188390547233923, 0.0059511168310128456267588, 0.0059419953239697077107922, 0.0059326505404594676575446, 0.0059230828316217905872556, 0.0059132925569729856313229, 0.0059032800843924967444267, 0.0058930457901090792634301, 0.0058825900586866627324847, 0.0058719132830099005255609, 0.0058610158642694068093892, 0.0058498982119466814015496, 0.0058385607437987230901727, 0.0058270038858423319934219, 0.0058152280723381015486124, 0.0058032337457741007324836, 0.0057910213568492471257818, 0.0057785913644563714469284, 0.0057659442356649741911390, 0.0057530804457036750229319, 0.0057400004779423555815070, 0.0057267048238739963699973, 0.0057131939830962084110906, 0.0056994684632924603629882, 0.0056855287802130018011102, 0.0056713754576554833823756, 0.0056570090274452746202723, 0.0056424300294154800102991, 0.0056276390113866542566918, 0.0056126365291462173626557, 0.0055974231464275703576030, 0.0055819994348889124461425, 0.0055663659740917603747899, 0.0055505233514791708235538, 0.0055344721623536666407146, 0.0055182130098548677502395, 0.0055017465049368275723757, 0.0054850732663450758090285, 0.0054681939205933684565648, 0.0054511091019401459196852, 0.0054338194523647001109732, 0.0054163256215430514316688, 0.0053986282668235365401123, 0.0053807280532021078251738, 0.0053626256532973455128155, 0.0053443217473251833447318, 0.0053258170230733487787774, 0.0053071121758755186716175, 0.0052882079085851914147269, 0.0052691049315492765055207, 0.0052498039625814025460136, 0.0052303057269349446719890, 0.0052106109572757724261988, 0.0051907203936547190996206, 0.0051706347834797735752665, 0.0051503548814879957194620, 0.0051298814497171563759039, 0.0051092152574771030281542, 0.0050883570813208522065339, 0.0050673077050154097256505, 0.0050460679195123198490183, 0.0050246385229179444874178, 0.0050030203204634735477834, 0.0049812141244746675595135, 0.0049592207543413337151533, 0.0049370410364865364724225, 0.0049146758043355438745290, 0.0048921258982845107556462, 0.0048693921656689000083132, 0.0048464754607316430993636, 0.0048233766445910410307843, 0.0048000965852084069516609, 0.0047766361573554516370718, 0.0047529962425814130594576, 0.0047291777291799312876071, 0.0047051815121556699579709, 0.0046810084931906855725376, 0.0046566595806105458869828, 0.0046321356893501986622283, 0.0046074377409195920619320, 0.0045825666633690479877601, 0.0045575233912543896535753, 0.0045323088656018247089130, 0.0045069240338725852313010, 0.0044813698499273259161146, 0.0044556472739902818017469, 0.0044297572726131868769073, 0.0044037008186389549258496, 0.0043774788911651239762643, 0.0043510924755070657234522, 0.0043245425631609613132305, 0.0042978301517665448748000, 0.0042709562450696162035304, 0.0042439218528843240022977, 0.0042167279910552210986262, 0.0041893756814190930634598, 0.0041618659517665616659011, 0.0041341998358034646067195, 0.0041063783731120129818357, 0.0040784026091117279353449, 0.0040502735950201579699371, 0.0040219923878133783908191, 0.0039935600501862743674273, 0.0039649776505126091053562, 0.0039362462628048786290012, 0.0039073669666739546834366, 0.0038783408472885172720108, 0.0038491689953342783540510, 0.0038198525069729982349166, 0.0037903924838012961884344, 0.0037607900328092568594835, 0.0037310462663388340021755, 0.0037011623020420531166926, 0.0036711392628390145554094, 0.0036409782768756986764252, 0.0036106804774815746300758, 0.0035802470031270143713799, 0.0035496789973805134987000, 0.0035189776088657205261605, 0.0034881439912182762045767, 0.0034571793030424645127888, 0.0034260847078676769483860, 0.0033948613741046917538288, 0.0033635104750017697209450, 0.0033320331886005682236783, 0.0033004306976918751358177, 0.0032687041897711642972145, 0.0032368548569939741987234, 0.0032048838961311115627642, 0.0031727925085236815030060, 0.0031405819000379459532169, 0.0031082532810200120618074, 0.0030758078662503522550163, 0.0030432468748981576780527, 0.0030105715304755267298129, 0.0029777830607914904130339, 0.0029448826979058762279357, 0.0029118716780830123435331, 0.0028787512417452737868732, 0.0028455226334264723964728, 0.0028121871017250922921949, 0.0027787458992573726197173, 0.0027452002826102393336092, 0.0027115515122940877888456, 0.0026778008526954179163600, 0.0026439495720293237639656, 0.0026099989422918391896635, 0.0025759502392121415000167, 0.0025418047422046148318992, 0.0025075637343207750815413, 0.0024732285022010581903898, 0.0024388003360264736029032, 0.0024042805294701247170072, 0.0023696703796485981535706, 0.0023349711870732236769383, 0.0023001842556012066042973, 0.0022653108923866345474810, 0.0022303524078313603367724, 0.0021953101155357629823745, 0.0021601853322493885355395, 0.0021249793778214727179358, 0.0020896935751513471947536, 0.0020543292501387313744068, 0.0020188877316339116255770, 0.0019833703513878098109153, 0.0019477784440019430461334, 0.0019121133468782766036998, 0.0018763764001689718921795, 0.0018405689467260314557679, 0.0018046923320508429542037, 0.0017687479042436241015783, 0.0017327370139527705642995, 0.0016966610143241088445575, 0.0016605212609500562072903, 0.0016243191118186897474239, 0.0015880559272627267421479, 0.0015517330699084184928942, 0.0015153519046243599371387, 0.0014789137984702174059640, 0.0014424201206453770259886, 0.0014058722424375164225552, 0.0013692715371711025869345, 0.0013326193801558190401403, 0.0012959171486349257824991, 0.0012591662217335559930561, 0.0012223679804069540808915, 0.0011855238073886605549070, 0.0011486350871386503607080, 0.0011117032057914329649653, 0.0010747295511041247428251, 0.0010377155124045074300544, 0.0010006624805390909706032, 0.0009635718478212056798501, 0.0009264450079791582697455, 0.0008892833561045005372012, 0.0008520882886004809402792, 0.0008148612031307819965602, 0.0007776034985686972438014, 0.0007403165749469818962867, 0.0007030018334087411433900, 0.0006656606761599343409382, 0.0006282945064244358390880, 0.0005909047284032230162400, 0.0005534927472403894647847, 0.0005160599690007674370993, 0.0004786078006679509066920, 0.0004411376501795405636493, 0.0004036509265333198797447, 0.0003661490400356268530141, 0.0003286334028523334162522, 0.0002911054302514885125319, 0.0002535665435705865135866, 0.0002160181779769908583388, 0.0001784618055459532946077, 0.0001408990173881984930124, 0.0001033319034969132362968, 0.0000657657316592401958310, 0.0000282526373739346920387}; + + /* n = 1024 */ + static double x1024[512] = {0.0015332313560626384065387, 0.0045996796509132604743248, 0.0076660846940754867627839, 0.0107324176515422803327458, 0.0137986496899844401539048, 0.0168647519770217265449962, 0.0199306956814939776907024, 0.0229964519737322146859283, 0.0260619920258297325581921, 0.0291272870119131747190088, 0.0321923081084135882953009, 0.0352570264943374577920498, 0.0383214133515377145376052, 0.0413854398649847193632977, 0.0444490772230372159692514, 0.0475122966177132524285687, 0.0505750692449610682823599, 0.0536373663049299446784129, 0.0566991590022410150066456, 0.0597604185462580334848567, 0.0628211161513580991486838, 0.0658812230372023327000985, 0.0689407104290065036692117, 0.0719995495578116053446277, 0.0750577116607543749280791, 0.0781151679813377563695878, 0.0811718897697013033399379, 0.0842278482828915197978074, 0.0872830147851321356094940, 0.0903373605480943146797811, 0.0933908568511667930531222, 0.0964434749817259444449839, 0.0994951862354057706638682, 0.1025459619163678143852404, 0.1055957733375709917393206, 0.1086445918210413421754502, 0.1116923886981416930665228, 0.1147391353098412365177689, 0.1177848030069850158450139, 0.1208293631505633191883714, 0.1238727871119809777282145, 0.1269150462733265659711591, 0.1299561120276415015747167, 0.1329959557791890421802183, 0.1360345489437231767245806, 0.1390718629487574087024745, 0.1421078692338334288514767, 0.1451425392507896747338214, 0.1481758444640297746894331, 0.1512077563507908736360111, 0.1542382464014118381930443, 0.1572672861196013386077717, 0.1602948470227058049622614, 0.1633209006419772551419632, 0.1663454185228409920472972, 0.1693683722251631675310675, 0.1723897333235182105457458, 0.1754094734074561169859457, 0.1784275640817695987127083, 0.1814439769667610892475458, 0.1844586836985096036255346, 0.1874716559291374498981239, 0.1904828653270767897777182, 0.1934922835773360459175133, 0.1964998823817661533215037, 0.1995056334593266523810493, 0.2025095085463516210358758, 0.2055114793968154435588961, 0.2085115177825984134657778, 0.2115095954937521680517391, 0.2145056843387649520596422, 0.2174997561448267079850562, 0.2204917827580939905255947, 0.2234817360439547026834844, 0.2264695878872926510320010, 0.2294553101927519176581055, 0.2324388748850010462953415, 0.2354202539089970401627982, 0.2383994192302491690277166, 0.2413763428350825830111093, 0.2443509967309017306575811, 0.2473233529464535787923793, 0.2502933835320906316905658, 0.2532610605600337470850902, 0.2562263561246347465424530, 0.2591892423426388177365829, 0.2621496913534467061535080, 0.2651076753193766937613805, 0.2680631664259263621824189, 0.2710161368820341379053566, 0.2739665589203406170790369, 0.2769144047974496674298651, 0.2798596467941893048479266, 0.2828022572158723421886958, 0.2857422083925568078394062, 0.2886794726793061316013119, 0.2916140224564490954412652, 0.2945458301298395466682397, 0.2974748681311158710926665, 0.3004011089179602237287060, 0.3033245249743575146018584, 0.3062450888108541472266190, 0.3091627729648165073212094, 0.3120775500006891993287636, 0.3149893925102530283167230, 0.3178982731128827248285835, 0.3208041644558044102645582, 0.3237070392143528003701590, 0.3266068700922281444141618, 0.3295036298217528976399056, 0.3323972911641281245763845, 0.3352878269096896307981228, 0.3381752098781638207253743, 0.3410594129189232790587667, 0.3439404089112420734451077, 0.3468181707645507759736923, 0.3496926714186912011050938, 0.3525638838441708576370887, 0.3554317810424171123150528, 0.3582963360460310626968790, 0.3611575219190411168852009, 0.3640153117571562777424605, 0.3668696786880191292071420, 0.3697205958714585223322883, 0.3725680364997419586702471, 0.3754119737978276686304337, 0.3782523810236163824397703, 0.3810892314682027913383487, 0.3839224984561266966457784, 0.3867521553456238443366159, 0.3895781755288764427662286, 0.3924005324322633611914264, 0.3952191995166100067331951, 0.3980341502774378774318886, 0.4008453582452137890482864, 0.4036527969855987732669841, 0.4064564400996966449616823, 0.4092562612243022361850445, 0.4120522340321492945489319, 0.4148443322321580436639788, 0.4176325295696824033106488, 0.4204167998267568670171117, 0.4231971168223430347225035, 0.4259734544125757982073747, 0.4287457864910091769763965, 0.4315140869888618022816824, 0.4342783298752620469783905, 0.4370384891574927989076034, 0.4397945388812358755048319, 0.4425464531308160773358662, 0.4452942060294448782650898, 0.4480377717394637499647905, 0.4507771244625871184774399, 0.4535122384401449505463744, 0.4562430879533249674337895, 0.4589696473234144839484647, 0.4616918909120418704091584, 0.4644097931214176352731591, 0.4671233283945751261630457, 0.4698324712156108470282980, 0.4725371961099243891820077, 0.4752374776444579739565725, 0.4779332904279356047259052, 0.4806246091111018260453658, 0.4833114083869600876643171, 0.4859936629910107111699206, 0.4886713477014884570245255, 0.4913444373395996897627612, 0.4940129067697591391182235, 0.4966767308998262548534419, 0.4993358846813411530706387, 0.5019903431097601517846292, 0.5046400812246908935430768, 0.5072850741101270528831987, 0.5099252968946826264179220, 0.5125607247518258033484145, 0.5151913329001124142038603, 0.5178170966034189556133159, 0.5204379911711751889184691, 0.5230539919585963104401304, 0.5256650743669146912153147, 0.5282712138436111840258187, 0.5308723858826459955432696, 0.5334685660246891214197081, 0.5360597298573503421568799, 0.5386458530154087775915395, 0.5412269111810419978382210, 0.5438028800840546885350993, 0.5463737355021068682427603, 0.5489394532609416558499039, 0.5515000092346125858442412, 0.5540553793457104693110943, 0.5566055395655897985264809, 0.5591504659145946930157566, 0.5616901344622843849532002, 0.5642245213276582417822586, 0.5667536026793803239405196, 0.5692773547360034755778519, 0.5717957537661929461605442, 0.5743087760889495408586850, 0.5768163980738322976184566, 0.5793185961411806888254667, 0.5818153467623363454697137, 0.5843066264598643017272666, 0.5867924118077737578782574, 0.5892726794317383594853053, 0.5917474060093159907610475, 0.5942165682701680800580147, 0.5966801429962784154186793, 0.5991381070221714681281111, 0.6015904372351302222163013, 0.6040371105754135078618616, 0.6064781040364728366534687, 0.6089133946651687366701116, 0.6113429595619865853458987, 0.6137667758812519380899084, 0.6161848208313453506363029, 0.6185970716749166931046915, 0.6210035057290989537555048, 0.6234041003657215304299416, 0.6257988330115230076688675, 0.6281876811483634175098794, 0.6305706223134359819666081, 0.6329476340994783351992008, 0.6353186941549832233898213, 0.6376837801844086803419153, 0.6400428699483876768269192, 0.6423959412639372417070377, 0.6447429720046670528676835, 0.6470839401009874959981582, 0.6494188235403171892641570, 0.6517476003672899719207013, 0.6540702486839613549191454, 0.6563867466500144315669620, 0.6586970724829652463040876, 0.6610012044583676196647058, 0.6632991209100174274984589, 0.6655908002301563325302097, 0.6678762208696749663426270, 0.6701553613383155598710345, 0.6724282002048740205051479, 0.6746947160974014538975312, 0.6769548877034051285838219, 0.6792086937700488815250166, 0.6814561131043529626873631, 0.6836971245733933167806834, 0.6859317071045003002812397, 0.6881598396854568318705713, 0.6903815013646959744270519, 0.6925966712514979467122689, 0.6948053285161865628996815, 0.6970074523903250980984011, 0.6992030221669115780303307, 0.7013920172005734910243170, 0.7035744169077619204963997, 0.7057502007669450960906928, 0.7079193483188013616608982, 0.7100818391664115582779368, 0.7122376529754508204546805, 0.7143867694743797837842896, 0.7165291684546352021941915, 0.7186648297708199730232898, 0.7207937333408925681355609, 0.7229158591463558692887801, 0.7250311872324454059827217, 0.7271396977083169940167956, 0.7292413707472337729927181, 0.7313361865867526410034676, 0.7334241255289100847554419, 0.7355051679404074033764222, 0.7375792942527953241676460, 0.7396464849626580085640129, 0.7417067206317964465721772, 0.7437599818874112379620360, 0.7458062494222847584928838, 0.7478455039949627094612890, 0.7498777264299350488635483, 0.7519028976178163024713854, 0.7539209985155252531253957, 0.7559320101464640065565832, 0.7579359136006964320521972, 0.7599326900351259762879594, 0.7619223206736728486546595, 0.7639047868074505764130149, 0.7658800697949419280166093, 0.7678481510621742029486694, 0.7698090121028938864243967, 0.7717626344787406673165402, 0.7737089998194208176678866, 0.7756480898228799321603470, 0.7775798862554750259163361, 0.7795043709521459890141759, 0.7814215258165863961053031, 0.7833313328214136695271245, 0.7852337740083385943114429, 0.7871288314883341834944720, 0.7890164874418038921405657, 0.7908967241187491784979139, 0.7927695238389364107105941, 0.7946348689920631175175217, 0.7964927420379235813750136, 0.7983431255065737724458586, 0.8001860019984956219039900, 0.8020213541847606330100649, 0.8038491648071928284194859, 0.8056694166785310321906380, 0.8074820926825904849673728, 0.8092871757744237908160400, 0.8110846489804811942036542, 0.8128744953987701856100790, 0.8146566981990144342734272, 0.8164312406228120465742028, 0.8181981059837931485700490, 0.8199572776677767911993239, 0.8217087391329271766780945, 0.8234524739099092046215225, 0.8251884656020433364270094, 0.8269166978854597764628854, 0.8286371545092519686128428, 0.8303498192956294067327593, 0.8320546761400697575830038, 0.8337517090114702948057846, 0.8354409019522986425235764, 0.8371222390787428271411563, 0.8387957045808606359402829, 0.8404612827227282810625704, 0.8421189578425883674826439, 0.8437687143529971635802028, 0.8454105367409711729261812, 0.8470444095681330059047621, 0.8486703174708565497995875, 0.8502882451604114359791023, 0.8518981774231068028225812, 0.8535000991204343530350070, 0.8550939951892107040056078, 0.8566798506417190298715048, 0.8582576505658499939545848, 0.8598273801252419702463831, 0.8613890245594205526224495, 0.8629425691839373504743648, 0.8644879993905080694542896, 0.8660253006471498760336444, 0.8675544584983180445842596, 0.8690754585650418856970762, 0.8705882865450599544602407, 0.8720929282129545374252050, 0.8735893694202854169962281, 0.8750775960957229119854680, 0.8765575942451801930826613, 0.8780293499519448719952049, 0.8794928493768098630212838, 0.8809480787582035158255322, 0.8823950244123190181935674, 0.8838336727332430675485994, 0.8852640101930838100201983, 0.8866860233420980458621863, 0.8880996988088177000235219, 0.8895050233001755566829532, 0.8909019836016302565651375, 0.8922905665772905558628607, 0.8936707591700388455969280, 0.8950425484016539302522575, 0.8964059213729330645356690, 0.8977608652638132471078410, 0.8991073673334917701488930, 0.9004454149205460236240486, 0.9017749954430525531228459, 0.9030960963987053701523781, 0.9044087053649335137720782, 0.9057128099990178624646022, 0.9070083980382071951444166, 0.9082954572998335002127549, 0.9095739756814265315746820, 0.9108439411608276105410847, 0.9121053417963026725455006, 0.9133581657266545576127977, 0.9146024011713345435238301, 0.9158380364305531206273175, 0.9170650598853900072573273, 0.9182834599979034047218800, 0.9194932253112384908353520, 0.9206943444497351509745089, 0.9218868061190349456451742, 0.9230705991061873135537215, 0.9242457122797550091847637, 0.9254121345899187738936182, 0.9265698550685812395293315, 0.9277188628294700636112689, 0.9288591470682402950895005, 0.9299906970625759697264543, 0.9311135021722909341445515, 0.9322275518394288975917975, 0.9333328355883627104845635, 0.9344293430258928687940732, 0.9355170638413452433503852, 0.9365959878066680331449597, 0.9376661047765279417201973, 0.9387274046884055757416456, 0.9397798775626900648558921, 0.9408235135027729019444869, 0.9418583026951410028915762, 0.9428842354094689849902736, 0.9439013019987106631201510, 0.9449094928991897628355911, 0.9459087986306898495121205, 0.9468992097965434727052183, 0.9478807170837205248834878, 0.9488533112629158137054760, 0.9498169831886358470168335, 0.9507717237992848297519245, 0.9517175241172498719314184, 0.9526543752489854069548347, 0.9535822683850968193944507, 0.9545011948004232815044368, 0.9554111458541197976665483, 0.9563121129897384560011695, 0.9572040877353088863799924, 0.9580870617034179240840996, 0.9589610265912884783587268, 0.9598259741808576051234879, 0.9606818963388537831043733, 0.9615287850168733926613630, 0.9623666322514563965930439, 0.9631954301641612222071790, 0.9640151709616388439537466, 0.9648258469357060659245549, 0.9656274504634180035311332, 0.9664199740071397636802195, 0.9672034101146173227737943, 0.9679777514190476018682591, 0.9687429906391477383350273, 0.9694991205792235533724866, 0.9702461341292372147270016, 0.9709840242648740939883669, 0.9717127840476088178328839, 0.9724324066247705125950353, 0.9731428852296072415565604, 0.9738442131813496343496072, 0.9745363838852737078785517, 0.9752193908327628781730396, 0.9758932276013691625928266, 0.9765578878548735718130775, 0.9772133653433456910269459, 0.9778596539032024498104955, 0.9784967474572660801033674, 0.9791246400148212617670490, 0.9797433256716714551911835, 0.9803527986101944204270933, 0.9809530530993969223366037, 0.9815440834949686212533729, 0.9821258842393351486632952, 0.9826984498617103674201996, 0.9832617749781478160230522, 0.9838158542915913364912672, 0.9843606825919248853856025, 0.9848962547560215275335618, 0.9854225657477916120303537, 0.9859396106182301300994116, 0.9864473845054632544104222, 0.9869458826347940594679517, 0.9874351003187474227003598, 0.9879150329571141058970610, 0.9883856760369940166627304, 0.9888470251328386495802522, 0.9892990759064927068006818, 0.9897418241072348978090276, 0.9901752655718179181502248, 0.9905993962245076069415402, 0.9910142120771212830473891, 0.9914197092290652598522332, 0.9918158838673715386394944, 0.9922027322667336806727008, 0.9925802507895418581838653, 0.9929484358859170846092543, 0.9933072840937446245820355, 0.9936567920387065844051246, 0.9939969564343136839997662, 0.9943277740819362116746914, 0.9946492418708341635125525, 0.9949613567781865697596566, 0.9952641158691200113800912, 0.9955575162967363309635588, 0.9958415553021395435525955, 0.9961162302144619548145649, 0.9963815384508894965215124, 0.9966374775166862927999356, 0.9968840450052184754903082, 0.9971212385979772738362093, 0.9973490560646014135491635, 0.9975674952628988745188845, 0.9977765541388680773265018, 0.9979762307267185998745420, 0.9981665231488915727109186, 0.9983474296160799746514418, 0.9985189484272491654281575, 0.9986810779696581776171579, 0.9988338167188825964389443, 0.9989771632388403756649803, 0.9991111161818228462260355, 0.9992356742885348165163858, 0.9993508363881507486653971, 0.9994566013984000492749057, 0.9995529683257070064969677, 0.9996399362654382464576482, 0.9997175044023747284307007, 0.9997856720116889628341744, 0.9998444384611711916084367, 0.9998938032169419878731474, 0.9999337658606177711221103, 0.9999643261538894550943330, 0.9999854843850284447675914, 0.9999972450545584403516182}; + static double w1024[512] = {0.0030664603092439082115513, 0.0030664314747171934849726, 0.0030663738059349007324470, 0.0030662873034393008056861, 0.0030661719680437936084028, 0.0030660278008329004477528, 0.0030658548031622538363679, 0.0030656529766585847450783, 0.0030654223232197073064431, 0.0030651628450145009692318, 0.0030648745444828901040266, 0.0030645574243358210601357, 0.0030642114875552366740338, 0.0030638367373940482295700, 0.0030634331773761048702058, 0.0030630008112961604635720, 0.0030625396432198379186545, 0.0030620496774835909559465, 0.0030615309186946633309249, 0.0030609833717310455112352, 0.0030604070417414288079918, 0.0030598019341451569616257, 0.0030591680546321751827342, 0.0030585054091629766484119, 0.0030578140039685464545661, 0.0030570938455503030247440, 0.0030563449406800369760227, 0.0030555672963998474425352, 0.0030547609200220758572342, 0.0030539258191292371925135, 0.0030530620015739486603347, 0.0030521694754788558725307, 0.0030512482492365564619779, 0.0030502983315095211653578, 0.0030493197312300123682482, 0.0030483124576000001133114, 0.0030472765200910755723677, 0.0030462119284443619831693, 0.0030451186926704230517109, 0.0030439968230491688209395, 0.0030428463301297590067471, 0.0030416672247305038021562, 0.0030404595179387621506312, 0.0030392232211108374894710, 0.0030379583458718709642643, 0.0030366649041157321154111, 0.0030353429080049070377385, 0.0030339923699703840142628, 0.0030326133027115366251721, 0.0030312057191960043331307, 0.0030297696326595705460252, 0.0030283050566060381583022, 0.0030268120048071025720655, 0.0030252904913022221991274, 0.0030237405303984864452325, 0.0030221621366704811776946, 0.0030205553249601516777118, 0.0030189201103766630786495, 0.0030172565082962582916016, 0.0030155645343621134195681, 0.0030138442044841906616068, 0.0030120955348390887083441, 0.0030103185418698906302495, 0.0030085132422860092601062, 0.0030066796530630300711306, 0.0030048177914425515522176, 0.0030029276749320230818149, 0.0030010093213045803019478, 0.0029990627485988779939449, 0.0029970879751189204574353, 0.0029950850194338893942123, 0.0029930539003779692985814, 0.0029909946370501703558363, 0.0029889072488141488505262, 0.0029867917552980250862041, 0.0029846481763941988183689, 0.0029824765322591622023349, 0.0029802768433133102577897, 0.0029780491302407488518214, 0.0029757934139891002022209, 0.0029735097157693059028890, 0.0029711980570554274731990, 0.0029688584595844444331918, 0.0029664909453560499065010, 0.0029640955366324437529314, 0.0029616722559381232326340, 0.0029592211260596712038487, 0.0029567421700455418562030, 0.0029542354112058439815854, 0.0029517008731121217846274, 0.0029491385795971332348581, 0.0029465485547546259626151, 0.0029439308229391107008170, 0.0029412854087656322747309, 0.0029386123371095381418860, 0.0029359116331062444843108, 0.0029331833221509998552933, 0.0029304274298986463828860, 0.0029276439822633785324025, 0.0029248330054184994301727, 0.0029219945257961747508486, 0.0029191285700871841705750, 0.0029162351652406703883623, 0.0029133143384638857180205, 0.0029103661172219362530391, 0.0029073905292375236068160, 0.0029043876024906842306667, 0.0029013573652185263120627, 0.0028982998459149642555740, 0.0028952150733304507490135, 0.0028921030764717064173001, 0.0028889638846014470665859, 0.0028857975272381085212091, 0.0028826040341555690560623, 0.0028793834353828694269858, 0.0028761357612039305018167, 0.0028728610421572684947521, 0.0028695593090357078067012, 0.0028662305928860914743281, 0.0028628749250089892305081, 0.0028594923369584031789413, 0.0028560828605414710856927, 0.0028526465278181672904478, 0.0028491833711010012402964, 0.0028456934229547136488796, 0.0028421767161959702837564, 0.0028386332838930533848701, 0.0028350631593655507170153, 0.0028314663761840422592303, 0.0028278429681697845340603, 0.0028241929693943925796601, 0.0028205164141795195677262, 0.0028168133370965340702726, 0.0028130837729661949782821, 0.0028093277568583240752928, 0.0028055453240914762689974, 0.0028017365102326074839556, 0.0027979013510967402185435, 0.0027940398827466267692845, 0.0027901521414924101257281, 0.0027862381638912825390663, 0.0027822979867471417676962, 0.0027783316471102450029635, 0.0027743391822768604783394, 0.0027703206297889167653083, 0.0027662760274336497592617, 0.0027622054132432473587211, 0.0027581088254944918412282, 0.0027539863027083999392661, 0.0027498378836498606195970, 0.0027456636073272705694208, 0.0027414635129921673927833, 0.0027372376401388605206822, 0.0027329860285040598383428, 0.0027287087180665020331547, 0.0027244057490465746667821, 0.0027200771619059379749851, 0.0027157229973471443987056, 0.0027113432963132558499974, 0.0027069380999874587163979, 0.0027025074497926766073634, 0.0026980513873911808464073, 0.0026935699546841987126055, 0.0026890631938115194351518, 0.0026845311471510979446691, 0.0026799738573186563850015, 0.0026753913671672833892344, 0.0026707837197870311237119, 0.0026661509585045101038391, 0.0026614931268824817854798, 0.0026568102687194489357814, 0.0026521024280492437872770, 0.0026473696491406139791397, 0.0026426119764968062894804, 0.0026378294548551481626046, 0.0026330221291866270351630, 0.0026281900446954674651512, 0.0026233332468187060677353, 0.0026184517812257642618999, 0.0026135456938180188319369, 0.0026086150307283703078113, 0.0026036598383208091684657, 0.0025986801631899798721388, 0.0025936760521607427178014, 0.0025886475522877335418257, 0.0025835947108549212540321, 0.0025785175753751632172710, 0.0025734161935897584747222, 0.0025682906134679988291122, 0.0025631408832067177780710, 0.0025579670512298373098703, 0.0025527691661879125638030, 0.0025475472769576743594882, 0.0025423014326415695994010, 0.0025370316825672995489502, 0.0025317380762873559984451, 0.0025264206635785553113127, 0.0025210794944415703629476, 0.0025157146191004603745948, 0.0025103260880021986466869, 0.0025049139518161981960773, 0.0024994782614338353016280, 0.0024940190679679709626349, 0.0024885364227524702745874, 0.0024830303773417197267843, 0.0024775009835101424263432, 0.0024719482932517112531633, 0.0024663723587794599504176, 0.0024607732325249921551741, 0.0024551509671379883737605, 0.0024495056154857109065099, 0.0024438372306525067265426, 0.0024381458659393083172574, 0.0024324315748631324732279, 0.0024266944111565770692147, 0.0024209344287673158020275, 0.0024151516818575909099866, 0.0024093462248037038747545, 0.0024035181121955041103265, 0.0023976673988358756439882, 0.0023917941397402217940673, 0.0023858983901359478493246, 0.0023799802054619417548485, 0.0023740396413680528093376, 0.0023680767537145683786720, 0.0023620915985716886306938, 0.0023560842322189992961374, 0.0023500547111449424606655, 0.0023440030920462853929883, 0.0023379294318275874140606, 0.0023318337876006648123684, 0.0023257162166840538103394, 0.0023195767766024715869239, 0.0023134155250862753614165, 0.0023072325200709195436049, 0.0023010278196964109553481, 0.0022948014823067621287099, 0.0022885535664494426857857, 0.0022822841308748288053830, 0.0022759932345356507817318, 0.0022696809365864386804193, 0.0022633472963829660967620, 0.0022569923734816920218464, 0.0022506162276392008214839, 0.0022442189188116403333494, 0.0022378005071541580875846, 0.0022313610530203356561684, 0.0022249006169616211363732, 0.0022184192597267597736437, 0.0022119170422612227292520, 0.0022053940257066339981005, 0.0021988502714001954820607, 0.0021922858408741102242558, 0.0021857007958550038097087, 0.0021790951982633439377969, 0.0021724691102128581719720, 0.0021658225940099498722195, 0.0021591557121531123157498, 0.0021524685273323410114303, 0.0021457611024285442134846, 0.0021390335005129516400021, 0.0021322857848465214018174, 0.0021255180188793451473363, 0.0021187302662500514289029, 0.0021119225907852072963166, 0.0021050950564987181231273, 0.0020982477275912256713511, 0.0020913806684495044002679, 0.0020844939436458560249764, 0.0020775876179375023304007, 0.0020706617562659762464561, 0.0020637164237565111901030, 0.0020567516857174286800274, 0.0020497676076395242297101, 0.0020427642551954515246552, 0.0020357416942391048895728, 0.0020286999908050000513193, 0.0020216392111076532034194, 0.0020145594215409583780096, 0.0020074606886775631310555, 0.0020003430792682425467160, 0.0019932066602412715667394, 0.0019860514987017956507927, 0.0019788776619311997736447, 0.0019716852173864757651327, 0.0019644742326995879988655, 0.0019572447756768374356240, 0.0019499969142982240274419, 0.0019427307167168074883601, 0.0019354462512580664378677, 0.0019281435864192559230531, 0.0019208227908687633255086, 0.0019134839334454626590447, 0.0019061270831580672642844, 0.0018987523091844809062265, 0.0018913596808711472808775, 0.0018839492677323979370705, 0.0018765211394497986196010, 0.0018690753658714940398285, 0.0018616120170115510799024, 0.0018541311630493004367905, 0.0018466328743286767122991, 0.0018391172213575569552912, 0.0018315842748070976623218, 0.0018240341055110702429247, 0.0018164667844651949558009, 0.0018088823828264733221690, 0.0018012809719125190225581, 0.0017936626232008872833327, 0.0017860274083284027592567, 0.0017783753990904859184165, 0.0017707066674404779358362, 0.0017630212854889641021349, 0.0017553193255030957535871, 0.0017476008599059107299616, 0.0017398659612756523665312, 0.0017321147023450870266539, 0.0017243471560008201813452, 0.0017165633952826110422716, 0.0017087634933826857546100, 0.0017009475236450491562317, 0.0016931155595647951096823, 0.0016852676747874154134422, 0.0016774039431081072989678, 0.0016695244384710795200224, 0.0016616292349688570408253, 0.0016537184068415843295541, 0.0016457920284763272637533, 0.0016378501744063736542136, 0.0016298929193105323938983, 0.0016219203380124312385075, 0.0016139325054798132252838, 0.0016059294968238317366751, 0.0015979113872983442154825, 0.0015898782522992045381361, 0.0015818301673635540527516, 0.0015737672081691112886347, 0.0015656894505334603439125, 0.0015575969704133379579831, 0.0015494898439039192754876, 0.0015413681472381023085203, 0.0015332319567857911038062, 0.0015250813490531776215856, 0.0015169164006820223329593, 0.0015087371884489335424584, 0.0015005437892646454426166, 0.0014923362801732949073323, 0.0014841147383516970308228, 0.0014758792411086194189814, 0.0014676298658840552399621, 0.0014593666902484950408286, 0.0014510897919021973371136, 0.0014427992486744579821480, 0.0014344951385228783230315, 0.0014261775395326321501237, 0.0014178465299157314469528, 0.0014095021880102909474427, 0.0014011445922797915073771, 0.0013927738213123422970256, 0.0013843899538199418218713, 0.0013759930686377377783877, 0.0013675832447232857518263, 0.0013591605611558067629844, 0.0013507250971354436709363, 0.0013422769319825164387192, 0.0013338161451367762689788, 0.0013253428161566586165863, 0.0013168570247185350852537, 0.0013083588506159642151809, 0.0012998483737589411687807, 0.0012913256741731463215379, 0.0012827908319991927650686, 0.0012742439274918727294554, 0.0012656850410194029319476, 0.0012571142530626688591208, 0.0012485316442144679896043, 0.0012399372951787519644928, 0.0012313312867698677125706, 0.0012227136999117975374834, 0.0012140846156373981740056, 0.0012054441150876388205601, 0.0011967922795108381551550, 0.0011881291902619003419159, 0.0011794549288015500353964, 0.0011707695766955663898644, 0.0011620732156140160807669, 0.0011533659273304853455891, 0.0011446477937213110513287, 0.0011359188967648107958214, 0.0011271793185405120501566, 0.0011184291412283803494364, 0.0011096684471080465391373, 0.0011008973185580330843445, 0.0010921158380549794491381, 0.0010833240881728665534171, 0.0010745221515822403144596, 0.0010657101110494342805238, 0.0010568880494357913638046, 0.0010480560496968846800697, 0.0010392141948817375023057, 0.0010303625681320423357186, 0.0010215012526813791214350, 0.0010126303318544325762649, 0.0010037498890662086758941, 0.0009948600078212502888805, 0.0009859607717128519688418, 0.0009770522644222739122264, 0.0009681345697179550890732, 0.0009592077714547255541688, 0.0009502719535730179460261, 0.0009413272000980781811114, 0.0009323735951391753507612, 0.0009234112228888108282347, 0.0009144401676219265933610, 0.0009054605136951127822476, 0.0008964723455458144695262, 0.0008874757476915376906225, 0.0008784708047290547115472, 0.0008694576013336085537138, 0.0008604362222581167813022, 0.0008514067523323745586954, 0.0008423692764622569855308, 0.0008333238796289207169173, 0.0008242706468880048763834, 0.0008152096633688312691343, 0.0008061410142736039032099, 0.0007970647848766078261514, 0.0007879810605234072847989, 0.0007788899266300432158601, 0.0007697914686822300749096, 0.0007606857722345520114971, 0.0007515729229096583980656, 0.0007424530063974587204051, 0.0007333261084543168373926, 0.0007241923149022446178008, 0.0007150517116280949619884, 0.0007059043845827542163241, 0.0006967504197803339882351, 0.0006875899032973623698204, 0.0006784229212719745780188, 0.0006692495599031030193850, 0.0006600699054496667875923, 0.0006508840442297606018626, 0.0006416920626198431946113, 0.0006324940470539251567018, 0.0006232900840227562488244, 0.0006140802600730121876541, 0.0006048646618064809156059, 0.0005956433758792483631993, 0.0005864164890008837132649, 0.0005771840879336241764943, 0.0005679462594915592881427, 0.0005587030905398147360662, 0.0005494546679937357307118, 0.0005402010788180699282026, 0.0005309424100261499182844, 0.0005216787486790752896494, 0.0005124101818848942860548, 0.0005031367967977850677401, 0.0004938586806172365939677, 0.0004845759205872291441124, 0.0004752886039954144966810, 0.0004659968181722957880391, 0.0004567006504904070755681, 0.0004474001883634926336095, 0.0004380955192456860150653, 0.0004287867306306889171352, 0.0004194739100509498966958, 0.0004101571450768429896514, 0.0004008365233158462997325, 0.0003915121324117206363681, 0.0003821840600436882993131, 0.0003728523939256121308821, 0.0003635172218051749865499, 0.0003541786314630598135175, 0.0003448367107121305776064, 0.0003354915473966143456333, 0.0003261432293912849189248, 0.0003167918446006485317858, 0.0003074374809581322877037, 0.0002980802264252762217455, 0.0002887201689909301727620, 0.0002793573966704570567274, 0.0002699919975049447012834, 0.0002606240595604292032823, 0.0002512536709271339139118, 0.0002418809197187298044384, 0.0002325058940716253739001, 0.0002231286821442978268308, 0.0002137493721166826096154, 0.0002043680521896465790359, 0.0001949848105845827899210, 0.0001855997355431850062940, 0.0001762129153274925249194, 0.0001668244382203495280013, 0.0001574343925265138930609, 0.0001480428665748079976500, 0.0001386499487219861751244, 0.0001292557273595155266326, 0.0001198602909254695827354, 0.0001104637279257437565603, 0.0001010661269730276014588, 0.0000916675768613669107254, 0.0000822681667164572752810, 0.0000728679863190274661367, 0.0000634671268598044229933, 0.0000540656828939400071988, 0.0000446637581285753393838, 0.0000352614859871986975067, 0.0000258591246764618586716, 0.0000164577275798968681068, 0.0000070700764101825898713}; + + /* n = 3 */ + static double x3[2] = {0.0000000000000000000000000, 0.7745966692414833770358531}; + static double w3[2] = {0.8888888888888888888888889, 0.5555555555555555555555556}; + + /* n = 5 */ + static double x5[3] = {0.0000000000000000000000000, 0.5384693101056830910363144, 0.9061798459386639927976269}; + static double w5[3] = {0.5688888888888888888888889, 0.4786286704993664680412915, 0.2369268850561890875142640}; + + /* n = 7 */ + static double x7[4] = {0.0000000000000000000000000, 0.4058451513773971669066064, 0.7415311855993944398638648, 0.9491079123427585245261897}; + static double w7[4] = {0.4179591836734693877551020, 0.3818300505051189449503698, 0.2797053914892766679014678, 0.1294849661688696932706114}; + + /* n = 9 */ + static double x9[5] = {0.0000000000000000000000000, 0.3242534234038089290385380, 0.6133714327005903973087020, 0.8360311073266357942994298, 0.9681602395076260898355762}; + static double w9[5] = {0.3302393550012597631645251, 0.3123470770400028400686304, 0.2606106964029354623187429, 0.1806481606948574040584720, 0.0812743883615744119718922}; + + /* n = 11 */ + static double x11[6] = {0.0000000000000000000000000, 0.2695431559523449723315320, 0.5190961292068118159257257, 0.7301520055740493240934163, 0.8870625997680952990751578, 0.9782286581460569928039380}; + static double w11[6] = {0.2729250867779006307144835, 0.2628045445102466621806889, 0.2331937645919904799185237, 0.1862902109277342514260976, 0.1255803694649046246346943, 0.0556685671161736664827537}; + + /* n = 13 */ + static double x13[7] = {0.0000000000000000000000000, 0.2304583159551347940655281, 0.4484927510364468528779129, 0.6423493394403402206439846, 0.8015780907333099127942065, 0.9175983992229779652065478, 0.9841830547185881494728294}; + static double w13[7] = {0.2325515532308739101945895, 0.2262831802628972384120902, 0.2078160475368885023125232, 0.1781459807619457382800467, 0.1388735102197872384636018, 0.0921214998377284479144218, 0.0404840047653158795200216}; + + /* n = 15 */ + static double x15[8] = {0.0000000000000000000000000, 0.2011940939974345223006283, 0.3941513470775633698972074, 0.5709721726085388475372267, 0.7244177313601700474161861, 0.8482065834104272162006483, 0.9372733924007059043077589, 0.9879925180204854284895657}; + static double w15[8] = {0.2025782419255612728806202, 0.1984314853271115764561183, 0.1861610000155622110268006, 0.1662692058169939335532009, 0.1395706779261543144478048, 0.1071592204671719350118695, 0.0703660474881081247092674, 0.0307532419961172683546284}; + + /* n = 17 */ + static double x17[9] = {0.0000000000000000000000000, 0.1784841814958478558506775, 0.3512317634538763152971855, 0.5126905370864769678862466, 0.6576711592166907658503022, 0.7815140038968014069252301, 0.8802391537269859021229557, 0.9506755217687677612227170, 0.9905754753144173356754340}; + static double w17[9] = {0.1794464703562065254582656, 0.1765627053669926463252710, 0.1680041021564500445099707, 0.1540457610768102880814316, 0.1351363684685254732863200, 0.1118838471934039710947884, 0.0850361483171791808835354, 0.0554595293739872011294402, 0.0241483028685479319601100}; + + /* n = 19 */ + static double x19[10] = {0.0000000000000000000000000, 0.1603586456402253758680961, 0.3165640999636298319901173, 0.4645707413759609457172671, 0.6005453046616810234696382, 0.7209661773352293786170959, 0.8227146565371428249789225, 0.9031559036148179016426609, 0.9602081521348300308527788, 0.9924068438435844031890177}; + static double w19[10] = {0.1610544498487836959791636, 0.1589688433939543476499564, 0.1527660420658596667788554, 0.1426067021736066117757461, 0.1287539625393362276755158, 0.1115666455473339947160239, 0.0914900216224499994644621, 0.0690445427376412265807083, 0.0448142267656996003328382, 0.0194617882297264770363120}; + + /* Merge all together */ + static gsl_integration_glfixed_table glaw[] = + { + { 2, x2, w2, 1 /* precomputed */ }, + { 3, x3, w3, 1 }, + { 4, x4, w4, 1 }, + { 5, x5, w5, 1 }, + { 6, x6, w6, 1 }, + { 7, x7, w7, 1 }, + { 8, x8, w8, 1 }, + { 9, x9, w9, 1 }, + { 10, x10, w10, 1 }, + { 11, x11, w11, 1 }, + { 12, x12, w12, 1 }, + { 13, x13, w13, 1 }, + { 14, x14, w14, 1 }, + { 15, x15, w15, 1 }, + { 16, x16, w16, 1 }, + { 17, x17, w17, 1 }, + { 18, x18, w18, 1 }, + { 19, x19, w19, 1 }, + { 20, x20, w20, 1 }, + { 32, x32, w32, 1 }, + { 64, x64, w64, 1 }, + { 96, x96, w96, 1 }, + { 100, x100, w100, 1 }, + { 128, x128, w128, 1 }, + { 256, x256, w256, 1 }, + { 512, x512, w512, 1 }, + { 1024, x1024, w1024, 1 } + }; + static const size_t GLAWSIZE = sizeof(glaw)/sizeof(glaw[0]); + + + gsl_integration_glfixed_table * + gsl_integration_glfixed_table_alloc (size_t n) + { + int i; + double *x = 0; + double *w = 0; + gsl_integration_glfixed_table * retval = 0; + + /* Kludgy error check: indices in the original algorithm use ints but GSL + * conventions are to take a size_t parameter for n */ + if (n > INT_MAX) + { + GSL_ERROR_NULL ("Requested n is too large", GSL_EINVAL); + } + + /* Use a predefined table of size n if possible */ + for (i = 0; i < GLAWSIZE;i++) + { + if (n == glaw[i].n) + { + retval = &glaw[i]; + break; + } + } + + /* No predefined table is available. Generate one on the fly. */ + if (retval == 0) + { + const int m = (n + 1) >> 1; + + x = (double *) malloc(m * sizeof(double)); + if (x == 0) + { + GSL_ERROR_NULL ("failed to allocate space for abscissae", + GSL_ENOMEM); + } + + w = (double *) malloc(m * sizeof(double)); + if (w == 0) + { + free(x); + GSL_ERROR_NULL ("failed to allocate space for weights", + GSL_ENOMEM); + } + + retval = malloc(sizeof(gsl_integration_glfixed_table)); + if (retval == 0) + { + free(x); + free(w); + GSL_ERROR_NULL ("failed to allocate space for table struct", + GSL_ENOMEM); + } + + gauss_legendre_tbl(n, x, w, 1e-10 /* precision magic number */); + + retval->n = n; + retval->x = x; + retval->w = w; + retval->precomputed = 0; + } + + return retval; + } + + void + gsl_integration_glfixed_table_free (gsl_integration_glfixed_table * t) + { + /* We only free the table memory if we allocated it */ + /* Leave precomputed, static tables alone */ + if (! t->precomputed) + { + free(t->x); + free(t->w); + free(t); + } + } + + /* + Gauss-Legendre n-points quadrature, exact for polynomial of degree <=2n-1 + + 1. n - even: + + int(f(t),t=a..b) = A*sum(w[i]*f(A*x[i]+B),i=0..n-1) + = A*sum(w[k]*[f(B+A*x[k])+f(B-A*x[k])],k=0..n/2-1) + A = (b-a)/2, + B = (a+b)/2 + + + 2. n - odd: + + int(f(t),t=a..b) = A*sum(w[i]*f(A*x[i]+B),i=0..n-1) + = A*w[0]*f(B)+A*sum(w[k]*[f(B+A*x[k])+f(B-A*x[k])],k=1..(n-1)/2) + A = (b-a)/2, + B = (a+b)/2 + */ + + double + gsl_integration_glfixed (const gsl_function *f, + double a, + double b, + const gsl_integration_glfixed_table * t) + { + const double * const x = t->x; + const double * const w = t->w; + const int n = t->n; + double A, B, Ax, s; + int i, m; + + m = (n + 1) >> 1; + A = 0.5 * (b - a); + B = 0.5 * (b + a); + + if (n&1) /* n - odd */ + { + s = w[0] * GSL_FN_EVAL(f,B); + + for (i = 1;i < m;i++) + { + Ax = A * x[i]; + s += w[i] * (GSL_FN_EVAL(f,B+Ax) + GSL_FN_EVAL(f,B-Ax)); + } + + } + else /* n - even */ + { + + s = 0.0; + + for (i = 0;i < m;i++) + { + Ax = A * x[i]; + s += w[i] * (GSL_FN_EVAL(f,B+Ax) + GSL_FN_EVAL(f,B-Ax)); + } + } + + return A*s; + } + + /* Computing of abscissas and weights for Gauss-Legendre quadrature for any(reasonable) order n + [in] n - order of quadrature + [in] eps - required precision (must be eps>=macheps(double), usually eps = 1e-10 is ok) + [out]x - abscisass, size = (n+1)>>1 + [out]w - weights, size = (n+1)>>1 + */ + + /* Look up table for fast calculation of Legendre polynomial for n<1024 */ + /* ltbl[k] = 1.0 - 1.0/(double)k; */ + static double ltbl[1024] = {0.00000000000000000000, 0.00000000000000000000, 0.50000000000000000000, 0.66666666666666674000, 0.75000000000000000000, 0.80000000000000004000, 0.83333333333333337000, 0.85714285714285721000, 0.87500000000000000000, 0.88888888888888884000, 0.90000000000000002000, 0.90909090909090906000, 0.91666666666666663000, 0.92307692307692313000, 0.92857142857142860000, 0.93333333333333335000, 0.93750000000000000000, 0.94117647058823528000, 0.94444444444444442000, 0.94736842105263164000, 0.94999999999999996000, 0.95238095238095233000, 0.95454545454545459000, 0.95652173913043481000, 0.95833333333333337000, 0.95999999999999996000, 0.96153846153846156000, 0.96296296296296302000, 0.96428571428571430000, 0.96551724137931039000, 0.96666666666666667000, 0.96774193548387100000, 0.96875000000000000000, 0.96969696969696972000, 0.97058823529411764000, 0.97142857142857142000, 0.97222222222222221000, 0.97297297297297303000, 0.97368421052631582000, 0.97435897435897434000, 0.97499999999999998000, 0.97560975609756095000, 0.97619047619047616000, 0.97674418604651159000, 0.97727272727272729000, 0.97777777777777775000, 0.97826086956521741000, 0.97872340425531912000, 0.97916666666666663000, 0.97959183673469385000, 0.97999999999999998000, 0.98039215686274506000, 0.98076923076923073000, 0.98113207547169812000, 0.98148148148148151000, 0.98181818181818181000, 0.98214285714285710000, 0.98245614035087714000, 0.98275862068965514000, 0.98305084745762716000, 0.98333333333333328000, 0.98360655737704916000, 0.98387096774193550000, 0.98412698412698418000, 0.98437500000000000000, 0.98461538461538467000, 0.98484848484848486000, 0.98507462686567160000, 0.98529411764705888000, 0.98550724637681164000, 0.98571428571428577000, 0.98591549295774650000, 0.98611111111111116000, 0.98630136986301364000, 0.98648648648648651000, 0.98666666666666669000, 0.98684210526315785000, 0.98701298701298701000, 0.98717948717948723000, 0.98734177215189878000, 0.98750000000000004000, 0.98765432098765427000, 0.98780487804878048000, 0.98795180722891562000, 0.98809523809523814000, 0.98823529411764710000, 0.98837209302325579000, 0.98850574712643680000, 0.98863636363636365000, 0.98876404494382020000, 0.98888888888888893000, 0.98901098901098905000, 0.98913043478260865000, 0.98924731182795700000, 0.98936170212765961000, 0.98947368421052628000, 0.98958333333333337000, 0.98969072164948457000, 0.98979591836734693000, 0.98989898989898994000, 0.98999999999999999000, 0.99009900990099009000, 0.99019607843137258000, 0.99029126213592233000, 0.99038461538461542000, 0.99047619047619051000, 0.99056603773584906000, 0.99065420560747663000, 0.99074074074074070000, 0.99082568807339455000, 0.99090909090909096000, 0.99099099099099097000, 0.99107142857142860000, 0.99115044247787609000, 0.99122807017543857000, 0.99130434782608701000, 0.99137931034482762000, 0.99145299145299148000, 0.99152542372881358000, 0.99159663865546221000, 0.99166666666666670000, 0.99173553719008267000, 0.99180327868852458000, 0.99186991869918695000, 0.99193548387096775000, 0.99199999999999999000, 0.99206349206349209000, 0.99212598425196852000, 0.99218750000000000000, 0.99224806201550386000, 0.99230769230769234000, 0.99236641221374045000, 0.99242424242424243000, 0.99248120300751874000, 0.99253731343283580000, 0.99259259259259258000, 0.99264705882352944000, 0.99270072992700731000, 0.99275362318840576000, 0.99280575539568350000, 0.99285714285714288000, 0.99290780141843971000, 0.99295774647887325000, 0.99300699300699302000, 0.99305555555555558000, 0.99310344827586206000, 0.99315068493150682000, 0.99319727891156462000, 0.99324324324324320000, 0.99328859060402686000, 0.99333333333333329000, 0.99337748344370858000, 0.99342105263157898000, 0.99346405228758172000, 0.99350649350649356000, 0.99354838709677418000, 0.99358974358974361000, 0.99363057324840764000, 0.99367088607594933000, 0.99371069182389937000, 0.99375000000000002000, 0.99378881987577639000, 0.99382716049382713000, 0.99386503067484666000, 0.99390243902439024000, 0.99393939393939390000, 0.99397590361445787000, 0.99401197604790414000, 0.99404761904761907000, 0.99408284023668636000, 0.99411764705882355000, 0.99415204678362579000, 0.99418604651162790000, 0.99421965317919070000, 0.99425287356321834000, 0.99428571428571433000, 0.99431818181818177000, 0.99435028248587576000, 0.99438202247191010000, 0.99441340782122900000, 0.99444444444444446000, 0.99447513812154698000, 0.99450549450549453000, 0.99453551912568305000, 0.99456521739130432000, 0.99459459459459465000, 0.99462365591397850000, 0.99465240641711228000, 0.99468085106382975000, 0.99470899470899465000, 0.99473684210526314000, 0.99476439790575921000, 0.99479166666666663000, 0.99481865284974091000, 0.99484536082474229000, 0.99487179487179489000, 0.99489795918367352000, 0.99492385786802029000, 0.99494949494949492000, 0.99497487437185927000, 0.99500000000000000000, 0.99502487562189057000, 0.99504950495049505000, 0.99507389162561577000, 0.99509803921568629000, 0.99512195121951219000, 0.99514563106796117000, 0.99516908212560384000, 0.99519230769230771000, 0.99521531100478466000, 0.99523809523809526000, 0.99526066350710896000, 0.99528301886792447000, 0.99530516431924887000, 0.99532710280373837000, 0.99534883720930234000, 0.99537037037037035000, 0.99539170506912444000, 0.99541284403669728000, 0.99543378995433796000, 0.99545454545454548000, 0.99547511312217196000, 0.99549549549549554000, 0.99551569506726456000, 0.99553571428571430000, 0.99555555555555553000, 0.99557522123893805000, 0.99559471365638763000, 0.99561403508771928000, 0.99563318777292575000, 0.99565217391304350000, 0.99567099567099571000, 0.99568965517241381000, 0.99570815450643779000, 0.99572649572649574000, 0.99574468085106382000, 0.99576271186440679000, 0.99578059071729963000, 0.99579831932773111000, 0.99581589958159000000, 0.99583333333333335000, 0.99585062240663902000, 0.99586776859504134000, 0.99588477366255146000, 0.99590163934426235000, 0.99591836734693873000, 0.99593495934959353000, 0.99595141700404854000, 0.99596774193548387000, 0.99598393574297184000, 0.99600000000000000000, 0.99601593625498008000, 0.99603174603174605000, 0.99604743083003955000, 0.99606299212598426000, 0.99607843137254903000, 0.99609375000000000000, 0.99610894941634243000, 0.99612403100775193000, 0.99613899613899615000, 0.99615384615384617000, 0.99616858237547889000, 0.99618320610687028000, 0.99619771863117867000, 0.99621212121212122000, 0.99622641509433962000, 0.99624060150375937000, 0.99625468164794007000, 0.99626865671641796000, 0.99628252788104088000, 0.99629629629629635000, 0.99630996309963105000, 0.99632352941176472000, 0.99633699633699635000, 0.99635036496350360000, 0.99636363636363634000, 0.99637681159420288000, 0.99638989169675085000, 0.99640287769784175000, 0.99641577060931896000, 0.99642857142857144000, 0.99644128113879005000, 0.99645390070921991000, 0.99646643109540634000, 0.99647887323943662000, 0.99649122807017543000, 0.99650349650349646000, 0.99651567944250874000, 0.99652777777777779000, 0.99653979238754320000, 0.99655172413793103000, 0.99656357388316152000, 0.99657534246575341000, 0.99658703071672350000, 0.99659863945578231000, 0.99661016949152548000, 0.99662162162162160000, 0.99663299663299665000, 0.99664429530201337000, 0.99665551839464883000, 0.99666666666666670000, 0.99667774086378735000, 0.99668874172185429000, 0.99669966996699666000, 0.99671052631578949000, 0.99672131147540988000, 0.99673202614379086000, 0.99674267100977199000, 0.99675324675324672000, 0.99676375404530748000, 0.99677419354838714000, 0.99678456591639875000, 0.99679487179487181000, 0.99680511182108622000, 0.99681528662420382000, 0.99682539682539684000, 0.99683544303797467000, 0.99684542586750791000, 0.99685534591194969000, 0.99686520376175547000, 0.99687499999999996000, 0.99688473520249221000, 0.99689440993788825000, 0.99690402476780182000, 0.99691358024691357000, 0.99692307692307691000, 0.99693251533742333000, 0.99694189602446481000, 0.99695121951219512000, 0.99696048632218848000, 0.99696969696969695000, 0.99697885196374625000, 0.99698795180722888000, 0.99699699699699695000, 0.99700598802395213000, 0.99701492537313430000, 0.99702380952380953000, 0.99703264094955490000, 0.99704142011834318000, 0.99705014749262533000, 0.99705882352941178000, 0.99706744868035191000, 0.99707602339181289000, 0.99708454810495628000, 0.99709302325581395000, 0.99710144927536237000, 0.99710982658959535000, 0.99711815561959649000, 0.99712643678160917000, 0.99713467048710602000, 0.99714285714285711000, 0.99715099715099720000, 0.99715909090909094000, 0.99716713881019825000, 0.99717514124293782000, 0.99718309859154930000, 0.99719101123595510000, 0.99719887955182074000, 0.99720670391061450000, 0.99721448467966578000, 0.99722222222222223000, 0.99722991689750695000, 0.99723756906077343000, 0.99724517906336085000, 0.99725274725274726000, 0.99726027397260275000, 0.99726775956284153000, 0.99727520435967298000, 0.99728260869565222000, 0.99728997289972898000, 0.99729729729729732000, 0.99730458221024254000, 0.99731182795698925000, 0.99731903485254692000, 0.99732620320855614000, 0.99733333333333329000, 0.99734042553191493000, 0.99734748010610075000, 0.99735449735449733000, 0.99736147757255933000, 0.99736842105263157000, 0.99737532808398954000, 0.99738219895287961000, 0.99738903394255873000, 0.99739583333333337000, 0.99740259740259740000, 0.99740932642487046000, 0.99741602067183466000, 0.99742268041237114000, 0.99742930591259638000, 0.99743589743589745000, 0.99744245524296671000, 0.99744897959183676000, 0.99745547073791352000, 0.99746192893401020000, 0.99746835443037973000, 0.99747474747474751000, 0.99748110831234260000, 0.99748743718592969000, 0.99749373433583965000, 0.99750000000000005000, 0.99750623441396513000, 0.99751243781094523000, 0.99751861042183620000, 0.99752475247524752000, 0.99753086419753090000, 0.99753694581280783000, 0.99754299754299758000, 0.99754901960784315000, 0.99755501222493892000, 0.99756097560975610000, 0.99756690997566910000, 0.99757281553398058000, 0.99757869249394671000, 0.99758454106280192000, 0.99759036144578317000, 0.99759615384615385000, 0.99760191846522783000, 0.99760765550239239000, 0.99761336515513122000, 0.99761904761904763000, 0.99762470308788598000, 0.99763033175355453000, 0.99763593380614657000, 0.99764150943396224000, 0.99764705882352944000, 0.99765258215962438000, 0.99765807962529274000, 0.99766355140186913000, 0.99766899766899764000, 0.99767441860465111000, 0.99767981438515085000, 0.99768518518518523000, 0.99769053117782913000, 0.99769585253456217000, 0.99770114942528731000, 0.99770642201834858000, 0.99771167048054921000, 0.99771689497716898000, 0.99772209567198178000, 0.99772727272727268000, 0.99773242630385484000, 0.99773755656108598000, 0.99774266365688491000, 0.99774774774774777000, 0.99775280898876406000, 0.99775784753363228000, 0.99776286353467558000, 0.99776785714285710000, 0.99777282850779514000, 0.99777777777777776000, 0.99778270509977829000, 0.99778761061946908000, 0.99779249448123619000, 0.99779735682819382000, 0.99780219780219781000, 0.99780701754385970000, 0.99781181619256021000, 0.99781659388646293000, 0.99782135076252720000, 0.99782608695652175000, 0.99783080260303691000, 0.99783549783549785000, 0.99784017278617709000, 0.99784482758620685000, 0.99784946236559136000, 0.99785407725321884000, 0.99785867237687365000, 0.99786324786324787000, 0.99786780383795304000, 0.99787234042553197000, 0.99787685774946921000, 0.99788135593220340000, 0.99788583509513740000, 0.99789029535864981000, 0.99789473684210528000, 0.99789915966386555000, 0.99790356394129975000, 0.99790794979079500000, 0.99791231732776620000, 0.99791666666666667000, 0.99792099792099798000, 0.99792531120331951000, 0.99792960662525876000, 0.99793388429752061000, 0.99793814432989691000, 0.99794238683127567000, 0.99794661190965095000, 0.99795081967213117000, 0.99795501022494892000, 0.99795918367346936000, 0.99796334012219956000, 0.99796747967479671000, 0.99797160243407712000, 0.99797570850202433000, 0.99797979797979797000, 0.99798387096774188000, 0.99798792756539234000, 0.99799196787148592000, 0.99799599198396793000, 0.99800000000000000000, 0.99800399201596801000, 0.99800796812749004000, 0.99801192842942343000, 0.99801587301587302000, 0.99801980198019802000, 0.99802371541501977000, 0.99802761341222879000, 0.99803149606299213000, 0.99803536345776034000, 0.99803921568627452000, 0.99804305283757344000, 0.99804687500000000000, 0.99805068226120852000, 0.99805447470817121000, 0.99805825242718449000, 0.99806201550387597000, 0.99806576402321079000, 0.99806949806949807000, 0.99807321772639690000, 0.99807692307692308000, 0.99808061420345484000, 0.99808429118773945000, 0.99808795411089868000, 0.99809160305343514000, 0.99809523809523815000, 0.99809885931558939000, 0.99810246679316883000, 0.99810606060606055000, 0.99810964083175802000, 0.99811320754716981000, 0.99811676082862522000, 0.99812030075187974000, 0.99812382739212002000, 0.99812734082397003000, 0.99813084112149530000, 0.99813432835820892000, 0.99813780260707630000, 0.99814126394052050000, 0.99814471243042668000, 0.99814814814814812000, 0.99815157116451014000, 0.99815498154981552000, 0.99815837937384899000, 0.99816176470588236000, 0.99816513761467895000, 0.99816849816849818000, 0.99817184643510060000, 0.99817518248175185000, 0.99817850637522765000, 0.99818181818181817000, 0.99818511796733211000, 0.99818840579710144000, 0.99819168173598549000, 0.99819494584837543000, 0.99819819819819822000, 0.99820143884892087000, 0.99820466786355477000, 0.99820788530465954000, 0.99821109123434704000, 0.99821428571428572000, 0.99821746880570406000, 0.99822064056939497000, 0.99822380106571940000, 0.99822695035460995000, 0.99823008849557526000, 0.99823321554770317000, 0.99823633156966496000, 0.99823943661971826000, 0.99824253075571179000, 0.99824561403508771000, 0.99824868651488619000, 0.99825174825174823000, 0.99825479930191974000, 0.99825783972125437000, 0.99826086956521742000, 0.99826388888888884000, 0.99826689774696709000, 0.99826989619377160000, 0.99827288428324701000, 0.99827586206896557000, 0.99827882960413084000, 0.99828178694158076000, 0.99828473413379071000, 0.99828767123287676000, 0.99829059829059830000, 0.99829351535836175000, 0.99829642248722317000, 0.99829931972789121000, 0.99830220713073003000, 0.99830508474576274000, 0.99830795262267347000, 0.99831081081081086000, 0.99831365935919059000, 0.99831649831649827000, 0.99831932773109244000, 0.99832214765100669000, 0.99832495812395305000, 0.99832775919732442000, 0.99833055091819700000, 0.99833333333333329000, 0.99833610648918469000, 0.99833887043189373000, 0.99834162520729686000, 0.99834437086092720000, 0.99834710743801658000, 0.99834983498349839000, 0.99835255354200991000, 0.99835526315789469000, 0.99835796387520526000, 0.99836065573770494000, 0.99836333878887074000, 0.99836601307189543000, 0.99836867862969003000, 0.99837133550488599000, 0.99837398373983743000, 0.99837662337662336000, 0.99837925445705022000, 0.99838187702265369000, 0.99838449111470118000, 0.99838709677419357000, 0.99838969404186795000, 0.99839228295819937000, 0.99839486356340290000, 0.99839743589743590000, 0.99839999999999995000, 0.99840255591054317000, 0.99840510366826152000, 0.99840764331210186000, 0.99841017488076311000, 0.99841269841269842000, 0.99841521394611732000, 0.99841772151898733000, 0.99842022116903628000, 0.99842271293375395000, 0.99842519685039366000, 0.99842767295597479000, 0.99843014128728413000, 0.99843260188087779000, 0.99843505477308292000, 0.99843749999999998000, 0.99843993759750393000, 0.99844236760124616000, 0.99844479004665632000, 0.99844720496894412000, 0.99844961240310082000, 0.99845201238390091000, 0.99845440494590421000, 0.99845679012345678000, 0.99845916795069334000, 0.99846153846153851000, 0.99846390168970811000, 0.99846625766871167000, 0.99846860643185298000, 0.99847094801223246000, 0.99847328244274813000, 0.99847560975609762000, 0.99847792998477924000, 0.99848024316109418000, 0.99848254931714719000, 0.99848484848484853000, 0.99848714069591527000, 0.99848942598187307000, 0.99849170437405732000, 0.99849397590361444000, 0.99849624060150377000, 0.99849849849849848000, 0.99850074962518742000, 0.99850299401197606000, 0.99850523168908822000, 0.99850746268656720000, 0.99850968703427723000, 0.99851190476190477000, 0.99851411589895989000, 0.99851632047477745000, 0.99851851851851847000, 0.99852071005917165000, 0.99852289512555392000, 0.99852507374631272000, 0.99852724594992637000, 0.99852941176470589000, 0.99853157121879588000, 0.99853372434017595000, 0.99853587115666176000, 0.99853801169590639000, 0.99854014598540142000, 0.99854227405247808000, 0.99854439592430855000, 0.99854651162790697000, 0.99854862119013066000, 0.99855072463768113000, 0.99855282199710560000, 0.99855491329479773000, 0.99855699855699853000, 0.99855907780979825000, 0.99856115107913668000, 0.99856321839080464000, 0.99856527977044474000, 0.99856733524355301000, 0.99856938483547930000, 0.99857142857142855000, 0.99857346647646217000, 0.99857549857549854000, 0.99857752489331442000, 0.99857954545454541000, 0.99858156028368794000, 0.99858356940509918000, 0.99858557284299854000, 0.99858757062146897000, 0.99858956276445698000, 0.99859154929577465000, 0.99859353023909991000, 0.99859550561797750000, 0.99859747545582045000, 0.99859943977591037000, 0.99860139860139863000, 0.99860335195530725000, 0.99860529986053004000, 0.99860724233983289000, 0.99860917941585536000, 0.99861111111111112000, 0.99861303744798890000, 0.99861495844875348000, 0.99861687413554634000, 0.99861878453038677000, 0.99862068965517237000, 0.99862258953168048000, 0.99862448418156813000, 0.99862637362637363000, 0.99862825788751719000, 0.99863013698630132000, 0.99863201094391241000, 0.99863387978142082000, 0.99863574351978168000, 0.99863760217983655000, 0.99863945578231295000, 0.99864130434782605000, 0.99864314789687925000, 0.99864498644986455000, 0.99864682002706362000, 0.99864864864864866000, 0.99865047233468285000, 0.99865229110512133000, 0.99865410497981155000, 0.99865591397849462000, 0.99865771812080539000, 0.99865951742627346000, 0.99866131191432395000, 0.99866310160427807000, 0.99866488651535379000, 0.99866666666666670000, 0.99866844207723038000, 0.99867021276595747000, 0.99867197875166003000, 0.99867374005305043000, 0.99867549668874167000, 0.99867724867724872000, 0.99867899603698806000, 0.99868073878627972000, 0.99868247694334655000, 0.99868421052631584000, 0.99868593955321949000, 0.99868766404199472000, 0.99868938401048490000, 0.99869109947643975000, 0.99869281045751634000, 0.99869451697127942000, 0.99869621903520212000, 0.99869791666666663000, 0.99869960988296491000, 0.99870129870129876000, 0.99870298313878081000, 0.99870466321243523000, 0.99870633893919791000, 0.99870801033591727000, 0.99870967741935479000, 0.99871134020618557000, 0.99871299871299868000, 0.99871465295629824000, 0.99871630295250324000, 0.99871794871794872000, 0.99871959026888601000, 0.99872122762148341000, 0.99872286079182626000, 0.99872448979591832000, 0.99872611464968153000, 0.99872773536895676000, 0.99872935196950441000, 0.99873096446700504000, 0.99873257287705952000, 0.99873417721518987000, 0.99873577749683939000, 0.99873737373737370000, 0.99873896595208067000, 0.99874055415617125000, 0.99874213836477987000, 0.99874371859296485000, 0.99874529485570895000, 0.99874686716791983000, 0.99874843554443049000, 0.99875000000000003000, 0.99875156054931336000, 0.99875311720698257000, 0.99875466998754669000, 0.99875621890547261000, 0.99875776397515525000, 0.99875930521091816000, 0.99876084262701359000, 0.99876237623762376000, 0.99876390605686027000, 0.99876543209876545000, 0.99876695437731200000, 0.99876847290640391000, 0.99876998769987702000, 0.99877149877149873000, 0.99877300613496933000, 0.99877450980392157000, 0.99877600979192172000, 0.99877750611246940000, 0.99877899877899878000, 0.99878048780487805000, 0.99878197320341044000, 0.99878345498783450000, 0.99878493317132444000, 0.99878640776699024000, 0.99878787878787878000, 0.99878934624697335000, 0.99879081015719473000, 0.99879227053140096000, 0.99879372738238847000, 0.99879518072289153000, 0.99879663056558365000, 0.99879807692307687000, 0.99879951980792314000, 0.99880095923261392000, 0.99880239520958081000, 0.99880382775119614000, 0.99880525686977295000, 0.99880668257756566000, 0.99880810488676997000, 0.99880952380952381000, 0.99881093935790721000, 0.99881235154394299000, 0.99881376037959668000, 0.99881516587677721000, 0.99881656804733732000, 0.99881796690307334000, 0.99881936245572611000, 0.99882075471698117000, 0.99882214369846878000, 0.99882352941176467000, 0.99882491186839018000, 0.99882629107981225000, 0.99882766705744430000, 0.99882903981264637000, 0.99883040935672518000, 0.99883177570093462000, 0.99883313885647607000, 0.99883449883449882000, 0.99883585564610011000, 0.99883720930232556000, 0.99883855981416958000, 0.99883990719257543000, 0.99884125144843572000, 0.99884259259259256000, 0.99884393063583810000, 0.99884526558891451000, 0.99884659746251436000, 0.99884792626728114000, 0.99884925201380903000, 0.99885057471264371000, 0.99885189437428246000, 0.99885321100917435000, 0.99885452462772051000, 0.99885583524027455000, 0.99885714285714289000, 0.99885844748858443000, 0.99885974914481190000, 0.99886104783599083000, 0.99886234357224113000, 0.99886363636363640000, 0.99886492622020429000, 0.99886621315192747000, 0.99886749716874290000, 0.99886877828054299000, 0.99887005649717520000, 0.99887133182844245000, 0.99887260428410374000, 0.99887387387387383000, 0.99887514060742411000, 0.99887640449438198000, 0.99887766554433222000, 0.99887892376681620000, 0.99888017917133254000, 0.99888143176733779000, 0.99888268156424576000, 0.99888392857142860000, 0.99888517279821631000, 0.99888641425389757000, 0.99888765294771964000, 0.99888888888888894000, 0.99889012208657046000, 0.99889135254988914000, 0.99889258028792915000, 0.99889380530973448000, 0.99889502762430937000, 0.99889624724061810000, 0.99889746416758540000, 0.99889867841409696000, 0.99889988998899892000, 0.99890109890109891000, 0.99890230515916578000, 0.99890350877192979000, 0.99890470974808321000, 0.99890590809628010000, 0.99890710382513659000, 0.99890829694323147000, 0.99890948745910579000, 0.99891067538126366000, 0.99891186071817195000, 0.99891304347826082000, 0.99891422366992400000, 0.99891540130151846000, 0.99891657638136511000, 0.99891774891774887000, 0.99891891891891893000, 0.99892008639308860000, 0.99892125134843579000, 0.99892241379310343000, 0.99892357373519913000, 0.99892473118279568000, 0.99892588614393130000, 0.99892703862660948000, 0.99892818863879962000, 0.99892933618843682000, 0.99893048128342243000, 0.99893162393162394000, 0.99893276414087517000, 0.99893390191897657000, 0.99893503727369537000, 0.99893617021276593000, 0.99893730074388953000, 0.99893842887473461000, 0.99893955461293749000, 0.99894067796610164000, 0.99894179894179891000, 0.99894291754756870000, 0.99894403379091867000, 0.99894514767932485000, 0.99894625922023184000, 0.99894736842105258000, 0.99894847528916930000, 0.99894957983193278000, 0.99895068205666315000, 0.99895178197064993000, 0.99895287958115186000, 0.99895397489539750000, 0.99895506792058519000, 0.99895615866388310000, 0.99895724713242962000, 0.99895833333333328000, 0.99895941727367321000, 0.99896049896049899000, 0.99896157840083077000, 0.99896265560165975000, 0.99896373056994814000, 0.99896480331262938000, 0.99896587383660806000, 0.99896694214876036000, 0.99896800825593390000, 0.99896907216494846000, 0.99897013388259526000, 0.99897119341563789000, 0.99897225077081198000, 0.99897330595482547000, 0.99897435897435893000, 0.99897540983606559000, 0.99897645854657113000, 0.99897750511247441000, 0.99897854954034726000, 0.99897959183673468000, 0.99898063200815490000, 0.99898167006109984000, 0.99898270600203454000, 0.99898373983739841000, 0.99898477157360410000, 0.99898580121703850000, 0.99898682877406286000, 0.99898785425101211000, 0.99898887765419619000, 0.99898989898989898000, 0.99899091826437947000, 0.99899193548387100000, 0.99899295065458205000, 0.99899396378269623000, 0.99899497487437183000, 0.99899598393574296000, 0.99899699097291872000, 0.99899799599198402000, 0.99899899899899902000, 0.99900000000000000000, 0.99900099900099903000, 0.99900199600798401000, 0.99900299102691925000, 0.99900398406374502000, 0.99900497512437814000, 0.99900596421471177000, 0.99900695134061568000, 0.99900793650793651000, 0.99900891972249750000, 0.99900990099009901000, 0.99901088031651830000, 0.99901185770750989000, 0.99901283316880551000, 0.99901380670611439000, 0.99901477832512320000, 0.99901574803149606000, 0.99901671583087515000, 0.99901768172888017000, 0.99901864573110888000, 0.99901960784313726000, 0.99902056807051909000, 0.99902152641878672000, 0.99902248289345064000}; + + static void + gauss_legendre_tbl(int n, double* x, double* w, double eps) + { + double x0, x1, dx; /* Abscissas */ + double w0, w1, dw; /* Weights */ + double P0, P_1, P_2; /* Legendre polynomial values */ + double dpdx; /* Legendre polynomial derivative */ + int i, j, k, m; /* Iterators */ + double t0, t1, t2, t3; + + m = (n + 1) >> 1; + + t0 = (1.0 - (1.0 - 1.0 / (double)n) / (8.0 * (double)n * (double)n)); + t1 = 1.0 / (4.0 * (double)n + 2.0); + + for (i = 1; i <= m; i++) + { + /* Find i-th root of Legendre polynomial */ + + /* Initial guess */ + const double pi_to_many_places + = 3.1415926535897932384626433832795028841971693993751; + x0 = cos(pi_to_many_places * (double)((i << 2) - 1) * t1) * t0; + + /* Newton iterations, at least one */ + j = 0; + dx = dw = DBL_MAX; + + do + { + /* Compute Legendre polynomial value at x0 */ + P_1 = 1.0; + P0 = x0; + + /* Optimized version using lookup tables */ + + if (n < 1024) + { + /* Use fast algorithm for small n*/ + for (k = 2; k <= n; k++) + { + P_2 = P_1; + P_1 = P0; + t2 = x0 * P_1; + + P0 = t2 + ltbl[k] * (t2 - P_2); + + } + + } + else + { + + /* Use general algorithm for other n */ + for (k = 2; k < 1024; k++) + { + P_2 = P_1; + P_1 = P0; + t2 = x0 * P_1; + + P0 = t2 + ltbl[k] * (t2 - P_2); + } + + for (k = 1024; k <= n; k++) + { + P_2 = P_1; + P_1 = P0; + t2 = x0 * P_1; + t3 = (double)(k - 1) / (double)k; + + P0 = t2 + t3 * (t2 - P_2); + } + } + + /* Compute Legendre polynomial derivative at x0 */ + dpdx = ((x0 * P0 - P_1) * (double)n) / (x0 * x0 - 1.0); + + /* Newton step */ + x1 = x0 - P0 / dpdx; + + /* Weight computing */ + w1 = 2.0 / ((1.0 - x1 * x1) * dpdx * dpdx); + + /* Compute weight w0 on first iteration, needed for dw */ + if (j == 0) w0 = 2.0 / ((1.0 - x0 * x0) * dpdx * dpdx); + + dx = x0 - x1; + + dw = w0 - w1; + + x0 = x1; + + w0 = w1; + + j++; + } + while ((fabs(dx) > eps || fabs(dw) > eps) && j < 100); + + x[(m-1)-(i-1)] = x1; + + w[(m-1)-(i-1)] = w1; + } + + return; + } + diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/gsl_integration.h gsl-1.14/integration/gsl_integration.h *** gsl-1.13/integration/gsl_integration.h Mon Jun 29 12:30:17 2009 --- gsl-1.14/integration/gsl_integration.h Wed Mar 10 10:57:13 2010 *************** *** 247,252 **** --- 247,278 ---- gsl_integration_qawo_table * wf, double *result, double *abserr); + /* Workspace for fixed-order Gauss-Legendre integration */ + + typedef struct + { + size_t n; /* number of points */ + double *x; /* Gauss abscissae/points */ + double *w; /* Gauss weights for each abscissae */ + int precomputed; /* high precision abscissae/weights precomputed? */ + } + gsl_integration_glfixed_table; + + + gsl_integration_glfixed_table * + gsl_integration_glfixed_table_alloc (size_t n); + + void + gsl_integration_glfixed_table_free (gsl_integration_glfixed_table * t); + + /* Routine for fixed-order Gauss-Legendre integration */ + + double + gsl_integration_glfixed (const gsl_function *f, + double a, + double b, + const gsl_integration_glfixed_table * t); + __END_DECLS #endif /* __GSL_INTEGRATION_H__ */ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/test.c gsl-1.14/integration/test.c *** gsl-1.13/integration/test.c Tue Aug 25 11:31:43 2009 --- gsl-1.14/integration/test.c Wed Mar 10 11:32:48 2010 *************** *** 73,78 **** --- 73,79 ---- void my_error_handler (const char *reason, const char *file, int line, int err); + int main (void) { gsl_ieee_env_setup (); *************** *** 2093,2098 **** --- 2094,2220 ---- } + /* Sanity check monomial test function for fixed Gauss-Legendre rules */ + { + struct monomial_params params; + gsl_function f; + + f.function = &f_monomial; + f.params = ¶ms; + + params.degree = 2; + params.constant = 1.0; + gsl_test_abs(GSL_FN_EVAL(&f, 2.0), 4.0, 8*GSL_DBL_EPSILON, + "f_monomial sanity check 1"); + + params.degree = 1; + params.constant = 2.0; + gsl_test_abs(GSL_FN_EVAL(&f, 2.0), 4.0, 8*GSL_DBL_EPSILON, + "f_monomial sanity check 2"); + + params.degree = 2; + params.constant = 2.0; + gsl_test_abs(integ_f_monomial(1.0, 2.0, ¶ms), + (2.0/3.0)*(2.0*2.0*2.0 - 1.0*1.0*1.0), 8*GSL_DBL_EPSILON, + "integ_f_monomial sanity check"); + } + + /* Test the fixed-order Gauss-Legendre rules with a monomial. */ + { + int n; + struct monomial_params params; + gsl_function f; + const double a = 0.0, b = 1.2; + + f.function = &f_monomial; + f.params = ¶ms; + + params.constant = 1.0; + + for (n = 1; n < 1025; ++n) + { + double expected, result; + + gsl_integration_glfixed_table * tbl = + gsl_integration_glfixed_table_alloc(n); + + params.degree = 2*n-1; /* n point rule exact for 2n-1 degree poly */ + expected = integ_f_monomial(a, b, ¶ms); + result = gsl_integration_glfixed(&f, a, b, tbl); + + if (tbl->precomputed) + { + gsl_test_rel(result, expected, 1.0e-12, + "glfixed %d-point: Integrating (%g*x^%d) over [%g,%g]", + n, params.constant, params.degree, a, b); + } + else + { + gsl_test_rel(result, expected, 1.0e-7, + "glfixed %d-point: Integrating (%g*x^%d) over [%g,%g]", + n, params.constant, params.degree, a, b); + } + + gsl_integration_glfixed_table_free(tbl); + } + } + + /* Sanity check sin(x) test function for fixed Gauss-Legendre rules */ + { + gsl_function f = { f_sin, NULL }; + + gsl_test_abs(GSL_FN_EVAL(&f, 2.0), sin(2.0), 0.0, "f_sin sanity check 1"); + gsl_test_abs(GSL_FN_EVAL(&f, 7.0), sin(7.0), 0.0, "f_sin sanity check 2"); + gsl_test_abs(integ_f_sin(0.0, M_PI), 2.0, GSL_DBL_EPSILON, + "integ_f_sin sanity check"); + } + + /* Test the fixed-order Gauss-Legendre rules against sin(x) on [0, pi] */ + { + const int n_max = 1024; + const gsl_function f = { f_sin, NULL }; + const double a = 0.0, b = M_PI; + const double expected = integ_f_sin(a, b); + double result, abserr, prev_abserr = 0.0; + int n; + + for (n = 1; n <= n_max; ++n) + { + gsl_integration_glfixed_table * const tbl = + gsl_integration_glfixed_table_alloc(n); + + result = gsl_integration_glfixed(&f, a, b, tbl); + abserr = fabs(expected - result); + + if (n == 1) + { + gsl_test_abs(result, GSL_FN_EVAL(&f,(b+a)/2)*(b-a), 0.0, + "glfixed %d-point: behavior for n == 1", n); + } + else if (n < 9) + { + gsl_test(! (abserr < prev_abserr), + "glfixed %d-point: observed drop in absolute error versus %d-points", + n, n-1); + } + else if (tbl->precomputed) + { + gsl_test_abs(result, expected, 2.0 * n * GSL_DBL_EPSILON, + "glfixed %d-point: very low absolute error for high precision coefficients", + n); + } + else + { + gsl_test_abs(result, expected, 1.0e6 * GSL_DBL_EPSILON, + "glfixed %d-point: acceptable absolute error for on-the-fly coefficients", + n); + } + + prev_abserr = abserr; + gsl_integration_glfixed_table_free(tbl); + } + } + exit (gsl_test_summary()); } *************** *** 2101,2105 **** { if (0) printf ("(caught [%s:%d: %s (%d)])\n", file, line, reason, err) ; } - - --- 2223,2225 ---- diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/tests.c gsl-1.14/integration/tests.c *** gsl-1.13/integration/tests.c Mon Jun 29 12:30:17 2009 --- gsl-1.14/integration/tests.c Wed Mar 10 10:57:13 2010 *************** *** 218,220 **** --- 218,250 ---- double alpha = *(double *) params ; return exp(alpha*x) ; } + + + /* f_monomial = constant * x^degree */ + double f_monomial(double x, void * params) + { + struct monomial_params * p = (struct monomial_params *) params; + + return p->constant * gsl_pow_int(x, p->degree); + } + + /* integ(f_monomial,x,a b)=constant*(b^(degree+1)-a^(degree+1))/(degree+1) */ + double integ_f_monomial(double a, double b, struct monomial_params * p) + { + const int degreep1 = p->degree + 1; + const double bnp1 = gsl_pow_int(b, degreep1); + const double anp1 = gsl_pow_int(a, degreep1); + return (p->constant / degreep1)*(bnp1 - anp1); + } + + /* f(x) = sin(x) */ + double f_sin(double x, void * params) + { + return sin(x); + } + + /* integ(f_sin,x,a,b) */ + double integ_f_sin(double a, double b) + { + return -cos(b) + cos(a); + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/integration/tests.h gsl-1.14/integration/tests.h *** gsl-1.13/integration/tests.h Mon Jun 29 12:30:17 2009 --- gsl-1.14/integration/tests.h Wed Mar 10 10:57:13 2010 *************** *** 47,49 **** --- 47,59 ---- double myfn1 (double x, void * params); double myfn2 (double x, void * params); + + struct monomial_params { + int degree; + double constant; + } ; + double f_monomial(double x, void * params); + double integ_f_monomial(double a, double b, struct monomial_params * p); + + double f_sin(double x, void * params); + double integ_f_sin(double a, double b); diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/interpolation/Makefile.in gsl-1.14/interpolation/Makefile.in *** gsl-1.13/interpolation/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/interpolation/Makefile.in Wed Mar 10 10:58:21 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 62,69 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 62,70 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 111,121 **** --- 112,124 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 129,134 **** --- 132,139 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 188,194 **** --- 193,201 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 252,260 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interpolation/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps interpolation/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 259,267 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu interpolation/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu interpolation/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 303,316 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 310,345 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/akima.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cspline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poly.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 552,557 **** --- 581,587 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 597,602 **** --- 627,633 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/ChangeLog gsl-1.14/linalg/ChangeLog *** gsl-1.13/linalg/ChangeLog Tue Jul 7 19:33:08 2009 --- gsl-1.14/linalg/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,14 ---- + 2010-02-24 Brian Gough + + * svdstep.c (trailing_eigenvalue): compute the implicit shift + value mu robustly + + * svd.c (gsl_linalg_SV_decomp): scale the bidiagonal matrix before + the implicit QR step + + * householder.c (gsl_linalg_householder_transform): handle the + case where the scaling factor is subnormal + 2009-07-04 Brian Gough * luc.c (gsl_linalg_complex_LU_solve, gsl_linalg_complex_LU_svx, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/Makefile.in gsl-1.14/linalg/Makefile.in *** gsl-1.13/linalg/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/linalg/Makefile.in Wed Mar 10 10:58:21 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 64,71 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 64,72 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 113,123 **** --- 114,126 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 131,136 **** --- 134,141 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 190,196 **** --- 195,203 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 255,263 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linalg/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps linalg/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 262,270 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu linalg/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu linalg/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 306,319 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 313,362 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/balance.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/balancemat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bidiag.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cholesky.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/choleskyc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponential.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hermtd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hessenberg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hesstri.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hh.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/householder.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/householdercomplex.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lq.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiply.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptlq.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qrpt.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symmtd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tridiag.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 555,560 **** --- 598,604 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 600,605 **** --- 644,650 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/householder.c gsl-1.14/linalg/householder.c *** gsl-1.13/linalg/householder.c Wed Nov 19 09:13:46 2008 --- gsl-1.14/linalg/householder.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* linalg/householder.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* linalg/householder.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007, 2010 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 55,62 **** beta = - (alpha >= 0.0 ? +1.0 : -1.0) * hypot(alpha, xnorm) ; tau = (beta - alpha) / beta ; ! gsl_blas_dscal (1.0 / (alpha - beta), &x.vector); ! gsl_vector_set (v, 0, beta) ; return tau; } --- 55,75 ---- beta = - (alpha >= 0.0 ? +1.0 : -1.0) * hypot(alpha, xnorm) ; tau = (beta - alpha) / beta ; ! { ! double s = (alpha - beta); ! ! if (fabs(s) > GSL_DBL_MIN) ! { ! gsl_blas_dscal (1.0 / s, &x.vector); ! gsl_vector_set (v, 0, beta) ; ! } ! else ! { ! gsl_blas_dscal (GSL_DBL_EPSILON / s, &x.vector); ! gsl_blas_dscal (1.0 / GSL_DBL_EPSILON, &x.vector); ! gsl_vector_set (v, 0, beta) ; ! } ! } return tau; } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/svd.c gsl-1.14/linalg/svd.c *** gsl-1.13/linalg/svd.c Sat Jan 31 14:40:47 2009 --- gsl-1.14/linalg/svd.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* linalg/svd.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* linalg/svd.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007, 2010 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 127,135 **** /* Find the largest unreduced block (a,b) starting from b and working backwards */ ! a = b - 1; ! while (a > 0) { double fam1 = gsl_vector_get (&f.vector, a - 1); --- 127,135 ---- /* Find the largest unreduced block (a,b) starting from b and working backwards */ ! a = b - 1; ! while (a > 0) { double fam1 = gsl_vector_get (&f.vector, a - 1); *************** *** 160,173 **** gsl_matrix_view V_block = gsl_matrix_submatrix (V, 0, a, V->size1, n_block); ! qrstep (&S_block.vector, &f_block.vector, &U_block.matrix, &V_block.matrix); /* remove any small off-diagonal elements */ chop_small_elements (&S_block.vector, &f_block.vector); } } } /* Make singular values positive by reflections if necessary */ for (j = 0; j < K; j++) --- 160,223 ---- gsl_matrix_view V_block = gsl_matrix_submatrix (V, 0, a, V->size1, n_block); ! int rescale = 0; ! double scale = 1; ! double norm = 0; ! ! /* Find the maximum absolute values of the diagonal and subdiagonal */ ! ! for (i = 0; i < n_block; i++) ! { ! double s_i = gsl_vector_get (&S_block.vector, i); ! double a = fabs(s_i); ! if (a > norm) norm = a; ! } ! ! for (i = 0; i < n_block - 1; i++) ! { ! double f_i = gsl_vector_get (&f_block.vector, i); ! double a = fabs(f_i); ! if (a > norm) norm = a; ! } ! ! /* Temporarily scale the submatrix if necessary */ ! ! if (norm > GSL_SQRT_DBL_MAX) ! { ! scale = (norm / GSL_SQRT_DBL_MAX); ! rescale = 1; ! } ! else if (norm < GSL_SQRT_DBL_MIN && norm > 0) ! { ! scale = (norm / GSL_SQRT_DBL_MIN); ! rescale = 1; ! } ! ! if (rescale) ! { ! gsl_blas_dscal(1.0 / scale, &S_block.vector); ! gsl_blas_dscal(1.0 / scale, &f_block.vector); ! } ! ! /* Perform the implicit QR step */ + qrstep (&S_block.vector, &f_block.vector, &U_block.matrix, &V_block.matrix); /* remove any small off-diagonal elements */ chop_small_elements (&S_block.vector, &f_block.vector); + + /* Undo the scaling if needed */ + + if (rescale) + { + gsl_blas_dscal(scale, &S_block.vector); + gsl_blas_dscal(scale, &f_block.vector); + } } + } } + /* Make singular values positive by reflections if necessary */ for (j = 0; j < K; j++) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/svdstep.c gsl-1.14/linalg/svdstep.c *** gsl-1.13/linalg/svdstep.c Sat Jan 31 14:40:47 2009 --- gsl-1.14/linalg/svdstep.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* linalg/svdstep.c * ! * Copyright (C) 2007 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* linalg/svdstep.c * ! * Copyright (C) 2007, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 34,39 **** --- 34,40 ---- { gsl_vector_set (f, i, 0.0); } + d_i = d_ip1; } *************** *** 49,61 **** double fa = (n > 2) ? gsl_vector_get (f, n - 3) : 0.0; double fb = gsl_vector_get (f, n - 2); double ta = da * da + fa * fa; double tb = db * db + fb * fb; double tab = da * fb; double dt = (ta - tb) / 2.0; - double mu; if (dt >= 0) { --- 50,68 ---- double fa = (n > 2) ? gsl_vector_get (f, n - 3) : 0.0; double fb = gsl_vector_get (f, n - 2); + double mu; + + #if GOLUB_VAN_LOAN_8_3_2 + + /* Golub and van Loan, Algorithm 8.3.2 + The full SVD algorithm is described in section 8.6.2 */ + double ta = da * da + fa * fa; double tb = db * db + fb * fb; double tab = da * fb; double dt = (ta - tb) / 2.0; if (dt >= 0) { *************** *** 66,71 **** --- 73,116 ---- mu = tb + (tab * tab) / ((-dt) + hypot (dt, tab)); } + #else + { + /* We can compute mu more accurately than using the formula above + since we know the roots cannot be negative. This also avoids + the possibility of NaNs in the formula above. + + The matrix is [ da^2 + fa^2, da fb ; + da fb , db^2 + fb^2 ] + and mu is the eigenvalue closest to the bottom right element. + */ + + double ta = da * da + fa * fa; + double tb = db * db + fb * fb; + double tab = da * fb; + + double dt = (ta - tb) / 2.0; + + double S = ta + tb; + double da2 = da * da, db2 = db * db; + double fa2 = fa * fa, fb2 = fb * fb; + double P = (da2 * db2) + (fa2 * db2) + (fa2 * fb2); + double D = hypot(dt, tab); + double r1 = S/2 + D; + + if (dt >= 0) + { + /* tb < ta, choose smaller root */ + mu = (r1 > 0) ? P / r1 : 0.0; + } + else + { + /* tb > ta, choose larger root */ + mu = r1; + } + } + + #endif + return mu; } *************** *** 147,153 **** gsl_vector_set (d, 0, c * f0 - s * d1); gsl_vector_set (f, 0, s * f0 + c * d1); gsl_vector_set (d, 1, 0.0); ! /* Compute U <= U G */ for (i = 0; i < M; i++) --- 192,198 ---- gsl_vector_set (d, 0, c * f0 - s * d1); gsl_vector_set (f, 0, s * f0 + c * d1); gsl_vector_set (d, 1, 0.0); ! /* Compute U <= U G */ for (i = 0; i < M; i++) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/linalg/test.c gsl-1.14/linalg/test.c *** gsl-1.13/linalg/test.c Mon Aug 17 09:43:04 2009 --- gsl-1.14/linalg/test.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* linalg/test.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2006, 2007 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* linalg/test.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2006, 2007, 2010 Gerard Jungman, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 39,44 **** --- 39,45 ---- gsl_matrix * create_row_matrix(unsigned long size1, unsigned long size2); gsl_matrix * create_2x2_matrix(double a11, double a12, double a21, double a22); gsl_matrix * create_diagonal_matrix(double a[], unsigned long size); + gsl_matrix * create_sparse_matrix(unsigned long m, unsigned long n); int test_matmult(void); int test_matmult_mod(void); *************** *** 271,276 **** --- 272,314 ---- return m; } + double rand_double() { + static unsigned int x; + x = (69069 * x + 1) & 0xFFFFFFFFUL; + return (x / 4294967296.0); + } + + gsl_matrix * + create_sparse_matrix(unsigned long m, unsigned long n) { + gsl_matrix* A = gsl_matrix_calloc(m, n); + + unsigned long int i, j; + + for (i = 0; i < m; i++) { + for (j = 0; j < n; j++) { + double a = (rand_double() < 0.6 ? 1 : 0); + gsl_matrix_set(A, i, j, a); + } + } + + for (i = 0; i < m; i++) { + if (rand_double() < 0.9) { + gsl_vector_view row = gsl_matrix_row (A, i); + gsl_vector_set_zero (&row.vector); + } + } + for (i = 0; i < n; i++) { + if (rand_double() < 0.43) { + gsl_vector_view col = gsl_matrix_column (A, i); + gsl_vector_set_zero (&col.vector); + } + } + + return A; + } + + + gsl_matrix * m11; gsl_matrix * m51; *************** *** 299,305 **** gsl_matrix * inf5; double inf5_data[] = {1.0, 0.0, -3.0, 0.0, -5.0}; gsl_matrix * nan5; ! gsl_matrix * dblmin3, * dblmin5; double m53_lssolution[] = {52.5992295702070, -337.7263113752073, 351.8823436427604}; --- 337,344 ---- gsl_matrix * inf5; double inf5_data[] = {1.0, 0.0, -3.0, 0.0, -5.0}; gsl_matrix * nan5; ! gsl_matrix * dblmin3, * dblmin5, * dblsubnorm5; ! gsl_matrix * bigsparse; double m53_lssolution[] = {52.5992295702070, -337.7263113752073, 351.8823436427604}; *************** *** 2364,2369 **** --- 2403,2409 ---- int s = 0; double di1; unsigned long i,j, M = m->size1, N = m->size2; + unsigned long input_nans = 0; gsl_matrix * v = gsl_matrix_alloc(M,N); gsl_matrix * a = gsl_matrix_alloc(M,N); *************** *** 2374,2380 **** gsl_matrix_memcpy(v,m); ! s += gsl_linalg_SV_decomp(v, q, d, w); /* Check that singular values are non-negative and in non-decreasing order */ --- 2414,2430 ---- gsl_matrix_memcpy(v,m); ! /* Check for nans in the input */ ! for (i = 0; i 0) ! continue; /* skip NaNs if present in input */ ! else ! { ! s++; ! printf("bad singular value %lu = %22.18g\n", i, di); ! } } if (di < 0) { *************** *** 2527,2532 **** --- 2583,2596 ---- gsl_test(f, " SV_decomp dblmin5"); s += f; + f = test_SV_decomp_dim(dblsubnorm5, 100 * 1024 * 1024 * GSL_DBL_EPSILON); + gsl_test(f, " SV_decomp dblsubnorm5"); + s += f; + + f = test_SV_decomp_dim(bigsparse, 1024 * GSL_DBL_EPSILON); + gsl_test(f, " SV_decomp bigsparse"); + s += f; + { double i1, i2, i3, i4; *************** *** 4068,4074 **** void my_error_handler (const char *reason, const char *file, int line, int err) { ! if (0) printf ("(caught [%s:%d: %s (%d)])\n", file, line, reason, err) ; } int main(void) --- 4132,4138 ---- void my_error_handler (const char *reason, const char *file, int line, int err) { ! if (1) printf ("(caught [%s:%d: %s (%d)])\n", file, line, reason, err) ; } int main(void) *************** *** 4121,4126 **** --- 4185,4196 ---- dblmin5 = create_general_matrix (5, 5); gsl_matrix_scale(dblmin5, GSL_DBL_MIN); + dblsubnorm5 = create_general_matrix (5, 5); + gsl_matrix_scale(dblsubnorm5, GSL_DBL_MIN/1024); + gsl_matrix_set(dblsubnorm5, 0, 0, 0.0); + + bigsparse = create_sparse_matrix(100, 100); + /* Matmult now obsolete */ #ifdef MATMULT gsl_test(test_matmult(), "Matrix Multiply"); *************** *** 4199,4204 **** --- 4269,4277 ---- gsl_matrix_free (dblmin3); gsl_matrix_free (dblmin5); + gsl_matrix_free (dblsubnorm5); + + gsl_matrix_free (bigsparse); exit (gsl_test_summary()); } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/ltmain.sh gsl-1.14/ltmain.sh *** gsl-1.13/ltmain.sh Thu Aug 6 14:46:21 2009 --- gsl-1.14/ltmain.sh Wed Mar 10 10:57:59 2010 *************** *** 1,6 **** # Generated from ltmain.m4sh. ! # ltmain.sh (GNU libtool) 2.2.6 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. --- 1,6 ---- # Generated from ltmain.m4sh. ! # ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. *************** *** 65,71 **** # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) ! # $progname: (GNU libtool) 2.2.6 # automake: $automake_version # autoconf: $autoconf_version # --- 65,71 ---- # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) ! # $progname: (GNU libtool) 2.2.6b # automake: $automake_version # autoconf: $autoconf_version # *************** *** 73,81 **** PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=2.2.6 TIMESTAMP="" ! package_revision=1.3012 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then --- 73,81 ---- PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=2.2.6b TIMESTAMP="" ! package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then *************** *** 116,130 **** : ${CP="cp -f"} : ${ECHO="echo"} ! : ${EGREP="/usr/bin/grep -E"} ! : ${FGREP="/usr/bin/grep -F"} ! : ${GREP="/usr/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} ! : ${SED="/opt/local/bin/gsed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} --- 116,130 ---- : ${CP="cp -f"} : ${ECHO="echo"} ! : ${EGREP="/bin/grep -E"} ! : ${FGREP="/bin/grep -F"} ! : ${GREP="/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} ! : ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/matrix/Makefile.in gsl-1.14/matrix/Makefile.in *** gsl-1.13/matrix/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/matrix/Makefile.in Wed Mar 10 10:58:21 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 66,73 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 66,74 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 117,127 **** --- 118,130 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 135,140 **** --- 138,145 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 194,200 **** --- 199,207 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 262,270 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps matrix/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps matrix/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 269,277 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu matrix/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu matrix/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 316,329 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 323,363 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getset.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minmax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prop.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rowcol.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submatrix.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_static.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 566,571 **** --- 600,606 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 611,616 **** --- 646,652 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/min/Makefile.in gsl-1.14/min/Makefile.in *** gsl-1.13/min/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/min/Makefile.in Wed Mar 10 10:58:22 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 58,65 **** ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 58,66 ---- ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 107,117 **** --- 108,120 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 125,130 **** --- 128,135 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 184,190 **** --- 189,197 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 249,257 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps min/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps min/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 256,264 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu min/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu min/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 300,313 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 307,341 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bracketing.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brent.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convergence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/golden.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quad_golden.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_funcs.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 549,554 **** --- 577,583 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 594,599 **** --- 623,629 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/missing gsl-1.14/missing *** gsl-1.13/missing Wed Nov 19 09:13:47 2008 --- gsl-1.14/missing Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify --- 1,10 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2009-04-28.21; # UTC ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, ! # 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify *************** *** 14,22 **** # 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, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 18,24 ---- # 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 . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 29,34 **** --- 31,38 ---- fi run=: + sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' + sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. *************** *** 38,55 **** configure_ac=configure.in fi ! case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 ;; - esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. - case "$1" in -h|--h|--he|--hel|--help) echo "\ --- 42,65 ---- configure_ac=configure.in fi ! msg="missing on your system" ! ! case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -h|--h|--he|--hel|--help) echo "\ *************** *** 67,72 **** --- 77,83 ---- aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c *************** *** 74,84 **** lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; -*) --- 85,102 ---- lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and ! \`g' are ignored when checking the name. ! ! Send bug reports to ." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; -*) *************** *** 87,128 **** exit 1 ;; ! aclocal*) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 fi echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; ! autoconf) ! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ! # We have it, but it failed. ! exit 1 ! fi ! echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; ! autoheader) ! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ! # We have it, but it failed. ! exit 1 ! fi ! echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." --- 105,173 ---- exit 1 ;; ! esac ! ! # normalize program name to check for. ! program=`echo "$1" | sed ' ! s/^gnu-//; t ! s/^gnu//; t ! s/^g//; t'` ! ! # Now exit if we have it, but it failed. Also exit now if we ! # don't have it and --version was passed (most likely to detect ! # the program). This is about non-GNU programs, so use $1 not ! # $program. ! case $1 in ! lex*|yacc*) ! # Not GNU programs, they don't have --version. ! ;; ! ! tar*) ! if test -n "$run"; then ! echo 1>&2 "ERROR: \`tar' requires --run" ! exit 1 ! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ! exit 1 ! fi ! ;; ! ! *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; + esac + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case $program in + aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; ! autoconf*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; ! autoheader*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." *************** *** 130,136 **** test -z "$files" && files="config.h" touch_files= for f in $files; do ! case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; --- 175,181 ---- test -z "$files" && files="config.h" touch_files= for f in $files; do ! case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; *************** *** 140,152 **** ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." --- 185,192 ---- ;; automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." *************** *** 155,175 **** while read f; do touch "$f"; done ;; ! autom4te) ! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ! # We have it, but it failed. ! exit 1 ! fi ! echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. ! You can get \`$1Help2man' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ! test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file else --- 195,210 ---- while read f; do touch "$f"; done ;; ! autom4te*) echo 1>&2 "\ ! WARNING: \`$1' is needed, but is $msg. ! You might have modified some files without having the proper tools for further handling them. ! You can get \`$1' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else *************** *** 183,293 **** fi ;; ! bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi ! if [ ! -f y.tab.h ]; then echo >y.tab.h fi ! if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; ! lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi ! if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; ! help2man) ! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ! # We have it, but it failed. ! exit 1 ! fi ! echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ! if test -z "$file"; then ! file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` ! fi ! if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" ! exit 1 fi ;; ! makeinfo) ! if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then ! # We have makeinfo, but it failed. ! exit 1 ! fi ! echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` ! fi touch $file ;; ! tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error --- 218,325 ---- fi ;; ! bison*|yacc*) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi ! if test ! -f y.tab.h; then echo >y.tab.h fi ! if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; ! lex*|flex*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi ! if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; ! help2man*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ! if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" ! exit $? fi ;; ! makeinfo*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! # The file to touch is that specified with -o ... ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n ' ! /^@setfilename/{ ! s/.* \([^ ]*\) *$/\1/ ! p ! q ! }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ! fi ! # If the file does not exist, the user really needs makeinfo; ! # let's fail without touching anything. ! test -f $file || exit 1 touch $file ;; ! tar*) shift # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error *************** *** 300,312 **** fi firstarg="$1" if shift; then ! case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac ! case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 --- 332,344 ---- fi firstarg="$1" if shift; then ! case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac ! case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 *************** *** 323,332 **** *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 --- 355,364 ---- *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 *************** *** 334,336 **** --- 366,376 ---- esac exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-time-zone: "UTC" + # time-stamp-end: "; # UTC" + # End: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/mkinstalldirs gsl-1.14/mkinstalldirs *** gsl-1.13/mkinstalldirs Tue Feb 5 13:22:10 2008 --- gsl-1.14/mkinstalldirs Wed Mar 10 10:57:13 2010 *************** *** 1,36 **** #! /bin/sh # mkinstalldirs --- make directory hierarchy - # Author: Noah Friedman - # Created: 1993-05-16 - # Last modified: 1994-03-25 - # Public domain errstatus=0 ! for file in ${1+"$@"} ; do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! ! pathcomp= ! for d in ${1+"$@"} ; do ! pathcomp="$pathcomp$d" ! case "$pathcomp" in ! -* ) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" 1>&2 ! mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$? ! fi ! if test ! -d "$pathcomp"; then errstatus=$lasterr ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus ! # mkinstalldirs ends here --- 1,162 ---- #! /bin/sh # mkinstalldirs --- make directory hierarchy + scriptversion=2009-04-28.21; # UTC + + # Original author: Noah Friedman + # Created: 1993-05-16 + # Public domain. + # + # This file is maintained in Automake, please report + # bugs to or send patches to + # . + + nl=' + ' + IFS=" "" $nl" errstatus=0 + dirmode= + + usage="\ + Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + + Create each directory DIR (with mode MODE, if specified), including all + leading file name components. + + Report bugs to ." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac + done + + for file + do + if test -d "$file"; then + shift + else + break + fi + done + + case $# in + 0) exit 0 ;; + esac + + # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and + # mkdir -p a/c at the same time, both will detect that a is missing, + # one will create a, then the other will try to create a and die with + # a "File exists" error. This is a problem when calling mkinstalldirs + # from a parallel make. We use --version in the probe to restrict + # ourselves to GNU mkdir, which is thread-safe. + case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; + esac + + for file + do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" ! mkdir "$pathcomp" || lasterr=$? ! if test ! -d "$pathcomp"; then errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr= ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp=$pathcomp/ ! done done exit $errstatus ! # Local Variables: ! # mode: shell-script ! # sh-indentation: 2 ! # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "scriptversion=" ! # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-time-zone: "UTC" ! # time-stamp-end: "; # UTC" ! # End: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/monte/Makefile.in gsl-1.14/monte/Makefile.in *** gsl-1.13/monte/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/monte/Makefile.in Wed Mar 10 10:58:22 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 57,64 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 57,65 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 106,116 **** --- 107,119 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 124,129 **** --- 127,134 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 183,189 **** --- 188,196 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps monte/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps monte/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu monte/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu monte/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,336 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miser.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vegas.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 572,578 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 618,624 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multifit/ChangeLog gsl-1.14/multifit/ChangeLog *** gsl-1.13/multifit/ChangeLog Thu Jul 9 20:29:39 2009 --- gsl-1.14/multifit/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,15 ---- + 2010-02-25 Brian Gough + + * lmiterate.c (iterate): changed GSL_CONTINUE to GSL_ENOPROG for + the case where the routine has made 10 or more attempts to find a + suitable trial step without success. + + 2009-11-25 Brian Gough + + * multilinear.c (gsl_multifit_linear_usvd) + (gsl_multifit_wlinear_usvd): provide an unscaled version of the + fits + 2009-07-09 Brian Gough * work.c (gsl_multifit_linear_free): handle NULL argument in free diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multifit/Makefile.in gsl-1.14/multifit/Makefile.in *** gsl-1.13/multifit/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/multifit/Makefile.in Wed Mar 10 10:58:23 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 62,69 **** ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 62,70 ---- ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la \ ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 111,121 **** --- 112,124 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 129,134 **** --- 132,139 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 188,194 **** --- 193,201 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 253,261 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps multifit/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps multifit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 260,268 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu multifit/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu multifit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 304,317 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 311,346 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convergence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/covar.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdfsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmder.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multilinear.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/work.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 553,558 **** --- 582,588 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 598,603 **** --- 628,634 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multifit/gsl_multifit.h gsl-1.14/multifit/gsl_multifit.h *** gsl-1.13/multifit/gsl_multifit.h Wed Nov 19 09:13:47 2008 --- gsl-1.14/multifit/gsl_multifit.h Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* multifit/gsl_multifit.h * ! * Copyright (C) 2000, 2007 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* multifit/gsl_multifit.h * ! * Copyright (C) 2000, 2007, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 76,81 **** --- 76,91 ---- gsl_multifit_linear_workspace * work); int + gsl_multifit_linear_usvd (const gsl_matrix * X, + const gsl_vector * y, + double tol, + size_t * rank, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, + gsl_multifit_linear_workspace * work); + + int gsl_multifit_wlinear (const gsl_matrix * X, const gsl_vector * w, const gsl_vector * y, *************** *** 96,101 **** --- 106,122 ---- gsl_multifit_linear_workspace * work); int + gsl_multifit_wlinear_usvd (const gsl_matrix * X, + const gsl_vector * w, + const gsl_vector * y, + double tol, + size_t * rank, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, + gsl_multifit_linear_workspace * work); + + int gsl_multifit_linear_est (const gsl_vector * x, const gsl_vector * c, const gsl_matrix * cov, double *y, double *y_err); diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multifit/lmiterate.c gsl-1.14/multifit/lmiterate.c *** gsl-1.13/multifit/lmiterate.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/multifit/lmiterate.c Wed Mar 10 10:57:13 2010 *************** *** 225,229 **** goto lm_iteration; } ! return GSL_CONTINUE; } --- 225,229 ---- goto lm_iteration; } ! return GSL_ENOPROG; } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multifit/multilinear.c gsl-1.14/multifit/multilinear.c *** gsl-1.13/multifit/multilinear.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/multifit/multilinear.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* multifit/multilinear.c * ! * Copyright (C) 2000, 2007 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* multifit/multilinear.c * ! * Copyright (C) 2000, 2007, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 31,59 **** * */ ! int ! gsl_multifit_linear (const gsl_matrix * X, const gsl_vector * y, gsl_vector * c, gsl_matrix * cov, ! double *chisq, gsl_multifit_linear_workspace * work) ! { ! size_t rank; ! int status = gsl_multifit_linear_svd (X, y, GSL_DBL_EPSILON, &rank, c, ! cov, chisq, work); ! return status; ! } ! ! /* Handle the general case of the SVD with tolerance and rank */ ! ! int ! gsl_multifit_linear_svd (const gsl_matrix * X, ! const gsl_vector * y, ! double tol, ! size_t * rank, ! gsl_vector * c, ! gsl_matrix * cov, ! double *chisq, gsl_multifit_linear_workspace * work) { if (X->size1 != y->size) { --- 31,46 ---- * */ ! static int ! multifit_linear_svd (const gsl_matrix * X, const gsl_vector * y, + double tol, + int balance, + size_t * rank, gsl_vector * c, gsl_matrix * cov, ! double *chisq, ! gsl_multifit_linear_workspace * work) { if (X->size1 != y->size) { *************** *** 104,112 **** gsl_matrix_memcpy (A, X); ! /* Balance the columns of the matrix A */ ! gsl_linalg_balance_columns (A, D); /* Decompose A into U S Q^T */ --- 91,106 ---- gsl_matrix_memcpy (A, X); ! /* Balance the columns of the matrix A if requested */ ! if (balance) ! { ! gsl_linalg_balance_columns (A, D); ! } ! else ! { ! gsl_vector_set_all (D, 1.0); ! } /* Decompose A into U S Q^T */ *************** *** 195,217 **** } int ! gsl_multifit_wlinear (const gsl_matrix * X, ! const gsl_vector * w, ! const gsl_vector * y, ! gsl_vector * c, ! gsl_matrix * cov, ! double *chisq, gsl_multifit_linear_workspace * work) { size_t rank; ! int status = gsl_multifit_wlinear_svd (X, w, y, GSL_DBL_EPSILON, &rank, c, ! cov, chisq, work); return status; } int ! gsl_multifit_wlinear_svd (const gsl_matrix * X, ! const gsl_vector * w, const gsl_vector * y, double tol, size_t * rank, --- 189,223 ---- } int ! gsl_multifit_linear (const gsl_matrix * X, ! const gsl_vector * y, ! gsl_vector * c, ! gsl_matrix * cov, ! double *chisq, gsl_multifit_linear_workspace * work) { size_t rank; ! int status = multifit_linear_svd (X, y, GSL_DBL_EPSILON, 1, &rank, c, ! cov, chisq, work); return status; } + /* Handle the general case of the SVD with tolerance and rank */ int ! gsl_multifit_linear_svd (const gsl_matrix * X, ! const gsl_vector * y, ! double tol, ! size_t * rank, ! gsl_vector * c, ! gsl_matrix * cov, ! double *chisq, gsl_multifit_linear_workspace * work) ! { ! int status = multifit_linear_svd (X, y, tol, 1, rank, c, cov, chisq, work); ! return status; ! } ! ! int ! gsl_multifit_linear_usvd (const gsl_matrix * X, const gsl_vector * y, double tol, size_t * rank, *************** *** 219,224 **** --- 225,247 ---- gsl_matrix * cov, double *chisq, gsl_multifit_linear_workspace * work) { + int status = multifit_linear_svd (X, y, tol, 0, rank, c, cov, chisq, work); + return status; + } + + /* General weighted case */ + + static int + multifit_wlinear_svd (const gsl_matrix * X, + const gsl_vector * w, + const gsl_vector * y, + double tol, + int balance, + size_t * rank, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, gsl_multifit_linear_workspace * work) + { if (X->size1 != y->size) { GSL_ERROR *************** *** 283,291 **** } } ! /* Balance the columns of the matrix A */ ! gsl_linalg_balance_columns (A, D); /* Decompose A into U S Q^T */ --- 306,321 ---- } } ! /* Balance the columns of the matrix A if requested */ ! if (balance) ! { ! gsl_linalg_balance_columns (A, D); ! } ! else ! { ! gsl_vector_set_all (D, 1.0); ! } /* Decompose A into U S Q^T */ *************** *** 385,390 **** --- 415,468 ---- int + gsl_multifit_wlinear (const gsl_matrix * X, + const gsl_vector * w, + const gsl_vector * y, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, gsl_multifit_linear_workspace * work) + { + size_t rank; + int status = multifit_wlinear_svd (X, w, y, GSL_DBL_EPSILON, 1, &rank, c, + cov, chisq, work); + return status; + } + + int + gsl_multifit_wlinear_svd (const gsl_matrix * X, + const gsl_vector * w, + const gsl_vector * y, + double tol, + size_t * rank, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, gsl_multifit_linear_workspace * work) + { + int status = multifit_wlinear_svd (X, w, y, tol, 1, rank, c, + cov, chisq, work); + return status; + + } + + int + gsl_multifit_wlinear_usvd (const gsl_matrix * X, + const gsl_vector * w, + const gsl_vector * y, + double tol, + size_t * rank, + gsl_vector * c, + gsl_matrix * cov, + double *chisq, gsl_multifit_linear_workspace * work) + { + int status = multifit_wlinear_svd (X, w, y, tol, 0, rank, c, + cov, chisq, work); + return status; + + } + + /* Estimation of values for given x */ + + int gsl_multifit_linear_est (const gsl_vector * x, const gsl_vector * c, const gsl_matrix * cov, double *y, double *y_err) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multimin/Makefile.in gsl-1.14/multimin/Makefile.in *** gsl-1.13/multimin/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/multimin/Makefile.in Wed Mar 10 10:58:23 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 65,72 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 65,73 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 114,124 **** --- 115,127 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 132,137 **** --- 135,142 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 191,197 **** --- 196,204 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 256,264 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps multimin/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps multimin/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 263,271 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu multimin/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu multimin/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 307,320 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 314,353 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conjugate_fr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conjugate_pr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convergence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdfminimizer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fminimizer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simplex.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simplex2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/steepest_descent.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_funcs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_bfgs.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_bfgs2.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 556,561 **** --- 589,595 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 601,606 **** --- 635,641 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiroots/Makefile.in gsl-1.14/multiroots/Makefile.in *** gsl-1.13/multiroots/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/multiroots/Makefile.in Wed Mar 10 10:58:23 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 65,72 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 65,73 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 114,124 **** --- 115,127 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 132,137 **** --- 135,142 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 191,197 **** --- 196,204 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 256,264 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps multiroots/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps multiroots/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 263,271 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu multiroots/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu multiroots/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 307,320 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 314,352 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/broyden.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convergence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnewton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdfsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdjac.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hybrid.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hybridj.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_funcs.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 556,561 **** --- 588,594 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 601,606 **** --- 634,640 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/ChangeLog gsl-1.14/multiset/ChangeLog *** gsl-1.13/multiset/ChangeLog Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,3 ---- + 2009-09-21 Rhys Ulerich + + * added multiset support to GSL based on combinations diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/Makefile.am gsl-1.14/multiset/Makefile.am *** gsl-1.13/multiset/Makefile.am Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/Makefile.am Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,21 ---- + noinst_LTLIBRARIES = libgslmultiset.la + + pkginclude_HEADERS = gsl_multiset.h + + INCLUDES = -I$(top_srcdir) + + libgslmultiset_la_SOURCES = init.c file.c multiset.c inline.c + + noinst_HEADERS = + + TESTS = $(check_PROGRAMS) + + check_PROGRAMS = test + + test_SOURCES = test.c + + test_LDADD = libgslmultiset.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la + + #noinst_PROGRAMS = demo + #demo_SOURCES = demo.c + #demo_LDADD = libgslmultiset.la ../vector/libgslvector.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/Makefile.in gsl-1.14/multiset/Makefile.in *** gsl-1.13/multiset/Makefile.in Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/Makefile.in Wed Mar 10 10:58:24 2010 *************** *** 0 **** --- 1,666 ---- + # Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in 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. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + + @SET_MAKE@ + + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c + INSTALL_HEADER = $(INSTALL_DATA) + transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + check_PROGRAMS = test$(EXEEXT) + subdir = multiset + DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog TODO + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libgslmultiset_la_LIBADD = + am_libgslmultiset_la_OBJECTS = init.lo file.lo multiset.lo inline.lo + libgslmultiset_la_OBJECTS = $(am_libgslmultiset_la_OBJECTS) + am_test_OBJECTS = test.$(OBJEXT) + test_OBJECTS = $(am_test_OBJECTS) + test_DEPENDENCIES = libgslmultiset.la ../vector/libgslvector.la \ + ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la \ + ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ + ../utils/libutils.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgslmultiset_la_SOURCES) $(test_SOURCES) + DIST_SOURCES = $(libgslmultiset_la_SOURCES) $(test_SOURCES) + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; + am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; + am__install_max = 40 + am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` + am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" + am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(pkgincludedir)" + HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags + am__tty_colors = \ + red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GREP = @GREP@ + GSL_CFLAGS = @GSL_CFLAGS@ + GSL_LIBS = @GSL_LIBS@ + GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ + GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ + HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ + HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ + HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ + HAVE_FREEBSD_IEEE_INTERFACE = @HAVE_FREEBSD_IEEE_INTERFACE@ + HAVE_GNUM68K_IEEE_INTERFACE = @HAVE_GNUM68K_IEEE_INTERFACE@ + HAVE_GNUPPC_IEEE_INTERFACE = @HAVE_GNUPPC_IEEE_INTERFACE@ + HAVE_GNUSPARC_IEEE_INTERFACE = @HAVE_GNUSPARC_IEEE_INTERFACE@ + HAVE_GNUX86_IEEE_INTERFACE = @HAVE_GNUX86_IEEE_INTERFACE@ + HAVE_HPUX11_IEEE_INTERFACE = @HAVE_HPUX11_IEEE_INTERFACE@ + HAVE_HPUX_IEEE_INTERFACE = @HAVE_HPUX_IEEE_INTERFACE@ + HAVE_IRIX_IEEE_INTERFACE = @HAVE_IRIX_IEEE_INTERFACE@ + HAVE_NETBSD_IEEE_INTERFACE = @HAVE_NETBSD_IEEE_INTERFACE@ + HAVE_OPENBSD_IEEE_INTERFACE = @HAVE_OPENBSD_IEEE_INTERFACE@ + HAVE_OS2EMX_IEEE_INTERFACE = @HAVE_OS2EMX_IEEE_INTERFACE@ + HAVE_SOLARIS_IEEE_INTERFACE = @HAVE_SOLARIS_IEEE_INTERFACE@ + HAVE_SUNOS4_IEEE_INTERFACE = @HAVE_SUNOS4_IEEE_INTERFACE@ + HAVE_TRU64_IEEE_INTERFACE = @HAVE_TRU64_IEEE_INTERFACE@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libgslmultiset.la + pkginclude_HEADERS = gsl_multiset.h + INCLUDES = -I$(top_srcdir) + libgslmultiset_la_SOURCES = init.c file.c multiset.c inline.c + noinst_HEADERS = + TESTS = $(check_PROGRAMS) + test_SOURCES = test.c + test_LDADD = libgslmultiset.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu multiset/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu multiset/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgslmultiset.la: $(libgslmultiset_la_OBJECTS) $(libgslmultiset_la_DEPENDENCIES) + $(LINK) $(libgslmultiset_la_OBJECTS) $(libgslmultiset_la_LIBADD) $(LIBS) + + clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) + @rm -f test$(EXEEXT) + $(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiset.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: + for dir in "$(DESTDIR)$(pkgincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + + clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + clean-noinstLTLIBRARIES mostlyclean-am + + distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + + dvi: dvi-am + + dvi-am: + + html: html-am + + html-am: + + info: info-am + + info-am: + + install-data-am: install-pkgincludeHEADERS + + install-dvi: install-dvi-am + + install-dvi-am: + + install-exec-am: + + install-html: install-html-am + + install-html-am: + + install-info: install-info-am + + install-info-am: + + install-man: + + install-pdf: install-pdf-am + + install-pdf-am: + + install-ps: install-ps-am + + install-ps-am: + + installcheck-am: + + maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + + mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + + uninstall-am: uninstall-pkgincludeHEADERS + + .MAKE: check-am install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool \ + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgincludeHEADERS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-pkgincludeHEADERS + + + #noinst_PROGRAMS = demo + #demo_SOURCES = demo.c + #demo_LDADD = libgslmultiset.la ../vector/libgslvector.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/TODO gsl-1.14/multiset/TODO *** gsl-1.13/multiset/TODO Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/TODO Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1 ---- + * The module has a lot of overlap with combination/ some of the functions could be abstracted out. diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/file.c gsl-1.14/multiset/file.c *** gsl-1.13/multiset/file.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/file.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,115 ---- + /* multiset/file.c + * based on combination/file.c by Szymon Jaroszewicz + * based on permutation/file.c by Brian Gough + * + * Copyright (C) 2001 Szymon Jaroszewicz + * Copyright (C) 2009 Rhys Ulerich + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include + #include + #include + #include + + #define IN_FORMAT "%lu" + + int + gsl_multiset_fread (FILE * stream, gsl_multiset * c) + { + size_t k = c->k ; + + size_t * data = c->data ; + + size_t items = fread (data, sizeof (size_t), k, stream); + + if (items != k) + { + GSL_ERROR ("fread failed", GSL_EFAILED); + } + + return GSL_SUCCESS; + } + + int + gsl_multiset_fwrite (FILE * stream, const gsl_multiset * c) + { + size_t k = c->k ; + + size_t * data = c->data ; + + size_t items = fwrite (data, sizeof (size_t), k, stream); + + if (items != k) + { + GSL_ERROR ("fwrite failed", GSL_EFAILED); + } + + return GSL_SUCCESS; + } + + int + gsl_multiset_fprintf (FILE * stream, const gsl_multiset * c, const char *format) + { + size_t k = c->k ; + + size_t * data = c->data ; + + size_t i; + + for (i = 0; i < k; i++) + { + int status = fprintf (stream, format, data[i]); + + if (status < 0) + { + GSL_ERROR ("fprintf failed", GSL_EFAILED); + } + } + + return GSL_SUCCESS; + } + + int + gsl_multiset_fscanf (FILE * stream, gsl_multiset * c) + { + size_t k = c->k ; + + size_t * data = c->data ; + + size_t i; + + for (i = 0; i < k; i++) + { + unsigned long j ; + + /* FIXME: what if size_t != unsigned long ??? + + want read in size_t but have to read in unsigned long to avoid + error from compiler */ + + int status = fscanf (stream, IN_FORMAT, &j); + + if (status != 1) + { + GSL_ERROR ("fscanf failed", GSL_EFAILED); + } + + data[i] = j; + } + + return GSL_SUCCESS; + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/gsl_multiset.h gsl-1.14/multiset/gsl_multiset.h *** gsl-1.13/multiset/gsl_multiset.h Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/gsl_multiset.h Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,93 ---- + /* multiset/gsl_multiset.h + * based on combination/gsl_combination.h by Szymon Jaroszewicz + * based on permutation/gsl_permutation.h by Brian Gough + * + * Copyright (C) 2009 Rhys Ulerich + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #ifndef __GSL_MULTISET_H__ + #define __GSL_MULTISET_H__ + + #include + #include + #include + #include + #include + + #undef __BEGIN_DECLS + #undef __END_DECLS + #ifdef __cplusplus + # define __BEGIN_DECLS extern "C" { + # define __END_DECLS } + #else + # define __BEGIN_DECLS /* empty */ + # define __END_DECLS /* empty */ + #endif + + __BEGIN_DECLS + + struct gsl_multiset_struct + { + size_t n; + size_t k; + size_t *data; + }; + + typedef struct gsl_multiset_struct gsl_multiset; + + gsl_multiset *gsl_multiset_alloc (const size_t n, const size_t k); + gsl_multiset *gsl_multiset_calloc (const size_t n, const size_t k); + void gsl_multiset_init_first (gsl_multiset * c); + void gsl_multiset_init_last (gsl_multiset * c); + void gsl_multiset_free (gsl_multiset * c); + int gsl_multiset_memcpy (gsl_multiset * dest, const gsl_multiset * src); + + int gsl_multiset_fread (FILE * stream, gsl_multiset * c); + int gsl_multiset_fwrite (FILE * stream, const gsl_multiset * c); + int gsl_multiset_fscanf (FILE * stream, gsl_multiset * c); + int gsl_multiset_fprintf (FILE * stream, const gsl_multiset * c, const char *format); + + size_t gsl_multiset_n (const gsl_multiset * c); + size_t gsl_multiset_k (const gsl_multiset * c); + size_t * gsl_multiset_data (const gsl_multiset * c); + + int gsl_multiset_valid (gsl_multiset * c); + int gsl_multiset_next (gsl_multiset * c); + int gsl_multiset_prev (gsl_multiset * c); + + INLINE_DECL size_t gsl_multiset_get (const gsl_multiset * c, const size_t i); + + #ifdef HAVE_INLINE + + INLINE_FUN + size_t + gsl_multiset_get (const gsl_multiset * c, const size_t i) + { + #if GSL_RANGE_CHECK + if (GSL_RANGE_COND(i >= c->k)) /* size_t is unsigned, can't be negative */ + { + GSL_ERROR_VAL ("index out of range", GSL_EINVAL, 0); + } + #endif + return c->data[i]; + } + + #endif /* HAVE_INLINE */ + + __END_DECLS + + #endif /* __GSL_MULTISET_H__ */ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/init.c gsl-1.14/multiset/init.c *** gsl-1.13/multiset/init.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/init.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,130 ---- + /* multiset/init.c + * based on combination/init.c by Szymon Jaroszewicz + * based on permutation/init.c by Brian Gough + * + * Copyright (C) 2001 Szymon Jaroszewicz + * Copyright (C) 2009 Brian Gough + * Copyright (C) 2009 Rhys Ulerich + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include + #include + #include + #include + + gsl_multiset * + gsl_multiset_alloc (const size_t n, const size_t k) + { + gsl_multiset * c; + + if (n == 0) + { + GSL_ERROR_VAL ("multiset parameter n must be positive integer", + GSL_EDOM, 0); + } + if (k > n) + { + GSL_ERROR_VAL ("multiset length k must be an integer less than or equal to n", + GSL_EDOM, 0); + } + c = (gsl_multiset *) malloc (sizeof (gsl_multiset)); + + if (c == 0) + { + GSL_ERROR_VAL ("failed to allocate space for multiset struct", + GSL_ENOMEM, 0); + } + + if (k > 0) + { + c->data = (size_t *) malloc (k * sizeof (size_t)); + + if (c->data == 0) + { + free (c); /* exception in constructor, avoid memory leak */ + + GSL_ERROR_VAL ("failed to allocate space for multiset data", + GSL_ENOMEM, 0); + } + } + else + { + c->data = 0; + } + + c->n = n; + c->k = k; + + return c; + } + + gsl_multiset * + gsl_multiset_calloc (const size_t n, const size_t k) + { + size_t i; + + gsl_multiset * c = gsl_multiset_alloc (n, k); + + if (c == 0) + return 0; + + /* initialize multiset to repeated first element */ + + for (i = 0; i < k; i++) + { + c->data[i] = 0; + } + + return c; + } + + void + gsl_multiset_init_first (gsl_multiset * c) + { + const size_t k = c->k ; + size_t i; + + /* initialize multiset to repeated first element */ + + for (i = 0; i < k; i++) + { + c->data[i] = 0; + } + } + + void + gsl_multiset_init_last (gsl_multiset * c) + { + const size_t k = c->k ; + size_t i; + size_t n = c->n; + + /* initialize multiset to repeated last element */ + + for (i = 0; i < k; i++) + { + c->data[i] = n - 1; + } + } + + void + gsl_multiset_free (gsl_multiset * c) + { + RETURN_IF_NULL (c); + if (c->k > 0) free (c->data); + free (c); + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/inline.c gsl-1.14/multiset/inline.c *** gsl-1.13/multiset/inline.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/inline.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,24 ---- + /* multiset/inline.c + * + * Copyright (C) 2008 Brian Gough + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + /* Compile all the inline functions */ + + #define COMPILE_INLINE_STATIC + #include "build.h" + #include diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/multiset.c gsl-1.14/multiset/multiset.c *** gsl-1.13/multiset/multiset.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/multiset.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,181 ---- + /* multiset/multiset.c + * based on combination/combination.c by Szymon Jaroszewicz + * based on permutation/permutation.c by Brian Gough + * + * Copyright (C) 2001 Szymon Jaroszewicz + * Copyright (C) 2009 Rhys Ulerich + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include + #include + #include + + size_t + gsl_multiset_n (const gsl_multiset * c) + { + return c->n ; + } + + size_t + gsl_multiset_k (const gsl_multiset * c) + { + return c->k ; + } + + size_t * + gsl_multiset_data (const gsl_multiset * c) + { + return c->data ; + } + + int + gsl_multiset_valid (gsl_multiset * c) + { + const size_t n = c->n ; + const size_t k = c->k ; + + size_t i, j ; + + if( k > n ) + { + GSL_ERROR("multiset has k greater than n", GSL_FAILURE) ; + } + for (i = 0; i < k; i++) + { + const size_t ci = c->data[i]; + + if (ci >= n) + { + GSL_ERROR("multiset index outside range", GSL_FAILURE) ; + } + + for (j = 0; j < i; j++) + { + if (c->data[j] > ci) + { + GSL_ERROR("multiset indices not in increasing order", + GSL_FAILURE) ; + } + } + } + + return GSL_SUCCESS; + } + + + int + gsl_multiset_next (gsl_multiset * c) + { + /* Replaces c with the next multiset (in the standard lexicographical + * ordering). Returns GSL_FAILURE if there is no next multiset. + */ + const size_t n = c->n; + const size_t k = c->k; + size_t *data = c->data; + size_t i; + + if(k == 0) + { + return GSL_FAILURE; + } + i = k - 1; + + while(i > 0 && data[i] == n-1) + { + --i; + } + + if (i == 0 && data[0] == n-1) + { + return GSL_FAILURE; + } + + ++data[i]; + + while(i < k-1) + { + data[i+1] = data[i]; + ++i; + } + + return GSL_SUCCESS; + } + + int + gsl_multiset_prev (gsl_multiset * c) + { + /* Replaces c with the previous multiset (in the standard + * lexicographical ordering). Returns GSL_FAILURE if there is no + * previous multiset. + */ + const size_t n = c->n; + const size_t k = c->k; + size_t *data = c->data; + size_t i; + + if(k == 0) + { + return GSL_FAILURE; + } + i = k - 1; + + while(i > 0 && data[i-1] == data[i]) + { + --i; + } + + if(i == 0 && data[i] == 0) + { + return GSL_FAILURE; + } + + data[i]--; + + if (data[i] < n-1) + { + while (i < k-1) { + data[++i] = n - 1; + } + } + + return GSL_SUCCESS; + } + + int + gsl_multiset_memcpy (gsl_multiset * dest, const gsl_multiset * src) + { + const size_t src_n = src->n; + const size_t src_k = src->k; + const size_t dest_n = dest->n; + const size_t dest_k = dest->k; + + if (src_n != dest_n || src_k != dest_k) + { + GSL_ERROR ("multiset lengths are not equal", GSL_EBADLEN); + } + + { + size_t j; + + for (j = 0; j < src_k; j++) + { + dest->data[j] = src->data[j]; + } + } + + return GSL_SUCCESS; + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/multiset/test.c gsl-1.14/multiset/test.c *** gsl-1.13/multiset/test.c Thu Jan 1 00:00:00 1970 --- gsl-1.14/multiset/test.c Wed Mar 10 10:57:13 2010 *************** *** 0 **** --- 1,278 ---- + /* multiset/test.c + * based on combination/test.c by Szymon Jaroszewicz + * based on permutation/test.c by Brian Gough + * + * Copyright (C) 2001 Szymon Jaroszewicz + * Copyright (C) 2009 Rhys Ulerich + * + * This program 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. + * + * This program 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include + #include + #include + #include + #include + #include + #include + + size_t c63[56][3] = { + { 0,0,0 }, { 0,0,1 }, { 0,0,2 }, { 0,0,3 }, { 0,0,4 }, { 0,0,5 }, + { 0,1,1 }, { 0,1,2 }, { 0,1,3 }, { 0,1,4 }, { 0,1,5 }, + { 0,2,2 }, { 0,2,3 }, { 0,2,4 }, { 0,2,5 }, + { 0,3,3 }, { 0,3,4 }, { 0,3,5 }, + { 0,4,4 }, { 0,4,5 }, + { 0,5,5 }, + { 1,1,1 }, { 1,1,2 }, { 1,1,3 }, { 1,1,4 }, { 1,1,5 }, + { 1,2,2 }, { 1,2,3 }, { 1,2,4 }, { 1,2,5 }, + { 1,3,3 }, { 1,3,4 }, { 1,3,5 }, + { 1,4,4 }, { 1,4,5 }, + { 1,5,5 }, + { 2,2,2 }, { 2,2,3 }, { 2,2,4 }, { 2,2,5 }, + { 2,3,3 }, { 2,3,4 }, { 2,3,5 }, + { 2,4,4 }, { 2,4,5 }, + { 2,5,5 }, + { 3,3,3 }, { 3,3,4 }, { 3,3,5 }, + { 3,4,4 }, { 3,4,5 }, + { 3,5,5 }, + { 4,4,4 }, { 4,4,5 }, + { 4,5,5 }, + { 5,5,5 } + } ; + + void my_error_handler (const char *reason, const char *file, int line, int err); + + int + main (void) + { + size_t i, j; + int status = 0, s; + gsl_multiset * c ; + + gsl_ieee_env_setup (); + + c = gsl_multiset_alloc (6,3); + + /* Test multisets in forward order */ + + gsl_multiset_init_first (c); + + i = 0; + + do + { + if ( i >= 56 ) + { + status = 1; + break; + } + for (j = 0; j < 3; j++) + { + status |= (c->data[j] != c63[i][j]); + } + + { + int s1 = gsl_multiset_valid (c); + gsl_test (s1, "gsl_multiset_valid (%u)", i); + } + + i++; + } + while (gsl_multiset_next(c) == GSL_SUCCESS); + + gsl_test(status, "gsl_multiset_next, 6 choose 3 multiset, 56 steps"); + + gsl_multiset_next(c); + gsl_multiset_next(c); + gsl_multiset_next(c); + for (j = 0; j < 3; j++) + { + status |= (c->data[j] != c63[55][j]); + } + gsl_test(status, "gsl_multiset_next on the last multiset"); + + { + int s1 = gsl_multiset_valid (c); + gsl_test (s1, "gsl_multiset_valid on the last multiset"); + } + + { + gsl_multiset * d = gsl_multiset_alloc (6,3); + gsl_multiset_memcpy (d, c); + + status = 0; + + for (j = 0; j < 3; j++) + { + status |= (d->data[j] != c->data[j]); + } + + gsl_test (status, "gsl_multiset_memcpy, 6 choose 3 multiset"); + gsl_multiset_free(d); + } + + + /* Now test multisets in reverse order */ + + gsl_multiset_init_last (c); + + i = 56; + do + { + if ( i == 0 ) + { + status = 1; + break; + } + + i--; + + for (j = 0; j < 3; j++) + { + status |= (c->data[j] != c63[i][j]); + } + + { + int s1 = gsl_multiset_valid (c); + gsl_test (s1, "gsl_multiset_valid (%u)", i); + } + } + while (gsl_multiset_prev(c) == GSL_SUCCESS); + + gsl_test(status, "gsl_multiset_prev, 6 choose 3 multiset, 20 steps"); + + gsl_multiset_prev(c); + gsl_multiset_prev(c); + gsl_multiset_prev(c); + for (j = 0; j < 3; j++) + { + status |= (c->data[j] != c63[0][j]); + } + gsl_test(status, "gsl_multiset_prev on the first multiset"); + + { + int s1 = gsl_multiset_valid (c); + gsl_test (s1, "gsl_multiset_valid on the first multiset"); + } + + { + gsl_multiset * d = gsl_multiset_alloc (6,3); + gsl_multiset_memcpy (d, c); + + status = 0; + + for (j = 0; j < 3; j++) + { + status |= (d->data[j] != c->data[j]); + } + + gsl_test (status, "gsl_multiset_memcpy, 6 choose 3 multiset"); + gsl_multiset_free(d); + } + + gsl_multiset_free (c); + + c = gsl_multiset_calloc(7, 0); + /* should return GSL_FAILURE every time */ + status |= (gsl_multiset_next(c) != GSL_FAILURE); + status |= (gsl_multiset_next(c) != GSL_FAILURE); + status |= (gsl_multiset_prev(c) != GSL_FAILURE); + status |= (gsl_multiset_prev(c) != GSL_FAILURE); + gsl_test(status, "gsl_multiset 7 choose 0"); + gsl_multiset_free (c); + + c = gsl_multiset_calloc(1, 1); + /* should return GSL_FAILURE every time */ + for(j = 0; j < 1; j++) + { + status |= (gsl_multiset_get(c, j) != j); + } + status |= (gsl_multiset_next(c) != GSL_FAILURE); + for(j = 0; j < 1; j++) + { + status |= (gsl_multiset_get(c, j) != j); + } + status |= (gsl_multiset_next(c) != GSL_FAILURE); + for(j = 0; j < 1; j++) + { + status |= (gsl_multiset_get(c, j) != j); + } + status |= (gsl_multiset_prev(c) != GSL_FAILURE); + for(j = 0; j < 1; j++) + { + status |= (gsl_multiset_get(c, j) != j); + } + status |= (gsl_multiset_prev(c) != GSL_FAILURE); + for(j = 0; j < 1; j++) + { + status |= (gsl_multiset_get(c, j) != j); + } + gsl_test(status, "gsl_multiset 7 choose 7"); + gsl_multiset_free (c); + + c = gsl_multiset_calloc(6, 3); + + gsl_set_error_handler (&my_error_handler); + + c->data[0] = 1; + c->data[1] = 2; + c->data[2] = 1; + s = gsl_multiset_valid (c); + gsl_test (!s, "gsl_multiset_valid on an invalid multiset (1,1,2)"); + + c->data[0] = 2; + c->data[1] = 1; + c->data[2] = 0; + s = gsl_multiset_valid (c); + gsl_test (!s, "gsl_multiset_valid on an invalid multiset (2,1,0)"); + + c->data[0] = 1; + c->data[1] = 2; + c->data[2] = 0; + s = gsl_multiset_valid (c); + gsl_test (!s, "gsl_multiset_valid on an invalid multiset (1,2,0)"); + + { + gsl_multiset * d = gsl_multiset_alloc (6,4); + int s = gsl_multiset_memcpy (d, c); + gsl_test (!s, "gsl_multiset_memcpy, (6,4) vs (6,3)"); + gsl_multiset_free(d); + } + + { + gsl_multiset * d = gsl_multiset_alloc (7,3); + int s = gsl_multiset_memcpy (d, c); + gsl_test (!s, "gsl_multiset_memcpy, (7,3) vs (6,3)"); + gsl_multiset_free(d); + } + + { + gsl_multiset * d = gsl_multiset_alloc (7,2); + int s = gsl_multiset_memcpy (d, c); + gsl_test (!s, "gsl_multiset_memcpy, (7,2) vs (6,3)"); + gsl_multiset_free(d); + } + + + gsl_multiset_free (c); + + exit (gsl_test_summary()); + } + + void + my_error_handler (const char *reason, const char *file, int line, int err) + { + if (0) printf ("(caught [%s:%d: %s (%d)])\n", file, line, reason, err) ; + } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/ntuple/Makefile.in gsl-1.14/ntuple/Makefile.in *** gsl-1.13/ntuple/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/ntuple/Makefile.in Wed Mar 10 10:58:24 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 58,65 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 58,66 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 107,117 **** --- 108,120 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 125,130 **** --- 128,135 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 184,190 **** --- 189,197 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 255,263 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps ntuple/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps ntuple/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 262,270 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntuple/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu ntuple/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 306,319 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 313,341 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntuple.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 556,561 **** --- 578,584 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 601,606 **** --- 624,630 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/ode-initval/Makefile.in gsl-1.14/ode-initval/Makefile.in *** gsl-1.13/ode-initval/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/ode-initval/Makefile.in Wed Mar 10 10:58:24 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 63,70 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 63,71 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 112,122 **** --- 113,125 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 130,135 **** --- 133,140 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 189,195 **** --- 194,202 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 254,262 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps ode-initval/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps ode-initval/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 261,269 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ode-initval/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu ode-initval/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 305,318 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 312,355 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsimp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/control.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cscal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evolve.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gear1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gear2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk2imp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk2simp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk4.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk4imp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rk8pd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rkck.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rkf45.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/step.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 554,559 **** --- 591,597 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 599,604 **** --- 637,643 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/permutation/Makefile.in gsl-1.14/permutation/Makefile.in *** gsl-1.13/permutation/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/permutation/Makefile.in Wed Mar 10 10:58:25 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 59,66 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 59,67 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 108,118 **** --- 109,121 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 126,131 **** --- 129,136 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 185,191 **** --- 190,198 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 250,258 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps permutation/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps permutation/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 257,265 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu permutation/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu permutation/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 301,314 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 308,341 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonical.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permutation.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permute.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 577,583 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 623,629 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/poly/Makefile.in gsl-1.14/poly/Makefile.in *** gsl-1.13/poly/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/poly/Makefile.in Wed Mar 10 10:58:25 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 59,66 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 59,67 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 108,118 **** --- 109,121 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 126,131 **** --- 129,136 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 185,191 **** --- 190,198 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 250,258 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps poly/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps poly/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 257,265 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu poly/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu poly/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 301,314 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 308,344 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deriv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solve_cubic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solve_quadratic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsolve.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsolve_cubic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsolve_init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zsolve_quadratic.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 580,586 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 626,632 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/qrng/Makefile.in gsl-1.14/qrng/Makefile.in *** gsl-1.13/qrng/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/qrng/Makefile.in Wed Mar 10 10:58:26 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 58,65 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 58,66 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 107,117 **** --- 108,120 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 125,130 **** --- 128,135 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 184,190 **** --- 189,197 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps qrng/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps qrng/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu qrng/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu qrng/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,339 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/halton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/niederreiter-2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qrng.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reversehalton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sobol.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 575,581 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 621,627 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/randist/ChangeLog gsl-1.14/randist/ChangeLog *** gsl-1.13/randist/ChangeLog Fri Jul 10 15:34:05 2009 --- gsl-1.14/randist/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,13 ---- + 2010-03-01 Brian Gough + + * test.c (testPDF): extend the test run if a sample fails on the + first pass. + + 2010-02-24 Brian Gough + + * fdist.c (gsl_ran_fdist_pdf): compute log of pdf to avoid + overflow/underflow. + 2009-07-10 Brian Gough * exponential.c (gsl_ran_exponential): use log(1-u) to include 0 diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/randist/Makefile.in gsl-1.14/randist/Makefile.in *** gsl-1.13/randist/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/randist/Makefile.in Wed Mar 10 10:58:26 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 67,74 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 67,75 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 116,126 **** --- 117,129 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 134,139 **** --- 137,144 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 193,199 **** --- 198,206 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 257,265 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps randist/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps randist/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 264,272 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu randist/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu randist/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 308,321 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 315,379 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bernoulli.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beta.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bigauss.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binomial.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binomial_tpe.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cauchy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chisq.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirichlet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/discrete.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/erlang.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponential.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exppow.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gauss.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gausstail.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gausszig.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geometric.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gumbel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/landau.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laplace.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/levy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logarithmic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logistic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lognormal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multinomial.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nbinomial.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pareto.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pascal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poisson.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rayleigh.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shuffle.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphere.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tdist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weibull.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 557,562 **** --- 615,621 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 602,607 **** --- 661,667 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/randist/fdist.c gsl-1.14/randist/fdist.c *** gsl-1.13/randist/fdist.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/randist/fdist.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* randist/fdist.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* randist/fdist.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007, 2010 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 58,67 **** double lg12 = gsl_sf_lngamma ((nu1 + nu2) / 2); double lg1 = gsl_sf_lngamma (nu1 / 2); double lg2 = gsl_sf_lngamma (nu2 / 2); ! ! p = exp (lglg + lg12 - lg1 - lg2) ! * pow (x, nu1 / 2 - 1) * pow (nu2 + nu1 * x, -nu1 / 2 - nu2 / 2); ! return p; } } --- 58,68 ---- double lg12 = gsl_sf_lngamma ((nu1 + nu2) / 2); double lg1 = gsl_sf_lngamma (nu1 / 2); double lg2 = gsl_sf_lngamma (nu2 / 2); ! ! p = ! exp (lglg + lg12 - lg1 - lg2 + (nu1 / 2 - 1) * log (x) - ! ((nu1 + nu2) / 2) * log (nu2 + nu1 * x)); ! return p; } } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/randist/test.c gsl-1.14/randist/test.c *** gsl-1.13/randist/test.c Sun Jul 19 10:06:06 2009 --- gsl-1.14/randist/test.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* randist/test.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* randist/test.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007, 2010 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 100,105 **** --- 100,107 ---- double test_exppow2b_pdf (double x); double test_fdist (void); double test_fdist_pdf (double x); + double test_fdist_large (void); + double test_fdist_large_pdf (double x); double test_flat (void); double test_flat_pdf (double x); double test_gamma (void); *************** *** 297,302 **** --- 299,305 ---- testPDF (FUNC2 (exppow2b)); testPDF (FUNC2 (fdist)); + testPDF (FUNC2 (fdist_large)); testPDF (FUNC2 (flat)); testPDF (FUNC2 (gamma)); testPDF (FUNC2 (gamma1)); *************** *** 511,521 **** typedef double pdf_func(double); double wrapper_function (double x, void *params) { pdf_func * pdf = (pdf_func *)params; ! return pdf(x); } double --- 514,534 ---- typedef double pdf_func(double); + /* Keep track of invalid values during integration */ + static int pdf_errors = 0; + static double pdf_errval = 0.0; + double wrapper_function (double x, void *params) { pdf_func * pdf = (pdf_func *)params; ! double P = pdf(x); ! if (!gsl_finite(P)) { ! pdf_errors++; ! pdf_errval = P; ! P = 0; /* skip invalid value now, but return pdf_errval at the end */ ! } ! return P; } double *************** *** 527,534 **** --- 540,549 ---- gsl_integration_workspace * w = gsl_integration_workspace_alloc (n); f.function = &wrapper_function; f.params = (void *)pdf; + pdf_errors = 0; gsl_integration_qags (&f, a, b, 1e-16, 1e-4, n, w, &result, &abserr); gsl_integration_workspace_free (w); + if (pdf_errors) return pdf_errval; return result; } *************** *** 541,547 **** double dx = (b - a) / BINS; double bin; double total = 0, mean; ! int i, j, status = 0, status_i = 0; for (i = 0; i < BINS; i++) { --- 556,576 ---- double dx = (b - a) / BINS; double bin; double total = 0, mean; ! int i, j, status = 0, status_i = 0, attempts = 0; ! long int n0 = 0, n = N; ! ! for (i = 0; i < BINS; i++) ! { ! /* Compute the integral of p(x) from x to x+dx */ ! ! double x = a + i * dx; ! ! if (fabs (x) < 1e-10) /* hit the origin exactly */ ! x = 0.0; ! ! p[i] = integrate (pdf, x, x+dx); ! } ! for (i = 0; i < BINS; i++) { *************** *** 549,555 **** edge[i] = 0; } ! for (i = 0; i < N; i++) { double r = f (); total += r; --- 578,587 ---- edge[i] = 0; } ! trial: ! attempts++; ! ! for (i = n0; i < n; i++) { double r = f (); total += r; *************** *** 580,621 **** } count[i] += edge[i]; } ! mean = (total / N); ! gsl_test (!gsl_finite(mean), "%s, finite mean, observed %g", name, mean); for (i = 0; i < BINS; i++) { - /* Compute an approximation to the integral of p(x) from x to - x+dx using Simpson's rule */ - double x = a + i * dx; ! ! if (fabs (x) < 1e-10) /* hit the origin exactly */ ! x = 0.0; ! ! p[i] = integrate (pdf, x, x+dx); ! } ! ! for (i = 0; i < BINS; i++) ! { ! double x = a + i * dx; ! double d = fabs (count[i] - N * p[i]); ! if (p[i] != 0) { ! double s = d / sqrt (N * p[i]); status_i = (s > 5) && (d > 2); } else { status_i = (count[i] != 0); } status |= status_i; if (status_i) gsl_test (status_i, "%s [%g,%g) (%g/%d=%g observed vs %g expected)", ! name, x, x + dx, count[i], N, count[i] / N, p[i]); } if (status == 0) --- 612,659 ---- } count[i] += edge[i]; + edge[i] = 0; } ! mean = (total / n); ! status = !gsl_finite(mean); ! if (status) { ! gsl_test (status, "%s, finite mean, observed %g", name, mean); ! return; ! } for (i = 0; i < BINS; i++) { double x = a + i * dx; ! double d = fabs (count[i] - n * p[i]); ! if (!gsl_finite(p[i])) { ! status_i = 1; ! } ! else if (p[i] != 0) ! { ! double s = d / sqrt (n * p[i]); status_i = (s > 5) && (d > 2); } else { status_i = (count[i] != 0); } + + /* Extend the sample if there is an outlier on the first attempt + to avoid spurious failures when running large numbers of tests. */ + if (status_i && attempts < 50) + { + n0 = n; + n = 2.0*n; + goto trial; + } + status |= status_i; if (status_i) gsl_test (status_i, "%s [%g,%g) (%g/%d=%g observed vs %g expected)", ! name, x, x + dx, count[i], n, count[i] / n, p[i]); } if (status == 0) *************** *** 1238,1243 **** --- 1276,1295 ---- return gsl_ran_fdist_pdf (x, 3.0, 4.0); } + /* Test case for bug #28500: overflow in gsl_ran_fdist_pdf */ + + double + test_fdist_large (void) + { + return gsl_ran_fdist (r_global, 8.0, 249.0); + } + + double + test_fdist_large_pdf (double x) + { + return gsl_ran_fdist_pdf (x, 8.0, 249.0); + } + double test_flat (void) { diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/rng/ChangeLog gsl-1.14/rng/ChangeLog *** gsl-1.13/rng/ChangeLog Thu Jul 9 20:29:39 2009 --- gsl-1.14/rng/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-01-07 Brian Gough + + * ran3.c (ran3_set): added a check for negative j + 2009-07-09 Brian Gough * rng.c (gsl_rng_free): handle NULL argument in free diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/rng/Makefile.in gsl-1.14/rng/Makefile.in *** gsl-1.13/rng/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/rng/Makefile.in Wed Mar 10 10:58:26 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 64,71 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 64,72 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 113,123 **** --- 114,126 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 131,136 **** --- 134,141 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 190,196 **** --- 195,203 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 256,264 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps rng/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps rng/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 263,271 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rng/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu rng/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 307,320 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 314,384 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/borosh13.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmrg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coveyou.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fishman18.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fishman20.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fishman2x.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfsr4.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knuthran.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knuthran2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knuthran2002.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lecuyer21.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minstd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mrg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mt.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/r250.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ran0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ran1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ran2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ran3.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand48.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranlux.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranlxd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranlxs.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranmar.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rng.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slatec.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/taus.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/taus113.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transputer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tt.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/types.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni32.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/waterman14.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zuf.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 557,562 **** --- 621,627 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 602,607 **** --- 667,673 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/rng/ran3.c gsl-1.14/rng/ran3.c *** gsl-1.13/rng/ran3.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/rng/ran3.c Wed Mar 10 10:57:13 2010 *************** *** 1,6 **** /* rng/ran3.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* rng/ran3.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007, 2010 James Theiler, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 84,89 **** --- 84,92 ---- j = (M_SEED - s) % M_BIG; + /* Avoid potential problem with negative values */ + if (j < 0) j += M_BIG; + /* the zeroth element is never used, but we initialize it for consistency between states */ diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/roots/Makefile.in gsl-1.14/roots/Makefile.in *** gsl-1.13/roots/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/roots/Makefile.in Wed Mar 10 10:58:27 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 61,68 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 61,69 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 110,120 **** --- 111,123 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 128,133 **** --- 131,138 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 187,193 **** --- 192,200 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 252,260 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps roots/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps roots/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 259,267 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu roots/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu roots/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 303,316 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 310,347 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bisection.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brent.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convergence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/falsepos.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdfsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsolver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secant.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/steffenson.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_funcs.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 552,557 **** --- 583,589 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 597,602 **** --- 629,635 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/siman/Makefile.in gsl-1.14/siman/Makefile.in *** gsl-1.13/siman/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/siman/Makefile.in Wed Mar 10 10:58:27 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 65,72 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 65,73 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 116,126 **** --- 117,129 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 134,139 **** --- 137,144 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 193,199 **** --- 198,206 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 261,269 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps siman/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps siman/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 268,276 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu siman/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu siman/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 324,337 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 331,360 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siman.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siman_tsp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 574,579 **** --- 597,603 ---- clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 619,624 **** --- 643,649 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/sort/Makefile.in gsl-1.14/sort/Makefile.in *** gsl-1.13/sort/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/sort/Makefile.in Wed Mar 10 10:58:28 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 59,66 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 59,67 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 108,118 **** --- 109,121 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 126,131 **** --- 129,136 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 185,191 **** --- 190,198 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 250,258 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps sort/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps sort/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 257,265 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sort/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu sort/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 301,314 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 308,341 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortind.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortvec.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortvecind.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subset.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subsetind.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 577,583 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 623,629 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/ChangeLog gsl-1.14/specfunc/ChangeLog *** gsl-1.13/specfunc/ChangeLog Fri Jul 17 19:03:22 2009 --- gsl-1.14/specfunc/ChangeLog Wed Mar 10 10:57:13 2010 *************** *** 1,3 **** --- 1,12 ---- + 2010-02-25 Brian Gough + + * hyperg_U.c (hyperg_U_negx): handle the case where x<0 + + 2010-01-23 Brian Gough + + * hyperg_1F1.c (gsl_sf_hyperg_1F1_e): use Kummer transformation + for larger range of x when b>a and a<0 + 2009-07-17 Brian Gough * hyperg_U.c (hyperg_U_series): use a rearrangement of the factor diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/Makefile.in gsl-1.14/specfunc/Makefile.in *** gsl-1.13/specfunc/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/specfunc/Makefile.in Wed Mar 10 10:58:28 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 82,89 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 82,90 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 131,141 **** --- 132,144 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 149,154 **** --- 152,159 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 208,214 **** --- 213,221 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 273,281 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps specfunc/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps specfunc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 280,288 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu specfunc/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu specfunc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 324,337 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 331,444 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/airy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/airy_der.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/airy_zero.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atanint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_I0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_I1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_In.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Inu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_J0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_J1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Jn.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Jnu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_K0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_K1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Kn.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Knu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Y0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Y1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Yn.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_Ynu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_amp_phase.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_i.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_j.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_olver.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_sequence.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_temme.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_y.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bessel_zero.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beta.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beta_inc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clausen.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coulomb.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coulomb_bound.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coupling.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dawson.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debye.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dilog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elementary.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ellint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elljac.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/erfc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expint3.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fermi_dirac.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma_inc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gegenbauer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg_0F1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg_1F1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg_2F0.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg_2F1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperg_U.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laguerre.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lambert.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legendre_H3d.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legendre_Qn.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legendre_con.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legendre_poly.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathieu_angfunc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathieu_charv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathieu_coeff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathieu_radfunc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathieu_workspace.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poch.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pow_int.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/result.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sinint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synchrotron.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_airy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bessel.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_coulomb.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dilog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gamma.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hyperg.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_legendre.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mathieu.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trig.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zeta.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 573,578 **** --- 680,686 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 618,623 **** --- 726,732 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/hyperg_1F1.c gsl-1.14/specfunc/hyperg_1F1.c *** gsl-1.13/specfunc/hyperg_1F1.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/specfunc/hyperg_1F1.c Wed Mar 10 10:57:14 2010 *************** *** 1,6 **** --- 1,7 ---- /* specfunc/hyperg_1F1.c * * Copyright (C) 1996, 1997, 1998, 1999, 2000 Gerard Jungman + * Copyright (C) 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 1943,1949 **** result); return GSL_ERROR_SELECT_2(stat_e, stat_K); } ! else if(a < 0.0 && fabs(x) < 100.0) { /* Use Kummer to reduce it to the generic positive case. * Note that b > a, strictly, since we already trapped b = a. * Also b-(b-a)=a, and a is not a negative integer here, --- 1944,1950 ---- result); return GSL_ERROR_SELECT_2(stat_e, stat_K); } ! else if(a < 0.0 && fabs(x) < 2*GSL_LOG_DBL_MAX) { /* Use Kummer to reduce it to the generic positive case. * Note that b > a, strictly, since we already trapped b = a. * Also b-(b-a)=a, and a is not a negative integer here, diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/hyperg_U.c gsl-1.14/specfunc/hyperg_U.c *** gsl-1.13/specfunc/hyperg_U.c Tue Aug 25 15:06:14 2009 --- gsl-1.14/specfunc/hyperg_U.c Wed Mar 10 10:57:14 2010 *************** *** 1,7 **** /* specfunc/hyperg_U.c * * Copyright (C) 1996, 1997, 1998, 1999, 2000 Gerard Jungman ! * Copyright (C) 2009 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* specfunc/hyperg_U.c * * Copyright (C) 1996, 1997, 1998, 1999, 2000 Gerard Jungman ! * Copyright (C) 2009, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 1479,1484 **** --- 1479,1620 ---- return hyperg_U_origin (a, b, result); } + /* Calculate U(a,b,x) for x < 0 + + Abramowitz and Stegun formula 13.1.3 + + U(a,b,x) = (gamma(1-b)/gamma(1+a-b)) M(a,b,x) + - z^(1-b) (gamma(1-b)/gamma(a)) M(1+a-b,2-b,x) + + can be transformed into + + U(a,b,x) = poch(1+a-b,-a) M(a,b,x) + + z^(1-b) poch(a,-(1+a-b)) M(1+a-b,2-b,x) + + using the reflection formula 6.1.17 and the definition of + Poch(a,b)=gamma(a+b)/gamma(a). Our poch function already handles + the special cases of ratios of gamma functions with negative + integer argument. + + Note that U(a,b,x) is complex in general for x<0 due to the term + x^(1-b), but is real when + + 1) b is an integer + + 4) a is zero or a negative integer so x^(1-b)/gamma(a) is zero. + + For integer b U(a,b,x) is defined as the limit beta->b U(a,beta,x). + This makes the situation slightly more complicated. + + */ + + static int + hyperg_U_negx (const double a, const double b, const double x, gsl_sf_result_e10 * result) + { + gsl_sf_result r1, r2; + int stat_1, stat_2, status; + int a_int = (a == floor(a)); + int b_int = (b == floor(b)); + + double T1 = 0, T1_err = 0, T2 = 0, T2_err = 0; + + /* Compute the first term poch(1+a-b) M(a,b,x) */ + + if (b_int && b <= 0 && !(a_int && a <= 0 && a >= b)) + { + /* Need to handle first term as + + lim_{beta->b} poch(1+a-beta,-a) M(a,beta,x) + + due to pole in M(a,b,x) for b == 0 or -ve integer + + We skip this case when a is zero or a negative integer and + a>=b because the hypergeometric series terminates before any + singular terms + */ + + /* FIXME: TO BE IMPLEMENTED ! */ + result->val = GSL_NAN; result->err = GSL_NAN; + GSL_ERROR("limit case integer b <= 0 unimplemented", GSL_EUNIMPL); + } + else + { + stat_1 = gsl_sf_poch_e(1+a-b,-a,&r1); + status = stat_1; + + if (r1.val != 0.0) + { + gsl_sf_result Mr1; + int stat_Mr1 = gsl_sf_hyperg_1F1_e (a, b, x, &Mr1); + status = GSL_ERROR_SELECT_2(status, stat_Mr1); + + T1 = Mr1.val * r1.val; + T1_err = 2.0 * GSL_DBL_EPSILON * fabs(T1) + + fabs(Mr1.err * r1.val) + fabs(Mr1.val * r1.err) ; + } + } + + + /* Compute the second term z^(1-b) poch(a,-(1+a-b)) M(1+a-b,2-b,x) */ + + if (b_int && b >= 2 && !(a_int && a <= (b - 2))) + { + /* Need to handle second term as a limit due to pole in + M(1+a-b,2-b,x). + + We skip this case when a is integer and a <= b-2 because the + hypergeometric series terminates before any singular terms + */ + + /* FIXME: TO BE IMPLEMENTED ! */ + result->val = GSL_NAN; result->err = GSL_NAN; + GSL_ERROR("limit case integer b >= 2 unimplemented", GSL_EUNIMPL); + } + else + { + if (a_int && a <= 0 && (b >= 1)) + { + r2.val = 0; + r2.err = 0; + } + else + { + stat_2 = gsl_sf_poch_e(a,-(1+a-b),&r2); + status = GSL_ERROR_SELECT_2(status, stat_2); + } + + if (r2.val != 0.0) + { + gsl_sf_result Mr2; + int stat_Mr2 = gsl_sf_hyperg_1F1_e (1+a-b, 2-b, x, &Mr2); + T2 = Mr2.val * r2.val; + T2_err = 2.0 * GSL_DBL_EPSILON * fabs(T2) + + fabs(Mr2.err * r2.val) + fabs(Mr2.val * r2.err); + status = GSL_ERROR_SELECT_2(status, stat_Mr2); + + if (T2 != 0.0) + { + double x1mb = pow(x, 1-b); + T2 = x1mb * T2; + T2_err = fabs(x1mb) * T2_err; + } + } + } + + result->val = (T1 + T2); + result->err = 2.0 * GSL_DBL_EPSILON * fabs(result->val) + (T1_err + T2_err); + result->e10 = 0; + + return status; + } + + static int + hyperg_U_int_negx (const int a, const int b, const double x, gsl_sf_result_e10 * result) + { + return hyperg_U_negx (a, b, x, result); + } + + /*-*-*-*-*-*-*-*-*-*-*-* Functions with Error Codes *-*-*-*-*-*-*-*-*-*-*-*/ *************** *** 1488,1498 **** { /* CHECK_POINTER(result) */ ! if(x <= 0.0 || (x == 0.0 && b >= 1)) { DOMAIN_ERROR_E10(result); } else if (x == 0.0) { return hyperg_U_int_origin (a, b, result); } else { if(b >= 1) { --- 1624,1636 ---- { /* CHECK_POINTER(result) */ ! if(x == 0.0 && b >= 1) { DOMAIN_ERROR_E10(result); } else if (x == 0.0) { return hyperg_U_int_origin (a, b, result); + } else if (x < 0.0) { + return hyperg_U_int_negx (a, b, x, result); } else { if(b >= 1) { *************** *** 1531,1537 **** /* CHECK_POINTER(result) */ ! if(x < 0.0 || (x == 0.0 && b >= 1)) { DOMAIN_ERROR_E10(result); } else if(a == 0.0) { --- 1669,1675 ---- /* CHECK_POINTER(result) */ ! if(x == 0.0 && b >= 1) { DOMAIN_ERROR_E10(result); } else if(a == 0.0) { *************** *** 1541,1546 **** --- 1679,1686 ---- return GSL_SUCCESS; } else if (x == 0.0) { return hyperg_U_origin (a, b, result); + } else if (x < 0.0) { + return hyperg_U_negx (a, b, x, result); } else if(a_integer && b_integer) { return gsl_sf_hyperg_U_int_e10_e(rinta, rintb, x, result); diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/legendre_con.c gsl-1.14/specfunc/legendre_con.c *** gsl-1.13/specfunc/legendre_con.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/specfunc/legendre_con.c Wed Mar 10 10:57:14 2010 *************** *** 1,6 **** --- 1,7 ---- /* specfunc/legendre_con.c * * Copyright (C) 1996, 1997, 1998, 1999, 2000 Gerard Jungman + * Copyright (C) 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 896,902 **** result->val = pre * (E.val - c2 * K.val); result->err = pre * (E.err + fabs(c2) * K.err); result->err += 2.0 * GSL_DBL_EPSILON * fabs(result->val); ! return stat_K; } } else { --- 897,903 ---- result->val = pre * (E.val - c2 * K.val); result->err = pre * (E.err + fabs(c2) * K.err); result->err += 2.0 * GSL_DBL_EPSILON * fabs(result->val); ! return GSL_ERROR_SELECT_2(stat_K, stat_E); } } else { *************** *** 917,923 **** result->val = pre * (E.val - K.val); result->err = pre * (E.err + K.err); result->err += 2.0 * GSL_DBL_EPSILON * fabs(result->val); ! return stat_K; } } } --- 918,924 ---- result->val = pre * (E.val - K.val); result->err = pre * (E.err + K.err); result->err += 2.0 * GSL_DBL_EPSILON * fabs(result->val); ! return GSL_ERROR_SELECT_2(stat_K, stat_E); } } } diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/specfunc/test_hyperg.c gsl-1.14/specfunc/test_hyperg.c *** gsl-1.13/specfunc/test_hyperg.c Tue Aug 25 15:16:21 2009 --- gsl-1.14/specfunc/test_hyperg.c Wed Mar 10 10:57:14 2010 *************** *** 1,6 **** /* specfunc/test_hyperg.c * ! * Copyright (C) 2007, 2009 Brian Gough * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004 Gerard Jungman * * This program is free software; you can redistribute it and/or modify --- 1,6 ---- /* specfunc/test_hyperg.c * ! * Copyright (C) 2007, 2009, 2010 Brian Gough * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004 Gerard Jungman * * This program is free software; you can redistribute it and/or modify *************** *** 285,290 **** --- 285,312 ---- TEST_SF(s, gsl_sf_hyperg_1F1_e, (1.5, 1000000.5, 0.8e6 + 0.5, &r), 11.18001288977894650469927615, TEST_TOL4, GSL_SUCCESS); + /* Bug report Lorenzo Moneta */ + + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1.5, 1.5, -100., &r), 456.44010011787485545, TEST_TOL4, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1.5, 1.5, 99., &r), 4.13360436014643309757065e36, TEST_TOL4, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1.5, 1.5, 100., &r), 1.0893724312430935129254e37, TEST_TOL4, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1.5, 1.5, 709., &r), 8.7396804160264899999692120e298, TEST_TOL4, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1.5, 1.5, 710., &r), 2.36563187217417898169834615e299, TEST_TOL4, GSL_SUCCESS); + + /* Bug report from Weibin Li */ + + #ifdef FIXME + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-37.8, 2.01, 103.58, &r), -6.21927211009e17, TEST_TOL1, GSL_SUCCESS); + #endif + + /* Testing BJG */ + + #ifdef COMPARISON_WITH_MATHEMATICA + /* Mathematica uses a different convention for M(-m,-n,x) */ + TEST_SF(s, gsl_sf_hyperg_1F1_int_e, (-1, -1, 0.1, &r), 1.1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_1F1_e, (-1, -1, 0.1, &r), 1.1, TEST_TOL0, GSL_SUCCESS); + #endif + /* U for integer parameters */ TEST_SF(s, gsl_sf_hyperg_U_int_e, (1, 1, 0.0001, &r), 8.634088070212725330, TEST_TOL0, GSL_SUCCESS); *************** *** 433,438 **** --- 455,588 ---- TEST_SF(s, gsl_sf_hyperg_U_e, (-2.0, 0.5, 0.0, &r), 0.75, TEST_TOL2, GSL_SUCCESS); TEST_SF(s, gsl_sf_hyperg_U_e, (-2.0, 0.5, 1e-20, &r), 0.75, TEST_TOL2, GSL_SUCCESS); + /* U(a,b,x) for x<0 [bug #27859] */ + + /* Tests for b >= 0 */ + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, 0, -0.1, &r), 1, TEST_TOL0, GSL_SUCCESS); + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 0, -0.1, &r), -0.1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 0, -0.1, &r), 0.21, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 0, -0.1, &r), -0.661, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, 0, -0.1, &r), 2.7721, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, 0, -0.1, &r), -14.52201, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, 0, -0.1, &r), 91.230301, TEST_TOL0, GSL_SUCCESS); + #endif + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, 1, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 1, -0.1, &r), -1.1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 1, -0.1, &r), 2.41, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 1, -0.1, &r), -7.891, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, 1, -0.1, &r), 34.3361, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, 1, -0.1, &r), -186.20251, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, 1, -0.1, &r), 1208.445361, TEST_TOL0, GSL_SUCCESS); + + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, ( 1, 2, -0.1, &r), -10.0, TEST_TOL0, GSL_SUCCESS); + #endif + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, 2, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 2, -0.1, &r), -2.1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 2, -0.1, &r), 6.61, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 2, -0.1, &r), -27.721, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, 2, -0.1, &r), 145.2201, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, 2, -0.1, &r), -912.30301, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, 2, -0.1, &r), 6682.263421, TEST_TOL0, GSL_SUCCESS); + + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, ( 2, 3, -0.1, &r), 100.0, TEST_TOL0, GSL_SUCCESS); + #endif + TEST_SF(s, gsl_sf_hyperg_U_e, ( 1, 3, -0.1, &r), 90.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, 3, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 3, -0.1, &r), -3.10, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 3, -0.1, &r), 12.81, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 3, -0.1, &r), -66.151, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, 3, -0.1, &r), 409.8241, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, 3, -0.1, &r), -2961.42351, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, 3, -0.1, &r), 24450.804481, TEST_TOL0, GSL_SUCCESS); + + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, ( 3, 4, -0.1, &r), -1000.0, TEST_TOL0, GSL_SUCCESS); + #endif + TEST_SF(s, gsl_sf_hyperg_U_e, ( 2, 4, -0.1, &r), -1900.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, ( 1, 4, -0.1, &r), -1810.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, 4, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 4, -0.1, &r), -4.10, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 4, -0.1, &r), 21.01, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 4, -0.1, &r), -129.181, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, 4, -0.1, &r), 926.5481, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, 4, -0.1, &r), -7594.16401, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, 4, -0.1, &r), 70015.788541, TEST_TOL0, GSL_SUCCESS); + + /* Tests for b < 0 */ + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, -1, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, -1, -0.1, &r), 0.9, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, -1, -0.1, &r), 0.01, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, -1, -0.1, &r), -0.031, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, -1, -0.1, &r), 0.1281, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, -1, -0.1, &r), -0.66151, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, -1, -0.1, &r), 4.098241, TEST_TOL0, GSL_SUCCESS); + #endif + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, -2, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, -2, -0.1, &r), 1.9, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, -2, -0.1, &r), 1.81, TEST_TOL0, GSL_SUCCESS); + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, -2, -0.1, &r), -0.001, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, -2, -0.1, &r), 0.0041, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, -2, -0.1, &r), -0.02101, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, -2, -0.1, &r), 0.129181, TEST_TOL0, GSL_SUCCESS); + #endif + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, -3, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, -3, -0.1, &r), 2.9, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, -3, -0.1, &r), 5.61, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, -3, -0.1, &r), 5.429, TEST_TOL0, GSL_SUCCESS); + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, -3, -0.1, &r), 0.0001, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, -3, -0.1, &r), -0.00051, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, -3, -0.1, &r), 0.003121, TEST_TOL0, GSL_SUCCESS); + #endif + + TEST_SF(s, gsl_sf_hyperg_U_e, ( 0, -4, -0.1, &r), 1.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, -4, -0.1, &r), 3.9, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, -4, -0.1, &r), 11.41, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, -4, -0.1, &r), 22.259, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-4, -4, -0.1, &r), 21.7161, TEST_TOL0, GSL_SUCCESS); + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-5, -4, -0.1, &r), -1e-5, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-6, -4, -0.1, &r), 0.000061, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-7, -4, -0.1, &r), -0.0004341, TEST_TOL0, GSL_SUCCESS); + #endif + + /* Tests for integer a */ + + TEST_SF(s, gsl_sf_hyperg_U_e, (-3, 0.5, -0.5, &r), -9.5, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-8, 0.5, -0.5, &r), 180495.0625, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-8, 1.5, -0.5, &r), 827341.0625, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-8, 1.5, -10, &r), 7.162987810253906e9, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (3, 6, -0.5, &r), -296.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (3, 7, -0.5, &r), 2824, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (5, 12, -1.7, &r), -153.262676210016018065768591104, TEST_TOL0, GSL_SUCCESS); + + /* A few random tests */ + + TEST_SF(s, gsl_sf_hyperg_U_e, (0, 0, -0.5, &r), 1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (0, 1, -0.5, &r), 1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (0, 1, -0.001, &r), 1, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 0.99, -0.1, &r), -1.09, TEST_TOL0, GSL_SUCCESS); + + #ifdef FIXME /* unimplemented case */ + TEST_SF(s, gsl_sf_hyperg_U_e, (-1, 0, -0.5, &r), -0.5, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-2, 0, -0.5, &r), 1.25, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_e, (-7, 0, -0.1, &r), -668.2263421, TEST_TOL0, GSL_SUCCESS); + #endif + + TEST_SF(s, gsl_sf_hyperg_U_int_e, (3, 6, -0.5, &r), -296.0, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_int_e, (3, 7, -0.5, &r), 2824, TEST_TOL0, GSL_SUCCESS); + TEST_SF(s, gsl_sf_hyperg_U_int_e, (5, 12, -1.7, &r), -153.262676210016018065768591104, TEST_TOL0, GSL_SUCCESS); + /* 2F1 */ TEST_SF(s, gsl_sf_hyperg_2F1_e, (1, 1, 1, 0.5, &r), 2.0, TEST_TOL0, GSL_SUCCESS); diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/statistics/Makefile.in gsl-1.14/statistics/Makefile.in *** gsl-1.13/statistics/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/statistics/Makefile.in Wed Mar 10 10:58:28 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 60,67 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 60,68 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 109,119 **** --- 110,122 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 127,132 **** --- 130,137 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 186,192 **** --- 191,199 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 251,259 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps statistics/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps statistics/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 258,266 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu statistics/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu statistics/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 302,315 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 309,354 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/absdev.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/covariance.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurtosis.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lag1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mean.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/median.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minmax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_variance.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantiles.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skew.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_nist.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttest.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/variance.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wabsdev.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkurtosis.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmean.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wskew.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wvariance.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 551,556 **** --- 590,596 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 596,601 **** --- 636,642 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/statistics/wvariance_source.c gsl-1.14/statistics/wvariance_source.c *** gsl-1.13/statistics/wvariance_source.c Wed Nov 19 09:13:47 2008 --- gsl-1.14/statistics/wvariance_source.c Wed Mar 10 10:57:14 2010 *************** *** 1,6 **** /* statistics/wvariance_source.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007 Jim Davies, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* statistics/wvariance_source.c * ! * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007, 2010 Jim Davies, Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 78,84 **** static double FUNCTION(compute,factor) (const BASE w[], const size_t wstride, const size_t n) { ! /* Find the factor ``N/(N-1)'' which multiplies the raw std dev */ long double a = 0 ; long double b = 0; --- 78,85 ---- static double FUNCTION(compute,factor) (const BASE w[], const size_t wstride, const size_t n) { ! /* Find the factor ``N/(N-1)'' which multiplies the raw std dev ! see the file doc/statnotes.tex for the derivation */ long double a = 0 ; long double b = 0; diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/sum/Makefile.in gsl-1.14/sum/Makefile.in *** gsl-1.13/sum/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/sum/Makefile.in Wed Mar 10 10:58:29 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 58,65 **** ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 58,66 ---- ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 107,117 **** --- 108,120 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 125,130 **** --- 128,135 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 184,190 **** --- 189,197 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 248,256 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps sum/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps sum/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 255,263 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sum/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu sum/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 299,312 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 306,337 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/levin_u.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/levin_utrunc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/work_u.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/work_utrunc.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 548,553 **** --- 573,579 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 593,598 **** --- 619,625 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/sys/ChangeLog gsl-1.14/sys/ChangeLog *** gsl-1.13/sys/ChangeLog Fri Aug 21 18:51:10 2009 --- gsl-1.14/sys/ChangeLog Wed Mar 10 10:57:14 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-02-15 Brian Gough + + * infnan.c: use #error if gsl_isnan or gsl_finite cannot be defined + 2009-08-21 Brian Gough * test.c (main): move x/=2 outside test of while loops because it diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/sys/Makefile.in gsl-1.14/sys/Makefile.in *** gsl-1.13/sys/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/sys/Makefile.in Wed Mar 10 10:58:29 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 59,66 **** ../err/libgslerr.la ../test/libgsltest.la libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 59,67 ---- ../err/libgslerr.la ../test/libgsltest.la libgslsys.la \ ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 108,118 **** --- 109,121 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 126,131 **** --- 129,136 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 185,191 **** --- 190,198 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 249,257 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps sys/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps sys/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 256,264 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sys/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu sys/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 300,313 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 307,346 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coerce.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expm1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcmp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdiv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hypot.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infnan.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/invhyp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldfrexp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log1p.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minmax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pow_int.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prec.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 549,554 **** --- 582,588 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 594,599 **** --- 628,634 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/sys/infnan.c gsl-1.14/sys/infnan.c *** gsl-1.13/sys/infnan.c Sat Jan 31 14:40:47 2009 --- gsl-1.14/sys/infnan.c Wed Mar 10 10:57:14 2010 *************** *** 1,6 **** /* sys/infnan.c * ! * Copyright (C) 2001, 2004, 2007 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,6 ---- /* sys/infnan.c * ! * Copyright (C) 2001, 2004, 2007, 2010 Brian Gough * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 94,99 **** --- 94,101 ---- int status = (y == y); return status; } + # else + # error "cannot define gsl_finite without HAVE_DECL_FINITE or HAVE_IEEE_COMPARISONS" # endif # if HAVE_DECL_ISNAN *************** *** 109,114 **** --- 111,118 ---- int status = (x != x); return status; } + # else + # error "cannot define gsl_isnan without HAVE_DECL_ISNAN or HAVE_IEEE_COMPARISONS" # endif # if HAVE_DECL_ISINF diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/test/Makefile.in gsl-1.14/test/Makefile.in *** gsl-1.13/test/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/test/Makefile.in Wed Mar 10 10:58:30 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 51,58 **** am_libgsltest_la_OBJECTS = results.lo libgsltest_la_OBJECTS = $(am_libgsltest_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 51,59 ---- am_libgsltest_la_OBJECTS = results.lo libgsltest_la_OBJECTS = $(am_libgsltest_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 98,108 **** --- 99,111 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 116,121 **** --- 119,126 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 175,181 **** --- 180,188 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 235,243 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps test/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 242,250 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 274,287 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 281,308 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/results.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 429,434 **** --- 450,456 ---- mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 474,479 **** --- 496,502 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/utils/Makefile.in gsl-1.14/utils/Makefile.in *** gsl-1.13/utils/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/utils/Makefile.in Wed Mar 10 10:58:30 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 50,57 **** am_libutils_la_OBJECTS = placeholder.lo libutils_la_OBJECTS = $(am_libutils_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 50,58 ---- am_libutils_la_OBJECTS = placeholder.lo libutils_la_OBJECTS = $(am_libutils_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 74,84 **** --- 75,87 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 92,97 **** --- 95,102 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 151,157 **** --- 156,164 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 214,222 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps utils/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps utils/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 221,229 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu utils/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 253,266 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 260,292 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcpy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtol.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/placeholder.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 385,390 **** --- 411,417 ---- mostlyclean-am distclean: distclean-am + -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 430,435 **** --- 457,463 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/vector/ChangeLog gsl-1.14/vector/ChangeLog *** gsl-1.13/vector/ChangeLog Thu Jul 9 20:29:39 2009 --- gsl-1.14/vector/ChangeLog Wed Mar 10 10:57:14 2010 *************** *** 1,3 **** --- 1,8 ---- + 2009-11-14 Brian Gough + + * gsl_vector_complex.h (GSL_VECTOR_COMPLEX): added missing + dereference + 2009-07-09 Brian Gough * init_source.c (FUNCTION): handle NULL argument in free diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/vector/Makefile.in gsl-1.14/vector/Makefile.in *** gsl-1.13/vector/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/vector/Makefile.in Wed Mar 10 10:58:30 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 63,70 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 63,71 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 114,124 **** --- 115,127 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 132,137 **** --- 135,142 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 191,197 **** --- 196,204 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 259,267 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps vector/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps vector/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 266,274 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vector/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu vector/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 313,326 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 320,359 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minmax.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prop.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reim.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subvector.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_static.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 563,568 **** --- 596,602 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 608,613 **** --- 642,648 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/vector/gsl_vector_complex.h gsl-1.14/vector/gsl_vector_complex.h *** gsl-1.13/vector/gsl_vector_complex.h Wed Nov 19 09:13:47 2008 --- gsl-1.14/vector/gsl_vector_complex.h Wed Mar 10 10:57:14 2010 *************** *** 7,13 **** #if GSL_RANGE_CHECK #define GSL_VECTOR_COMPLEX(zv, i) (((i) >= (zv)->size ? (gsl_error ("index out of range", __FILE__, __LINE__, GSL_EINVAL), 0):0 , *GSL_COMPLEX_AT((zv),(i)))) #else ! #define GSL_VECTOR_COMPLEX(zv, i) (GSL_COMPLEX_AT((zv),(i))) #endif #define GSL_COMPLEX_AT(zv,i) ((gsl_complex*)&((zv)->data[2*(i)*(zv)->stride])) --- 7,13 ---- #if GSL_RANGE_CHECK #define GSL_VECTOR_COMPLEX(zv, i) (((i) >= (zv)->size ? (gsl_error ("index out of range", __FILE__, __LINE__, GSL_EINVAL), 0):0 , *GSL_COMPLEX_AT((zv),(i)))) #else ! #define GSL_VECTOR_COMPLEX(zv, i) (*GSL_COMPLEX_AT((zv),(i))) #endif #define GSL_COMPLEX_AT(zv,i) ((gsl_complex*)&((zv)->data[2*(i)*(zv)->stride])) diff -x '*.info' -x '*.info-*' -C 2 -rcP gsl-1.13/wavelet/Makefile.in gsl-1.14/wavelet/Makefile.in *** gsl-1.13/wavelet/Makefile.in Tue Sep 8 10:32:19 2009 --- gsl-1.14/wavelet/Makefile.in Wed Mar 10 10:58:31 2010 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 60,67 **** ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --- 60,68 ---- ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la \ ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ *************** *** 109,119 **** --- 110,122 ---- AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ + DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ *************** *** 127,132 **** --- 130,137 ---- GSL_LIBS = @GSL_LIBS@ GSL_LT_CBLAS_VERSION = @GSL_LT_CBLAS_VERSION@ GSL_LT_VERSION = @GSL_LT_VERSION@ + GSL_MAJOR_VERSION = @GSL_MAJOR_VERSION@ + GSL_MINOR_VERSION = @GSL_MINOR_VERSION@ HAVE_AIX_IEEE_INTERFACE = @HAVE_AIX_IEEE_INTERFACE@ HAVE_DARWIN86_IEEE_INTERFACE = @HAVE_DARWIN86_IEEE_INTERFACE@ HAVE_DARWIN_IEEE_INTERFACE = @HAVE_DARWIN_IEEE_INTERFACE@ *************** *** 186,192 **** --- 191,199 ---- abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ *************** *** 250,258 **** exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps wavelet/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps wavelet/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 257,265 ---- exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu wavelet/Makefile'; \ $(am__cd) $(top_srcdir) && \ ! $(AUTOMAKE) --gnu wavelet/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *************** *** 301,314 **** distclean-compile: -rm -f *.tab.c .c.o: ! $(COMPILE) -c $< .c.obj: ! $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo --- 308,340 ---- distclean-compile: -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bspline.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daubechies.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwt.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haar.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wavelet.Plo@am__quote@ + .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo *************** *** 550,555 **** --- 576,582 ---- clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags *************** *** 595,600 **** --- 622,628 ---- installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic