[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-334-g6ee5f7c

[Sergey Poznyakoff]

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 Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=6ee5f7c3a24fddc05fe172543bb78ce4b6c5acf3

The branch, master has been updated
       via  6ee5f7c3a24fddc05fe172543bb78ce4b6c5acf3 (commit)
       via  75fd61273a89b647ded20182011d66fc33bb5743 (commit)
      from  a3519f8454a5e24d36ccac06a4da2b5b88a66232 (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 6ee5f7c3a24fddc05fe172543bb78ce4b6c5acf3
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Aug 27 09:49:31 2009 +0300

    Improve configure script.
    
    * configure.ac: New option --with-pythondir
    (PYTHON_SITE_DIR, PYTHON_EXEC_DIR): New subst variables.
    * python/libmu_py/Makefile.am: use pythonexec_LTLIBRARIES,
    instead of pythonexec_LTLIBRARIES.
    (pythonexecdir): New variable.
    * python/mailutils/Makefile.am: use pythonsite_PYTHON,
    instead of pkgpython_PYTHON.
    (pythonsitedir): New variable.

commit 75fd61273a89b647ded20182011d66fc33bb5743
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Aug 27 09:45:07 2009 +0300

    Fix leftover diagnostic messages.
    
    * movemail/movemail.c (_cb_mailbox_ownership): Fix
    leftover diagnostic messages.
    * config/mailutils-config.c (options): Fix typo.

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

Summary of changes:
 config/mailutils-config.c    |    2 +-
 configure.ac                 |   12 ++++++++++++
 movemail/movemail.c          |    4 ++--
 python/libmu_py/Makefile.am  |    5 +++--
 python/mailutils/Makefile.am |    3 ++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/config/mailutils-config.c b/config/mailutils-config.c
index c5007a9..e308227 100644
--- a/config/mailutils-config.c
+++ b/config/mailutils-config.c
@@ -37,7 +37,7 @@ static struct argp_option options[] = {
       "mbox, mh, maildir, mailer, imap, pop, sieve and all"), 0},
   {"info", 'i', NULL, 0,
    N_("print a list of configuration options used to build mailutils; "
-      "oprional arguments are interpreted as a list of configuration "
+      "optional arguments are interpreted as a list of configuration "
       "options to check for"), 0},
   {"verbose", 'v', NULL, 0,
    N_("increase output verbosity"), 0},
diff --git a/configure.ac b/configure.ac
index 513a373..20b7291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,6 +1136,18 @@ if test "$status_python" = yes; then
     if test "$status_python" = yes; then
       AC_DEFINE(WITH_PYTHON,1,[Enable Python support])
       MU_LIB_PY='${top_builddir}/python/libmu_py/libmu_py.la'
+      AC_SUBST([PYTHON_SITE_DIR])
+      AC_SUBST([PYTHON_EXEC_DIR])
+      AC_ARG_WITH([pythondir],
+           AC_HELP_STRING([--with-pythondir=DIR],
+                          [Specify the directory to install Python modules 
to]),
+           [case $withval in
+            /*)  PYTHON_SITE_DIR="${withval}/mailutils"
+                PYTHON_EXEC_DIR="${withval}/mailutils";;
+            *)   AC_MSG_ERROR([Argument to --with-pythondir must be an 
absolute directory name]);;
+            esac],
+          [PYTHON_SITE_DIR='$(pkgpythondir)'
+           PYTHON_EXEC_DIR='$(pkgpyexecdir)'])
     fi
   fi
 fi
diff --git a/movemail/movemail.c b/movemail/movemail.c
index 1f0d2a0..89c083d 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -195,7 +195,7 @@ _cb_mailbox_ownership (mu_debug_t debug, const char *str)
          if (!str[len])
            {
              mu_cfg_format_error (debug, MU_DEBUG_ERROR, 
-                                  _("Ownership method %s requires value"),
+                                  _("ownership method %s requires value"),
                                   str);
              return 1;
            }
@@ -231,7 +231,7 @@ _cb_mailbox_ownership (mu_debug_t debug, const char *str)
          if (!str[len])
            {
              mu_cfg_format_error (debug, MU_DEBUG_ERROR, 
-                                  _("Ownership method %s requires value"),
+                                  _("ownership method %s requires value"),
                                   str);
              return 1;
            }
diff --git a/python/libmu_py/Makefile.am b/python/libmu_py/Makefile.am
index ed11295..5f4238d 100644
--- a/python/libmu_py/Makefile.am
+++ b/python/libmu_py/Makefile.am
@@ -63,7 +63,8 @@ libmu_py_la_LIBADD = $(PYTHON_LIBS) @MU_COMMON_LIBRARIES@ \
  @address@hidden
  ${MU_LIB_MAILUTILS}
 
-pkgpyexec_LTLIBRARIES = c_api.la
-c_api_la_LDFLAGS = -avoid-version -module -rpath $(pkgpyexecdir)
address@hidden@
+pythonexec_LTLIBRARIES = c_api.la
+c_api_la_LDFLAGS = -avoid-version -module -rpath $(pythonexecdir)
 c_api_la_LIBADD = $(PYTHON_LIBS) ${MU_LIB_PY}
 c_api_la_SOURCES = c_api.c
diff --git a/python/mailutils/Makefile.am b/python/mailutils/Makefile.am
index 080db67..61a7f8e 100644
--- a/python/mailutils/Makefile.am
+++ b/python/mailutils/Makefile.am
@@ -17,7 +17,8 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-pkgpython_PYTHON=\
address@hidden@
+pythonsite_PYTHON=\
  __init__.py \
  error.py \
  address.py \


hooks/post-receive
-- 
GNU Mailutils