patch to use GSL 1.8 instead of gslextras

[Ben Pfaff]

Here's a patch that removes lib/gslextras and uses GSL 1.8
instead.  I'd use Savannah but it's acting wacky.

My working directory also deletes all the files in lib/gslextras,
but I'm omitting that from this email because it's unenlightening
to see every line in those files with a - in front of it.

Comments?

? gsl.patch
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.66
diff -u -p -r1.66 ChangeLog
--- ChangeLog   5 Nov 2006 05:20:52 -0000       1.66
+++ ChangeLog   18 Dec 2006 03:12:06 -0000
@@ -1,3 +1,7 @@
+Sun Dec 17 19:06:50 2006  Ben Pfaff  <address@hidden>
+
+       * README: Now require GSL 1.8 or later.
+
 Sat Nov  4 15:59:31 2006  Ben Pfaff  <address@hidden>
 
        * configure.ac: Check for the "round" function added in C99.
Index: README
===================================================================
RCS file: /cvsroot/pspp/pspp/README,v
retrieving revision 1.13
diff -u -p -r1.13 README
--- README      26 Nov 2006 02:59:11 -0000      1.13
+++ README      18 Dec 2006 03:12:06 -0000
@@ -11,7 +11,7 @@ PSPP, you will need to install certain p
 
     * An ANSI C compiler and tool chain.
 
