[Pspp-commits] [SCM] GNU PSPP branch, master, updated. v0.6.1-1200-g9194602

[Ben Pfaff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU PSPP".

The branch, master has been updated
       via  91946022cdf4716dee3d802dd9827169cf995912 (commit)
       via  c123de464dea801978314665b174f735a873378d (commit)
       via  28e36cf42e55d270c8304c79f8845bf5f8e54516 (commit)
      from  481f3974a34b31728f28d2e4b1cfc392c3a3586b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91946022cdf4716dee3d802dd9827169cf995912
Author: Ben Pfaff <address@hidden>
Date:   Thu Apr 15 20:39:47 2010 -0700

    Move definition of UI_FILES out of HAVE_GUI.
    
    UI_FILES needs to be defined regardless of whether the GUI is being built,
    because the .ui files are needed to generate pspp.pot.  (We don't want
    pspp.pot to depend on whether the GUI is configured, either.)
    
    Problem reported by Michel Boaventura <address@hidden>.

commit c123de464dea801978314665b174f735a873378d
Author: Ben Pfaff <address@hidden>
Date:   Sat Mar 27 11:32:07 2010 -0700

    configure.ac: Define DEPENDS_ON_LIBINTL if LIBINTL is nonempty.
    
    This avoids a collision between the gnulib and libintl printf wrappers.
    See http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/21139 for
    more information.
    
    Thanks to Michel Boaventura for reporting the problem and to Bruno Haible
    for the fix.

commit 28e36cf42e55d270c8304c79f8845bf5f8e54516
Author: Ben Pfaff <address@hidden>
Date:   Sat Mar 27 11:30:01 2010 -0700

    configure.ac: Restore use of AM_GNU_GETTEXT.
    
    AM_GNU_GETTEXT is useful for its sophisticated support for finding the
    libraries needed to use gettext, but it also calls AM_PO_SUBDIRS, which
    we do not want because PSPP has its own "po" directory makefile support.
    
    This commit reintroduces AM_GNU_GETTEXT but disables AM_PO_SUBDIRS by
    declaring that we have already called it using AC_PROVIDE.  It also
    adds a dummy Makefile.in to the "po" directory and an ABOUT-NLS file
    because Automake requires both.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                   |    7 +-
 ABOUT-NLS                    | 1303 ++++++++++++++++++++++++++++++++++++++++++
 Makefile.am                  |    2 +-
 Smake                        |    1 -
 configure.ac                 |   13 +-
 po/.gitignore                |    2 -
 po/Makefile.in               |   11 +
 src/ui/automake.mk           |    2 -
 src/ui/gui/automake.mk       |   65 +--
 src/ui/gui/sheet/automake.mk |    3 +-
 10 files changed, 1361 insertions(+), 48 deletions(-)
 create mode 100644 ABOUT-NLS
 create mode 100644 po/Makefile.in


hooks/post-receive
-- 
GNU PSPP