[SCM] GNU Mailutils branch, master, updated. release-2.2-630-g83f7cbe

[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=83f7cbe72032cf88b24039fee63efb44e79c18de

The branch, master has been updated
       via  83f7cbe72032cf88b24039fee63efb44e79c18de (commit)
       via  7080a2ee6d381f39b3cce24dbb6cef6d311dbec8 (commit)
      from  1cbbd572d56b7a77362992181ef008db8a11688f (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 83f7cbe72032cf88b24039fee63efb44e79c18de
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Aug 6 08:21:58 2012 +0300

    Fix a typo.

commit 7080a2ee6d381f39b3cce24dbb6cef6d311dbec8
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Aug 6 08:12:40 2012 +0300

    mailutils-config: reflect eventual rename of mu, so that AM_GNU_MAILUTILS 
works.
    
    * mu/.gitignore: Update.
    * mu/Makefile.am: Build mailutils-config
    * mu/mailutils-config.in: New file.
    * mu/mailutils-config: Remove.

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

Summary of changes:
 ChangeLog.amend                              |    3 +++
 mu/.gitignore                                |    1 +
 mu/Makefile.am                               |   12 ++++++++++--
 mu/{mailutils-config => mailutils-config.in} |   21 +++++++++++++--------
 4 files changed, 27 insertions(+), 10 deletions(-)
 rename mu/{mailutils-config => mailutils-config.in} (75%)
 mode change 100755 => 100644

diff --git a/ChangeLog.amend b/ChangeLog.amend
index 8c6d963..6b35ac9 100644
--- a/ChangeLog.amend
+++ b/ChangeLog.amend
@@ -1,5 +1,8 @@
 # Spelling corrections for GNU Mailutils ChangeLog
 
+1cbbd572d56b7a77362992181ef008db8a11688f
+s/consisten/consistent/
+
 e02df56cb384465b3238c46c6f214f27ee8431ab
 s/command on 64 boxes/command on 64-bit boxes/
 
diff --git a/mu/.gitignore b/mu/.gitignore
index c159d48..de89b9a 100644
--- a/mu/.gitignore
+++ b/mu/.gitignore
@@ -1,3 +1,4 @@
 mu
 mu-setup.c
 mu-setup.h
+mailutils-config
diff --git a/mu/Makefile.am b/mu/Makefile.am
index 4ca4100..ae307ea 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -16,7 +16,15 @@
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS = mu
-dist_bin_SCRIPTS = mailutils-config
+bin_SCRIPTS = mailutils-config
+
+CLEANFILES=mailutils-config
+mailutils-config: $(top_srcdir)/mu/mailutils-config.in
+       $(AM_V_GEN)muname=`echo mu | \
+              sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+              sed 'N;N;N;s,\n, ,g'`; \
+       sed 's/MUNAME/'$$muname'/g' $(top_srcdir)/mu/mailutils-config.in > 
mailutils-config
+
 
 IDLE_MODULES=
 
@@ -101,7 +109,7 @@ AM_CPPFLAGS = \
   -DDBMLIBS="\"$(DBMLIBS)\""
 
 BUILT_SOURCES=mu-setup.c mu-setup.h
-EXTRA_DIST=mu-setup.awk mu-setup.c mu-setup.h template.c
+EXTRA_DIST=mu-setup.awk mu-setup.c mu-setup.h template.c mailutils-config.in
 
 mu-setup.h: Makefile.am $(MODULES) $(IDLE_MODULES) 
        $(AM_V_GEN)$(AWK) -f $(top_srcdir)/mu/mu-setup.awk -v mode=h \
diff --git a/mu/mailutils-config b/mu/mailutils-config.in
old mode 100755
new mode 100644
similarity index 75%
rename from mu/mailutils-config
rename to mu/mailutils-config.in
index 5e05b9d..b7e3661
--- a/mu/mailutils-config
+++ b/mu/mailutils-config.in
@@ -15,6 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
+# Despite being deprecated, this script is retained as an intermediate
+# layer between mu and the AM_GNU_MAILUTILS macro.  This is important,
+# because some distros prefer to rename mu when installing.  Using this 
+# script allows AM_GNU_MAILUTILS to find mu even if it was renamed.
+
 mode=
 file=
 dir=`expr "$0" : '\(.*\)/.*'`
@@ -29,13 +34,13 @@ alternatives instead:
 
        Traditional usage          |   Use instead
     ------------------------------+-------------------
-    mailutils-config --compile    | mu cflags
-    mailutils-config --link       | mu ldflags
-    mailutils-config --info       | mu info
-    mailutils-config --query      | mu query
-    mailutils-config --query=FILE | mu query -f FILE
+    mailutils-config --compile    | MUNAME cflags
+    mailutils-config --link       | MUNAME ldflags
+    mailutils-config --info       | MUNAME info
+    mailutils-config --query      | MUNAME query
+    mailutils-config --query=FILE | MUNAME query -f FILE
 
-For more information, try \`mu --help'.
+For more information, try \`MUNAME --help'.
 
 EOT
     exit 0
@@ -88,7 +93,7 @@ do
     usage
     ;;
   -V|--version|--versio|--versi|--vers|--ver|--ve|--v)
-    mu --version | sed -n '1{s/^mu/mailutils-config/;s/(\(GNU Mailutils\)) 
\([0-9][0-9.]*\).*/(\1 \2)/;p}'
+    MUNAME --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU 
Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}'
     exit 0
     ;;
   *)
@@ -106,4 +111,4 @@ if test -n "$file"; then
   set -- -f"$file" $*
 fi
 
-mu $mode $*
+MUNAME $mode $*


hooks/post-receive
-- 
GNU Mailutils