Commit cda59e1e authored by Matthias Andree's avatar Matthias Andree

Synch with relevant changes from master.

parent d3f5a35b
......@@ -6,9 +6,13 @@
.deps/
.project
.rsyncs
.settings/
.vscode/
/nbproject/
ABOUT-NLS
aclocal.m4
ANNOUNCE.EMAIL
ar-lib
autobuild/
autom4te.cache
build*
......@@ -36,7 +40,9 @@ fetchmail-man.html
fetchmail.spec
fetchmailconf
genlsm.sh
IMAPCapa
install-sh
intl/
libfm.a
m4/
Mailbox-Names-UTF7.html
......@@ -60,13 +66,10 @@ rfc822valid
stamp-h1
tags
test-driver
test-suite.log
TODO
unmime
x509_name_match
ylwrap
\#*#
.settings/
.vscode/
_build*
ANNOUNCE.EMAIL
ar-lib
# Makefile for fetchmail
SUBDIRS= . po
AUTOMAKE_OPTIONS= 1.11 foreign no-dist-gzip dist-xz subdir-objects
AUTOMAKE_OPTIONS= 1.11 foreign no-dist-gzip dist-xz color-tests parallel-tests subdir-objects
ACLOCAL_AMFLAGS= -I m4 -I m4-local
AM_YFLAGS= -d
......
......@@ -63,7 +63,7 @@ my $tmp = $ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp";
# extract version from source
my $version =`grep 'AC_INIT' configure.ac`;
$version =~ /AC_INIT\([^,]*,\[?([0-9.rcbeta-]+)\]?\,.*\)/;
$version =~ /AC_INIT\([^,]*,\[?([0-9.rcbetalph-]+)\]?\,.*\)/;
$version = $1;
die "cannot determine version" unless defined $1;
my $tag = "RELEASE_$version";
......
......@@ -26,6 +26,7 @@
#include "config.h" /* import AC_C_CONST effects */
#include "norm_charmap.h"
#include "fetchmail.h"
#include <string.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment