Merge commit 'origin/stable'

Conflicts:

	tests/automake.mk

diff --combined src/language/stats/crosstabs.q
index d49e3006d9614aed22955aede20dfe3d76b5708a,4c5309bfda6e1dd0053331ee9da3f8029b5c8a27..801b128b8a4ad1c5e0398caa897a4cee0a869f08
--- 1/src/language/stats/crosstabs.q
--- 2/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@@ -1861,7 -1861,6 +1861,6 @@@ display_crosstabulation (void
      tab_offset (table, -1, tab_row (table) - num_cells * n_rows);
      for (r = 0; r < n_rows; r++)
        {
-         char suffix = 0;
          bool mark_missing = false;
  
          if (cmd.miss == CRS_REPORT
@@@ -1870,6 -1869,7 +1869,7 @@@
  
          for (i = 0; i < num_cells; i++)
            {
+             char suffix = 0;
              double v;
  
              switch (cells[i])
@@@ -1878,7 -1878,7 +1878,7 @@@
                  v = row_tot[r];
                  break;
                case CRS_CL_ROW:
-                 v = 100.;
+                 v = 100.0;
                  suffix = '%';
                  break;
                case CRS_CL_COLUMN:
@@@ -1916,7 -1916,6 +1916,6 @@@
        {
        double ct = c < n_cols ? col_tot[c] : W;
          bool mark_missing = false;
-         char suffix = 0;
          int i;
  
          if (cmd.miss == CRS_REPORT && c < n_cols
@@@ -1925,13 -1924,13 +1924,13 @@@
  
          for (i = 0; i < num_cells; i++)
          {
+             char suffix = 0;
            double v;
  
            switch (cells[i])
              {
              case CRS_CL_COUNT:
                v = ct;
-                 suffix = '%';
                break;
              case CRS_CL_ROW:
                v = ct / W * 100.;
@@@ -1954,7 -1953,7 +1953,7 @@@
                  NOT_REACHED ();
              }
  
-             format_cell_entry (table, c, i, v, suffix, mark_missing);
+           format_cell_entry (table, c, i, v, suffix, mark_missing);
          }
          last_row = i;
        }
@@@ -2456,7 -2455,7 +2455,7 @@@ calc_r (double *X, double *Y, double *r
    for (sum_Xr = sum_X2r = 0., i = 0; i < n_rows; i++)
      {
        sum_Xr += X[i] * row_tot[i];
 -      sum_X2r += X[i] * X[i] * row_tot[i];
 +      sum_X2r += pow2 (X[i]) * row_tot[i];
      }
    Xbar = sum_Xr / W;
  
@@@ -2468,11 -2467,11 +2467,11 @@@
    Ybar = sum_Yc / W;
  
    S = sum_XYf - sum_Xr * sum_Yc / W;
 -  SX = sum_X2r - sum_Xr * sum_Xr / W;
 -  SY = sum_Y2c - sum_Yc * sum_Yc / W;
 +  SX = sum_X2r - pow2 (sum_Xr) / W;
 +  SY = sum_Y2c - pow2 (sum_Yc) / W;
    T = sqrt (SX * SY);
    *r = S / T;
 -  *ase_0 = sqrt ((sum_X2Y2f - (sum_XYf * sum_XYf) / W) / (sum_X2r * sum_Y2c));
 +  *ase_0 = sqrt ((sum_X2Y2f - pow2 (sum_XYf) / W) / (sum_X2r * sum_Y2c));
  
    {
      double s, c, y, t;
@@@ -2562,9 -2561,9 +2561,9 @@@ calc_symmetric (double v[N_SYMMETRIC], 
  
        Dr = Dc = W * W;
        for (r = 0; r < n_rows; r++)
 -        Dr -= row_tot[r] * row_tot[r];
 +        Dr -= pow2 (row_tot[r]);
        for (c = 0; c < n_cols; c++)
 -        Dc -= col_tot[c] * col_tot[c];
 +        Dc -= pow2 (col_tot[c]);
        }
  
        {
@@@ -3073,10 -3072,10 +3072,10 @@@ calc_directional (double v[N_DIRECTIONA
            }
  
        for (sum_ri2 = 0., i = 0; i < n_rows; i++)
 -        sum_ri2 += row_tot[i] * row_tot[i];
 +        sum_ri2 += pow2 (row_tot[i]);
  
        for (sum_cj2 = 0., j = 0; j < n_cols; j++)
 -        sum_cj2 += col_tot[j] * col_tot[j];
 +        sum_cj2 += pow2 (col_tot[j]);
  
        v[3] = (W * sum_fij2_ci - sum_ri2) / (W * W - sum_ri2);
        v[4] = (W * sum_fij2_ri - sum_cj2) / (W * W - sum_cj2);
@@@ -3166,9 -3165,9 +3165,9 @@@
        for (sum_Xr = sum_X2r = 0., i = 0; i < n_rows; i++)
          {
            sum_Xr += rows[i].f * row_tot[i];
 -          sum_X2r += rows[i].f * rows[i].f * row_tot[i];
 +          sum_X2r += pow2 (rows[i].f) * row_tot[i];
          }
 -      SX = sum_X2r - sum_Xr * sum_Xr / W;
 +      SX = sum_X2r - pow2 (sum_Xr) / W;
  
        for (SXW = 0., j = 0; j < n_cols; j++)
          {
@@@ -3176,7 -3175,7 +3175,7 @@@
  
            for (cum = 0., i = 0; i < n_rows; i++)
              {
 -              SXW += rows[i].f * rows[i].f * mat[j + i * n_cols];
 +              SXW += pow2 (rows[i].f) * mat[j + i * n_cols];
                cum += rows[i].f * mat[j + i * n_cols];
              }
  
@@@ -3193,7 -3192,7 +3192,7 @@@
        for (sum_Yc = sum_Y2c = 0., i = 0; i < n_cols; i++)
          {
            sum_Yc += cols[i].f * col_tot[i];
 -          sum_Y2c += cols[i].f * cols[i].f * col_tot[i];
 +          sum_Y2c += pow2 (cols[i].f) * col_tot[i];
          }
        SY = sum_Y2c - sum_Yc * sum_Yc / W;
  
@@@ -3203,7 -3202,7 +3202,7 @@@
  
            for (cum = 0., j = 0; j < n_cols; j++)
              {
 -              SYW += cols[j].f * cols[j].f * mat[j + i * n_cols];
 +              SYW += pow2 (cols[j].f) * mat[j + i * n_cols];
                cum += cols[j].f * mat[j + i * n_cols];
              }
  

diff --combined src/ui/gui/main.c
index 6d5f50e1bf0df744b1d14722776cfab4ad4eff6e,eca3f98f6866d9ddeb1a44133914c427f4bfad14..f68f2ad66a24ab3b4a1f774594de76c783dc895a
--- 1/src/ui/gui/main.c
--- 2/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@@ -20,6 -20,7 +20,7 @@@
  #include "progname.h"
  #include <stdlib.h>
  #include <getopt.h>
+ #include <gl/relocatable.h>
  
  #include <libpspp/version.h>
  #include <libpspp/copyleft.h>
@@@ -45,7 -46,7 +46,7 @@@ create_splash_window (void
    gtk_window_set_type_hint (GTK_WINDOW (splash),
                            GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
  
-   image = gtk_image_new_from_file (PKGDATADIR "/splash.png");
+   image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png"));
  
    gtk_container_add (GTK_CONTAINER (splash), image);
  
@@@ -109,7 -110,7 +110,7 @@@ main (int argc, char *argv[]
                                 GTK_MINOR_VERSION,
                                 GTK_MICRO_VERSION)) )
      {
 -      g_critical (vers);
 +      g_warning (vers);
      }
  
    /* Deal with options like --version, --help etc */

diff --combined tests/automake.mk
index 2f876cfbefea879bed780a8a127584272e18f438,bfca93d4b90218fc00bcb57ad65e17fd5e22b15d..dfd49170a6d97337c548f9e8bb1c33d64b9eddc2
--- 1/tests/automake.mk
--- 2/tests/automake.mk
+++ b/tests/automake.mk
@@@ -40,7 -40,6 +40,7 @@@ dist_TESTS = 
        tests/command/n_of_cases.sh \
        tests/command/npar-binomial.sh \
        tests/command/npar-chisquare.sh \
 +      tests/command/npar-wilcoxon.sh \
        tests/command/oneway.sh \
        tests/command/oneway-missing.sh \
        tests/command/oneway-with-splits.sh \
@@@ -51,7 -50,6 +51,7 @@@
        tests/command/rename.sh \
        tests/command/regression.sh \
        tests/command/regression-qr.sh \
 +      tests/command/reliability.sh \
        tests/command/sample.sh \
        tests/command/sort.sh \
        tests/command/sysfiles.sh \
@@@ -109,7 -107,6 +109,7 @@@
        tests/bugs/double-frequency.sh \
        tests/bugs/empty-do-repeat.sh \
        tests/bugs/get.sh \
 +      tests/bugs/examine-crash.sh \
        tests/bugs/examine-1sample.sh \
        tests/bugs/examine-missing.sh \
        tests/bugs/examine-missing2.sh \
@@@ -170,8 -167,6 +170,8 @@@ nodist_TESTS = 
        tests/libpspp/abt-test \
        tests/libpspp/bt-test \
        tests/libpspp/heap-test \
 +      tests/libpspp/hmap-test \
 +      tests/libpspp/hmapx-test \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
@@@ -191,7 -186,6 +191,7 @@@ tests_libpspp_ll_test_SOURCES = 
        src/libpspp/ll.h \
        tests/libpspp/ll-test.c
  tests_libpspp_ll_test_LDADD = gl/libgl.la @LIBINTL@
 +tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS)
  
  tests_libpspp_llx_test_SOURCES = \
        src/libpspp/ll.c \
@@@ -200,7 -194,6 +200,7 @@@
        src/libpspp/llx.h \
        tests/libpspp/llx-test.c
  tests_libpspp_llx_test_LDADD = gl/libgl.la @LIBINTL@
 +tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
  
  tests_libpspp_heap_test_SOURCES = \
        src/libpspp/heap.c \
@@@ -211,22 -204,6 +211,22 @@@
  tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@
  tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
  
 +tests_libpspp_hmap_test_SOURCES = \
 +      src/libpspp/hmap.c \
 +      src/libpspp/hmap.h \
 +      tests/libpspp/hmap-test.c
 +tests_libpspp_hmap_test_LDADD = gl/libgl.la @LIBINTL@
 +tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 +
 +tests_libpspp_hmapx_test_SOURCES = \
 +      src/libpspp/hmap.c \
 +      src/libpspp/hmap.h \
 +      src/libpspp/hmapx.c \
 +      src/libpspp/hmapx.h \
 +      tests/libpspp/hmapx-test.c
 +tests_libpspp_hmapx_test_LDADD = gl/libgl.la @LIBINTL@
 +tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 +
  tests_libpspp_abt_test_SOURCES = \
        src/libpspp/abt.c \
        src/libpspp/abt.h \
@@@ -263,7 -240,7 +263,7 @@@ tests_libpspp_range_set_test_CPPFLAGS 
  
  tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
 -tests_libpspp_str_test_LDADD = src/libpspp/libpspp.a gl/libgl.la @LIBINTL@
 +tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la @LIBINTL@
  
  tests_libpspp_tower_test_SOURCES = \
        src/libpspp/abt.c \
@@@ -293,7 -270,7 +293,7 @@@ tests_dissect_sysfile_SOURCES = 
        src/libpspp/float-format.c \
        tests/dissect-sysfile.c
  tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@
- tests_dissect_sysfile_CFLAGS = $(AM_CFLAGS)
+ tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
  
  EXTRA_DIST += \
        $(dist_TESTS) \