[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-4-0-21-g48baeaf
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-4-0-21-g48baeaf |
|
Date: |
Tue, 12 Jan 2010 18:49:47 +0000 |
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 gsasl".
http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=48baeaf4d8b6b5c657cc215c73a4f34c30b5a27f
The branch, master has been updated
via 48baeaf4d8b6b5c657cc215c73a4f34c30b5a27f (commit)
via 835a0fc20ca11c370e2cba7b497862c8a4b2e5c1 (commit)
via a56bdf2c528c549317ed6dc6462556b2fb1cc0de (commit)
via ff10487637cfdffd1bb52bd4c3840f8df841848f (commit)
from 0f375c411ed9092ab6ffc744ea284dd617318f1b (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 48baeaf4d8b6b5c657cc215c73a4f34c30b5a27f
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 19:49:39 2010 +0100
Update gnulib files.
commit 835a0fc20ca11c370e2cba7b497862c8a4b2e5c1
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 18:16:52 2010 +0100
Fix valgrind.m4.
commit a56bdf2c528c549317ed6dc6462556b2fb1cc0de
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 17:30:28 2010 +0100
Fix.
commit ff10487637cfdffd1bb52bd4c3840f8df841848f
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 17:29:04 2010 +0100
Fix syntax-check stuff.
-----------------------------------------------------------------------
Summary of changes:
.x-sc_avoid_if_before_free | 2 --
.x-sc_cast_of_alloca_return_value | 3 ---
.x-sc_cast_of_x_alloc_return_value | 1 -
.x-sc_m4_quote_check | 2 --
.x-sc_makefile_check | 3 ---
.x-sc_po_check | 2 --
.x-sc_program_name | 3 ---
.x-sc_prohibit_HAVE_MBRTOWC | 2 --
.x-sc_prohibit_atoi_atof | 3 ---
.x-sc_prohibit_getopt_without_use | 1 -
.x-sc_prohibit_magic_number_exit | 3 ---
.x-sc_space_tab | 2 --
.x-sc_trailing_blank | 2 --
.x-sc_useless_cpp_parens | 2 --
cfg.mk | 3 ++-
gl/m4/gnulib-common.m4 | 10 +++++++++-
gl/m4/warnings.m4 | 10 +---------
gl/stdio.in.h | 2 +-
lib/gl/m4/gc.m4 | 4 ++--
lib/gl/m4/gnulib-common.m4 | 10 +++++++++-
lib/gl/stdio.in.h | 2 +-
m4/valgrind.m4 | 15 +++++++++------
maint.mk | 4 +++-
po/POTFILES.in | 6 ------
24 files changed, 37 insertions(+), 60 deletions(-)
delete mode 100644 .x-sc_avoid_if_before_free
delete mode 100644 .x-sc_cast_of_alloca_return_value
delete mode 100644 .x-sc_cast_of_x_alloc_return_value
delete mode 100644 .x-sc_m4_quote_check
delete mode 100644 .x-sc_makefile_check
delete mode 100644 .x-sc_prohibit_HAVE_MBRTOWC
delete mode 100644 .x-sc_prohibit_atoi_atof
delete mode 100644 .x-sc_prohibit_getopt_without_use
delete mode 100644 .x-sc_useless_cpp_parens
diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free
deleted file mode 100644
index 9a2efd1..0000000
--- a/.x-sc_avoid_if_before_free
+++ /dev/null
@@ -1,2 +0,0 @@
-^gl/
-^lib/gl/
diff --git a/.x-sc_cast_of_alloca_return_value
b/.x-sc_cast_of_alloca_return_value
deleted file mode 100644
index 170e5b4..0000000
--- a/.x-sc_cast_of_alloca_return_value
+++ /dev/null
@@ -1,3 +0,0 @@
-^gl/
-^gltests/
-^lib/gl/
diff --git a/.x-sc_cast_of_x_alloc_return_value
b/.x-sc_cast_of_x_alloc_return_value
deleted file mode 100644
index 888352d..0000000
--- a/.x-sc_cast_of_x_alloc_return_value
+++ /dev/null
@@ -1 +0,0 @@
-^gl/xalloc.h
diff --git a/.x-sc_m4_quote_check b/.x-sc_m4_quote_check
deleted file mode 100644
index 9a2efd1..0000000
--- a/.x-sc_m4_quote_check
+++ /dev/null
@@ -1,2 +0,0 @@
-^gl/
-^lib/gl/
diff --git a/.x-sc_makefile_check b/.x-sc_makefile_check
deleted file mode 100644
index 170e5b4..0000000
--- a/.x-sc_makefile_check
+++ /dev/null
@@ -1,3 +0,0 @@
-^gl/
-^gltests/
-^lib/gl/
diff --git a/.x-sc_po_check b/.x-sc_po_check
index 03b9748..e14639f 100644
--- a/.x-sc_po_check
+++ b/.x-sc_po_check
@@ -1,3 +1 @@
-^gl/m4/
-^lib/gl/
^lib/src/error.c
diff --git a/.x-sc_program_name b/.x-sc_program_name
index 55035c8..b6e0614 100644
--- a/.x-sc_program_name
+++ b/.x-sc_program_name
@@ -1,9 +1,6 @@
^doc/print-errors.c
^examples/
-^gl/
-^gltests/
^lib/digest-md5/test-parser.c
-^lib/gltests/
^lib/gs2/test-parser.c
^lib/tests/test-error.c
^tests/
diff --git a/.x-sc_prohibit_HAVE_MBRTOWC b/.x-sc_prohibit_HAVE_MBRTOWC
deleted file mode 100644
index 9a2efd1..0000000
--- a/.x-sc_prohibit_HAVE_MBRTOWC
+++ /dev/null
@@ -1,2 +0,0 @@
-^gl/
-^lib/gl/
diff --git a/.x-sc_prohibit_atoi_atof b/.x-sc_prohibit_atoi_atof
deleted file mode 100644
index 170e5b4..0000000
--- a/.x-sc_prohibit_atoi_atof
+++ /dev/null
@@ -1,3 +0,0 @@
-^gl/
-^gltests/
-^lib/gl/
diff --git a/.x-sc_prohibit_getopt_without_use
b/.x-sc_prohibit_getopt_without_use
deleted file mode 100644
index 460fe8e..0000000
--- a/.x-sc_prohibit_getopt_without_use
+++ /dev/null
@@ -1 +0,0 @@
-^gltests/test-getopt.c
diff --git a/.x-sc_prohibit_magic_number_exit b/.x-sc_prohibit_magic_number_exit
index e6d77dd..cb57ce9 100644
--- a/.x-sc_prohibit_magic_number_exit
+++ b/.x-sc_prohibit_magic_number_exit
@@ -1,6 +1,3 @@
^doc/gsasl.texi
^doc/specification/draft-ietf-cat-sasl-gssapi-05.txt
-^gl/
-^gltests/
-^lib/gl/m4/intdiv0.m4
^tests/
diff --git a/.x-sc_space_tab b/.x-sc_space_tab
index 09fb61f..e64c1c6 100644
--- a/.x-sc_space_tab
+++ b/.x-sc_space_tab
@@ -1,3 +1 @@
^doc/specification/
-^gl/
-^lib/gl/
diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank
index 3ed508c..0f84d70 100644
--- a/.x-sc_trailing_blank
+++ b/.x-sc_trailing_blank
@@ -1,10 +1,8 @@
^doc/.*.eps
^doc/.*.png
^doc/specification/
-^gl/
^lib/build-aux/pmccabe.css
^lib/build-aux/pmccabe2html
-^lib/gl/
^m4/pkg.m4
ChangeLog
Doxyfile
diff --git a/.x-sc_useless_cpp_parens b/.x-sc_useless_cpp_parens
deleted file mode 100644
index 9a2efd1..0000000
--- a/.x-sc_useless_cpp_parens
+++ /dev/null
@@ -1,2 +0,0 @@
-^gl/
-^lib/gl/
diff --git a/cfg.mk b/cfg.mk
index 1675e0f..8129da2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Simon Josefsson
#
# This file is part of GNU SASL.
#
@@ -31,6 +31,7 @@ local-checks-to-skip = sc_prohibit_strcmp
sc_error_message_uppercase \
sc_prohibit_have_config_h sc_require_config_h \
sc_require_config_h_first sc_unmarked_diagnostics \
sc_GPL_version sc_immutable_NEWS sc_copyright_check
+VC_LIST_NEVER = ^((lib/)?(gl|gltests|build-aux))/.*
autoreconf:
for f in po/*.po.in lib/po/*.po.in; do \
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index d53b9cb..b7812a8 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 11
+# gnulib-common.m4 serial 12
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,14 @@ m4_ifndef([m4_foreach_w],
[m4_define([m4_foreach_w],
[m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
# AC_PROG_MKDIR_P
# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
# Remove this macro when we can assume autoconf >= 2.60.
diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index 2745d73..dad5c1f 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -6,14 +6,6 @@ dnl with or without modifications, as long as this notice is
preserved.
dnl From Simon Josefsson
-# gl_AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
-# ----------------------------------------------------
-# Provide the functionality of AS_VAR_IF if Autoconf does not have it.
-m4_ifdef([AS_VAR_IF],
-[m4_copy([AS_VAR_IF], [gl_AS_VAR_IF])],
-[m4_define([gl_AS_VAR_IF],
-[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
-
# gl_AS_VAR_APPEND(VAR, VALUE)
# ----------------------------
# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
@@ -37,7 +29,7 @@ AC_CACHE_CHECK([whether compiler handles $1], [gl_Warn], [
CPPFLAGS="$save_CPPFLAGS"
])
AS_VAR_PUSHDEF([gl_Flags], m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]))dnl
-gl_AS_VAR_IF([gl_Warn], [yes], [gl_AS_VAR_APPEND([gl_Flags], [" $1"])])
+AS_VAR_IF([gl_Warn], [yes], [gl_AS_VAR_APPEND([gl_Flags], [" $1"])])
AS_VAR_POPDEF([gl_Flags])dnl
AS_VAR_POPDEF([gl_Warn])dnl
m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
index 80c1d44..284af8c 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -297,7 +297,7 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger
than 4 GB "
# define _GL_FTELL_WARN /* Category 2, above. */
# undef ftell
# endif
-# if && @REPLACE_FTELL@
+# if @REPLACE_FTELL@
# undef ftell
# define ftell rpl_ftell
extern long ftell (FILE *fp) _GL_ARG_NONNULL ((1));
diff --git a/lib/gl/m4/gc.m4 b/lib/gl/m4/gc.m4
index 68693ad..3b2357d 100644
--- a/lib/gl/m4/gc.m4
+++ b/lib/gl/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 5
+# gc.m4 serial 6
dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_GC],
AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
libgcrypt=$withval, libgcrypt=yes)
if test "$libgcrypt" != no; then
- AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
fi
if test "$ac_cv_libgcrypt" = yes; then
AC_LIBOBJ([gc-libgcrypt])
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index d53b9cb..b7812a8 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 11
+# gnulib-common.m4 serial 12
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,14 @@ m4_ifndef([m4_foreach_w],
[m4_define([m4_foreach_w],
[m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
# AC_PROG_MKDIR_P
# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
# Remove this macro when we can assume autoconf >= 2.60.
diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h
index 3b9cb7f..adeefa9 100644
--- a/lib/gl/stdio.in.h
+++ b/lib/gl/stdio.in.h
@@ -297,7 +297,7 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger
than 4 GB "
# define _GL_FTELL_WARN /* Category 2, above. */
# undef ftell
# endif
-# if && @REPLACE_FTELL@
+# if @REPLACE_FTELL@
# undef ftell
# define ftell rpl_ftell
extern long ftell (FILE *fp) _GL_ARG_NONNULL ((1));
diff --git a/m4/valgrind.m4 b/m4/valgrind.m4
index 5a8006a..e22370f 100644
--- a/m4/valgrind.m4
+++ b/m4/valgrind.m4
@@ -1,4 +1,4 @@
-# valgrind.m4 serial 1
+# valgrind.m4 serial 2
dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -11,20 +11,23 @@ dnl From Simon Josefsson
# Check if valgrind is available, and set VALGRIND to it if available.
AC_DEFUN([sj_VALGRIND],
[
+ AC_ARG_ENABLE(valgrind-tests,
+ AS_HELP_STRING([--enable-valgrind-tests],
+ [run self tests under valgrind]),
+ [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
+
# Run self-tests under valgrind?
- if test "$cross_compiling" = no; then
+ if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
AC_CHECK_PROGS(VALGRIND, valgrind)
fi
+
if test -n "$VALGRIND" && $VALGRIND true > /dev/null 2>&1; then
opt_valgrind_tests=yes
else
opt_valgrind_tests=no
VALGRIND=
fi
+
AC_MSG_CHECKING([whether self tests are run under valgrind])
- AC_ARG_ENABLE(valgrind-tests,
- AS_HELP_STRING([--enable-valgrind-tests],
- [run self tests under valgrind]),
- opt_valgrind_tests=$enableval)
AC_MSG_RESULT($opt_valgrind_tests)
])
diff --git a/maint.mk b/maint.mk
index 3651543..c91b730 100644
--- a/maint.mk
+++ b/maint.mk
@@ -38,7 +38,9 @@ VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
VC_LIST_EXCEPT = \
$(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
- else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi
+ else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
+ | if test -n "$(VC_LIST_NEVER)"; then grep -Ev "$(VC_LIST_NEVER)"; \
+ else cat; fi
ifeq ($(origin prev_version_file), undefined)
prev_version_file = $(srcdir)/.prev-version
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e640eb8..3d74d0d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,4 @@
# List of source files containing translatable strings for GNU SASL.
-gl/error.c
-gl/gai_strerror.c
-gl/getopt.c
-gl/quotearg.c
-gl/version-etc.c
-gl/xalloc-die.c
src/imap.c
src/smtp.c
src/gsasl.c
hooks/post-receive
--
GNU gsasl
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-4-0-21-g48baeaf,
Simon Josefsson <=