Commit b77bc50e b77bc50eaeccb0c626d0c84e00844efa7dc75c55 by Sergey Poznyakoff

Switched to Git repository.

* m4: Rename to am.
* README-alpha, README-hacking: Reflect the switch.
* */.cvsignore: Rename to .gitignore, update.
* gnulib.modules: Add gitlog-to-changelog.
* ChangeLog: Remove.
1 parent adff7f0d
Showing 85 changed files with 78 additions and 23 deletions
This diff could not be displayed because it is too large.
1 ## Process this file with GNU Automake to create Makefile.in 1 ## Process this file with GNU Automake to create Makefile.in
2 2
3 ## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 3 ## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008
4 ## Free Software Foundation, Inc. 4 ## Free Software Foundation, Inc.
5 ## 5 ##
6 ## GNU Mailutils is free software; you can redistribute it and/or 6 ## GNU Mailutils is free software; you can redistribute it and/or
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 AUTOMAKE_OPTIONS = gnits 1.8.5 dist-bzip2 std-options 21 AUTOMAKE_OPTIONS = gnits 1.8.5 dist-bzip2 std-options
22 ACLOCAL_AMFLAGS = -I m4 22 ACLOCAL_AMFLAGS = -I m4 -I am
23 23
24 SUBDIRS = \ 24 SUBDIRS = \
25 include\ 25 include\
...@@ -58,6 +58,39 @@ SUBDIRS = \ ...@@ -58,6 +58,39 @@ SUBDIRS = \
58 58
59 EXTRA_DIST = COPYING.LESSER 59 EXTRA_DIST = COPYING.LESSER
60 60
61 gen_start_date = 2008-05-05
62 .PHONY: make-ChangeLog
63 make-ChangeLog:
64 if test -d .git; then \
65 $(top_srcdir)/scripts/gitlog-to-changelog \
66 --since=$(gen_start_date) | \
67 sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \
68 echo " " >> $(distdir)/cl-t; \
69 echo "Local Variables:" >> $(distdir)/cl-t; \
70 echo "mode: change-log" >> $(distdir)/cl-t; \
71 echo "version-control: never" >> $(distdir)/cl-t; \
72 echo "buffer-read-only: t" >> $(distdir)/cl-t; \
73 echo "End:" >> $(distdir)/cl-t; \
74 rm -f $(distdir)/ChangeLog; \
75 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
76 fi
77
78 dist-hook: make-ChangeLog
79
80 .PHONY: ChangeLog
81 ChangeLog:
82 if test -d .git; then \
83 $(top_srcdir)/scripts/gitlog-to-changelog \
84 --since=$(gen_start_date) | \
85 sed '/<unknown>$$/d' | fmt -s > ChangeLog; \
86 echo " " >> ChangeLog; \
87 echo "Local Variables:" >> ChangeLog; \
88 echo "mode: change-log" >> ChangeLog; \
89 echo "version-control: never" >> ChangeLog; \
90 echo "buffer-read-only: t" >> ChangeLog; \
91 echo "End:" >> ChangeLog; \
92 fi
93
61 alpha: 94 alpha:
62 $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"` 95 $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`
63 96
......
1 This is the GNU mailutils package. 1 This is the GNU mailutils package.
2 This document describes the actions needed to build the pre-release 2 This document describes the actions needed to build the pre-release
3 or CVS version of the package. See end of file for copying conditions. 3 or Git version of the package. See end of file for copying conditions.
4 4
5 * Introduction 5 * Introduction
6 6
7 This is a *pre-release* version, and not ready for production use 7 This is a *pre-release* version, and not ready for production use
8 yet. If you are taking source from CVS, you will need to have several 8 yet. If you are taking source from Git, you will need to have several
9 special tools to help contribute. See the file README-hacking for more 9 special tools to help contribute. See the file README-hacking for more
10 information, See chapter `Building' for the detailed instructions on 10 information, See chapter `Building' for the detailed instructions on
11 how to build the package. 11 how to build the package.
12 12
13 Please, note that the accompanying documentation may be inaccurate 13 Please, note that the accompanying documentation may be inaccurate
14 or incomplete. The ChangeLog file is the authoritative documentation of 14 or incomplete. The Git logs are the authoritative documentation of
15 all recent changes. 15 all recent changes.
16 16
17 Report bugs to <bug-mailutils@gnu.org> 17 Report bugs to <bug-mailutils@gnu.org>
...@@ -19,11 +19,11 @@ Report bugs to <bug-mailutils@gnu.org> ...@@ -19,11 +19,11 @@ Report bugs to <bug-mailutils@gnu.org>
19 * Checking Out the Sources 19 * Checking Out the Sources
20 20
21 The following instructions apply if you wish to obtain sources from 21 The following instructions apply if you wish to obtain sources from
22 the CVS repository: 22 the Git repository:
23 23
24 To checkout the source tree from CVS issue the following command: 24 To clone the source tree from the repository, issue the following command:
25 25
26 cvs -d :pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/mailutils checkout mailutils 26 git clone git://git.savannah.gnu.org/mailutils.git
27 27
28 This will give you read-only access. If you think you need write access, 28 This will give you read-only access. If you think you need write access,
29 contact the mailing list. 29 contact the mailing list.
...@@ -69,7 +69,7 @@ Now set your breakpoints and proceed as usual. ...@@ -69,7 +69,7 @@ Now set your breakpoints and proceed as usual.
69 69
70 * Copyright information: 70 * Copyright information:
71 71
72 Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. 72 Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
73 73
74 Permission is granted to anyone to make or distribute verbatim copies 74 Permission is granted to anyone to make or distribute verbatim copies
75 of this document as received, in any medium, provided that the 75 of this document as received, in any medium, provided that the
......
1 These notes intend to help people working on the CVS version of 1 These notes intend to help people working on the Git version of
2 this package. 2 this package.
3 3
4 * Requirements 4 * Requirements
5 5
6 You need the following packages to build the CVS version of GNU 6 You need the following packages to build the Git version of GNU
7 Mailutils. We do not make any efforts to accommodate older versions of 7 Mailutils. We do not make any efforts to accommodate older versions of
8 these packages, so please make sure that you have the latest stable 8 these packages, so please make sure that you have the latest stable
9 version. 9 version.
...@@ -20,8 +20,8 @@ version. ...@@ -20,8 +20,8 @@ version.
20 20
21 * Bootstrapping 21 * Bootstrapping
22 22
23 Obviously, if you are reading these notes, you did manage to check out 23 Obviously, if you are reading these notes, you did manage to clone
24 Mailutils from CVS. The next step is to get other files needed to build, 24 Mailutils from Git. The next step is to get other files needed to build,
25 which are extracted from other source packages: 25 which are extracted from other source packages:
26 26
27 1. Change to the source tree directory 27 1. Change to the source tree directory
...@@ -59,7 +59,7 @@ For more information about `bootstrap', run `bootstrap --help'. ...@@ -59,7 +59,7 @@ For more information about `bootstrap', run `bootstrap --help'.
59 59
60 * Copyright information 60 * Copyright information
61 61
62 Copyright (C) 2007 Free Software Foundation, Inc. 62 Copyright (C) 2007, 2008 Free Software Foundation, Inc.
63 63
64 Permission is granted to anyone to make or distribute verbatim copies 64 Permission is granted to anyone to make or distribute verbatim copies
65 of this document as received, in any medium, provided that the 65 of this document as received, in any medium, provided that the
......
...@@ -204,7 +204,7 @@ mu_grad_logger(int level, ...@@ -204,7 +204,7 @@ mu_grad_logger(int level,
204 strcat (pfx, fmt); 204 strcat (pfx, fmt);
205 } 205 }
206 } 206 }
207 mu_diag_voutput (mlevel[level & L_PRIMASK], pfx ? pfx : fmt, ap); 207 mu_diag_voutput (mlevel[level & GRAD_LOG_PRIMASK], pfx ? pfx : fmt, ap);
208 if (pfx) 208 if (pfx)
209 free(pfx); 209 free(pfx);
210 } 210 }
......
...@@ -539,9 +539,10 @@ fi ...@@ -539,9 +539,10 @@ fi
539 539
540 # Reconfigure, getting other files. 540 # Reconfigure, getting other files.
541 541
542 aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
542 for command in \ 543 for command in \
543 libtool \ 544 libtool \
544 'aclocal --force -I m4' \ 545 "aclocal --force $aclocal_flags" \
545 'autoconf --force' \ 546 'autoconf --force' \
546 'autoheader --force' \ 547 'autoheader --force' \
547 'automake --add-missing --copy --force-missing'; 548 'automake --add-missing --copy --force-missing';
......
...@@ -786,13 +786,10 @@ MU_ENABLE_SUPPORT(maildir) ...@@ -786,13 +786,10 @@ MU_ENABLE_SUPPORT(maildir)
786 786
787 # FIXME: Should be --with-radius 787 # FIXME: Should be --with-radius
788 MU_ENABLE_SUPPORT(radius, 788 MU_ENABLE_SUPPORT(radius,
789 [AC_CHECK_HEADERS([radius/radius.h],, 789 [AM_GNU_RADIUS(1.6,
790 [mu_cv_enable_radius=no]) 790 [MU_AUTHLIBS="$MU_AUTHLIBS -lgnuradius"
791 if test $mu_cv_enable_radius = yes; then 791 mu_cv_enable_radius=yes],
792 AC_CHECK_LIB(gnuradius, grad_dict_init, 792 [mu_cv_enable_radius=no])])
793 [MU_AUTHLIBS="$MU_AUTHLIBS -lgnuradius"],
794 [mu_cv_enable_radius=no])
795 fi])
796 793
797 AC_ARG_ENABLE([mh-utils], 794 AC_ARG_ENABLE([mh-utils],
798 AC_HELP_STRING([--enable-mh-utils], 795 AC_HELP_STRING([--enable-mh-utils],
......
...@@ -14,6 +14,7 @@ fnmatch ...@@ -14,6 +14,7 @@ fnmatch
14 getline 14 getline
15 getpass-gnu 15 getpass-gnu
16 gettext 16 gettext
17 gitlog-to-changelog
17 intprops 18 intprops
18 malloc 19 malloc
19 mbswidth 20 mbswidth
......
...@@ -15,6 +15,7 @@ forw ...@@ -15,6 +15,7 @@ forw
15 inc 15 inc
16 install-mh 16 install-mh
17 mailutils-mh.el 17 mailutils-mh.el
18 mailutils-mh.elc
18 mark 19 mark
19 mh_alias.h 20 mh_alias.h
20 mh_alias_gram.c 21 mh_alias_gram.c
......
1 *.gmo
2 *.mo
3 *.po
4 .reference
5 LINGUAS
6 Makefile
7 Makefile.in
8 Makefile.in.in
9 Makevars
10 Makevars.template
11 POTFILES
12 Rules-quot
13 boldquot.sed
14 en@boldquot.header
15 en@quot.header
16 insert-header.sed
17 insert-header.sin
18 mailutils.pot
19 quot.sed
20 remove-potcdate.sed
21 remove-potcdate.sin
22 stamp-po