-    * The GNU Scientific Library (libgsl), version 1.6 or later,
+    * The GNU Scientific Library (libgsl), version 1.8 or later,
       including libgslcblas included with GSL.
 
     * Perl, version 5.005_03 or later.  (Perl is required during build
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/ChangeLog,v
retrieving revision 1.4
diff -u -p -r1.4 ChangeLog
--- lib/ChangeLog       31 Jul 2005 21:42:47 -0000      1.4
+++ lib/ChangeLog       18 Dec 2006 03:12:06 -0000
@@ -1,3 +1,7 @@
+Sun Dec 17 19:07:03 2006  Ben Pfaff  <address@hidden>
+
+       * gslextras: Removed, now that GSL 1.8 has these functions.
+
 Sun Jul 31 11:29:04 2005  Ben Pfaff  <address@hidden>
 
        * misc/: Removed in favor of gnulib.
Index: lib/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/automake.mk,v
retrieving revision 1.1
diff -u -p -r1.1 automake.mk
--- lib/automake.mk     4 Mar 2006 00:53:47 -0000       1.1
+++ lib/automake.mk     18 Dec 2006 03:12:06 -0000
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 include $(top_srcdir)/lib/linreg/automake.mk
-include $(top_srcdir)/lib/gsl-extras/automake.mk
 
 if WITHGUI
 include $(top_srcdir)/lib/gtksheet/automake.mk
Index: src/language/expressions/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/ChangeLog,v
retrieving revision 1.9
diff -u -p -r1.9 ChangeLog
--- src/language/expressions/ChangeLog  16 Dec 2006 20:22:14 -0000      1.9
+++ src/language/expressions/ChangeLog  18 Dec 2006 03:12:07 -0000
@@ -1,3 +1,10 @@
+Sun Dec 17 19:07:41 2006  Ben Pfaff  <address@hidden>
+
+       * helpers.c: Use functions from GSL 1.8 instead of our
+       supplemental lib/gslextras.
+
+       * operations.def: Ditto.
+
 Sat Dec 16 12:20:14 2006  Ben Pfaff  <address@hidden>
 
        * operations.def: Reverse order of arguments to DATEDIFF, for
Index: src/language/expressions/helpers.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/helpers.c,v
retrieving revision 1.9
diff -u -p -r1.9 helpers.c
--- src/language/expressions/helpers.c  16 Dec 2006 20:22:14 -0000      1.9
+++ src/language/expressions/helpers.c  18 Dec 2006 03:12:07 -0000
@@ -589,7 +589,7 @@ cdf_bvnor (double x0, double x1, double 
 double
 idf_fdist (double P, double df1, double df2) 
 {
-  double temp = gslextras_cdf_beta_Pinv (P, df1 / 2, df2 / 2);
+  double temp = gsl_cdf_beta_Pinv (P, df1 / 2, df2 / 2);
   return temp * df2 / ((1. - temp) * df1);
 }
 
Index: src/language/expressions/helpers.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/helpers.h,v
retrieving revision 1.9
diff -u -p -r1.9 helpers.h
--- src/language/expressions/helpers.h  14 Dec 2006 03:36:00 -0000      1.9
+++ src/language/expressions/helpers.h  18 Dec 2006 03:12:07 -0000
@@ -20,7 +20,6 @@
 #include <data/value.h>
 #include <data/variable.h>
 #include <data/vector.h>
-#include <gsl-extras/gsl-extras.h>
 #include <language/expressions/public.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
Index: src/language/expressions/operations.def
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/operations.def,v
retrieving revision 1.15
diff -u -p -r1.15 operations.def
--- src/language/expressions/operations.def     16 Dec 2006 20:22:14 -0000      
1.15
+++ src/language/expressions/operations.def     18 Dec 2006 03:12:08 -0000
@@ -649,7 +649,7 @@ function PDF.BETA (x >= 0 && x <= 1, a >
      = gsl_ran_beta_pdf (x, a, b);
 function CDF.BETA (x >= 0 && x <= 1, a > 0, b > 0) = gsl_cdf_beta_P (x, a, b);
 function IDF.BETA (P >= 0 && P <= 1, a > 0, b > 0)
-     = gslextras_cdf_beta_Pinv (P, a, b);
+     = gsl_cdf_beta_Pinv (P, a, b);
 no_opt function RV.BETA (a > 0, b > 0) = gsl_ran_beta (get_rng (), a, b);
 function NCDF.BETA (x >= 0, a > 0, b > 0, lambda > 0)
      = ncdf_beta (x, a, b, lambda);
@@ -852,7 +852,7 @@ no_opt function RV.BERNOULLI (p >= 0 && 
 
 // Binomial distribution.
 function CDF.BINOM (k, n > 0 && n == floor (n), p >= 0 && p <= 1)
-     = gslextras_cdf_binomial_P (k, p, n);
+     = gsl_cdf_binomial_P (k, p, n);
 function PDF.BINOM (k >= 0 && k == floor (k) && k <= n,
                     n > 0 && n == floor (n),
                     p >= 0 && p <= 1)
@@ -862,7 +862,7 @@ no_opt function RV.BINOM (p > 0 && p == 
 
 // Geometric distribution.
 function CDF.GEOM (k >= 1 && k == floor (k), p >= 0 && p <= 1)
-     = gslextras_cdf_geometric_P (k, p);
+     = gsl_cdf_geometric_P (k, p);
 function PDF.GEOM (k >= 1 && k == floor (k),
                    p >= 0 && p <= 1)
      = gsl_ran_geometric_pdf (k, p);
@@ -873,7 +873,7 @@ function CDF.HYPER (k >= 0 && k == floor
                     a > 0 && a == floor (a),
                     b > 0 && b == floor (b) && b <= a,
                     c > 0 && c == floor (c) && c <= a)
-     = gslextras_cdf_hypergeometric_P (k, c, a - c, b);
+     = gsl_cdf_hypergeometric_P (k, c, a - c, b);
 function PDF.HYPER (k >= 0 && k == floor (k) && k <= c,
                     a > 0 && a == floor (a),
                     b > 0 && b == floor (b) && b <= a,
@@ -892,7 +892,7 @@ no_opt extension function RV.LOG (p > 0 
 
 // Negative binomial distribution.
 function CDF.NEGBIN (k >= 1, n == floor (n), p > 0 && p <= 1)
-     = gslextras_cdf_negative_binomial_P (k, p, n);
+     = gsl_cdf_negative_binomial_P (k, p, n);
 function PDF.NEGBIN (k >= 1, n == floor (n), p > 0 && p <= 1)
      = gsl_ran_negative_binomial_pdf (k, p, n);
 no_opt function RV.NEGBIN (n == floor (n), p > 0 && p <= 1) 
@@ -900,7 +900,7 @@ no_opt function RV.NEGBIN (n == floor (n
 
 // Poisson distribution.
 function CDF.POISSON (k >= 0 && k == floor (k), mu > 0)
-     = gslextras_cdf_poisson_P (k, mu);
+     = gsl_cdf_poisson_P (k, mu);
 function PDF.POISSON (k >= 0 && k == floor (k), mu > 0)
      = gsl_ran_poisson_pdf (k, mu);
 no_opt function RV.POISSON (mu > 0) = gsl_ran_poisson (get_rng (), mu);
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.30
diff -u -p -r1.30 ChangeLog
--- src/ui/gui/ChangeLog        17 Dec 2006 00:01:05 -0000      1.30
+++ src/ui/gui/ChangeLog        18 Dec 2006 03:12:08 -0000
@@ -1,3 +1,8 @@
+Sun Dec 17 19:08:59 2006  Ben Pfaff  <address@hidden>
+
+       * automake.mk (src_ui_gui_psppire_LDADD): No need for
+       libgsl-extras.a anymore.
+
 Sun Dec 17 08:26:10 WST 2006 John Darrington <address@hidden>
 
        * syntax-editor-source.c syntax-editor-source.h syntax-editor.h: 
Index: src/ui/gui/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.17
diff -u -p -r1.17 automake.mk
--- src/ui/gui/automake.mk      17 Dec 2006 00:01:05 -0000      1.17
+++ src/ui/gui/automake.mk      18 Dec 2006 03:12:09 -0000
@@ -16,7 +16,6 @@ src_ui_gui_psppire_LDADD = \
        src/math/libpspp_math.a  \
        src/math/linreg/libpspp_linreg.a  \
        lib/linreg/liblinreg.a  \
-       lib/gsl-extras/libgsl-extras.a  \
        src/data/libdata.a \
        src/libpspp/libpspp.a \
        $(GTK_LIBS) \
Index: src/ui/terminal/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/ChangeLog,v
retrieving revision 1.19
diff -u -p -r1.19 ChangeLog
--- src/ui/terminal/ChangeLog   10 Dec 2006 19:14:37 -0000      1.19
+++ src/ui/terminal/ChangeLog   18 Dec 2006 03:12:09 -0000
@@ -1,3 +1,8 @@
+Sun Dec 17 19:08:46 2006  Ben Pfaff  <address@hidden>
+
+       * automake.mk (src_ui_terminal_pspp_LDADD): No need for
+       libgsl-extras.a anymore.
+
 Sun Dec 10 11:13:53 2006  Ben Pfaff  <address@hidden>
 
        * command-line.c (pre_syntax_message): Use term "syntax" instead
Index: src/ui/terminal/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/automake.mk,v
retrieving revision 1.12
diff -u -p -r1.12 automake.mk
--- src/ui/terminal/automake.mk 14 Dec 2006 10:45:20 -0000      1.12
+++ src/ui/terminal/automake.mk 18 Dec 2006 03:12:09 -0000
@@ -25,7 +25,6 @@ src_ui_terminal_pspp_LDADD =                                  
\
        src/math/libpspp_math.a  \
        src/math/linreg/libpspp_linreg.a  \
        lib/linreg/liblinreg.a  \
-       lib/gsl-extras/libgsl-extras.a  \
        src/data/libdata.a \
        src/libpspp/libpspp.a \
        gl/libgl.a      \


-- 
"Long noun chains don't automatically imply security."
--Bruce Schneier