[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-3-90-13-gf9b5c51
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-3-90-13-gf9b5c51 |
|
Date: |
Fri, 06 Nov 2009 14:15:45 +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=f9b5c51d9c2e92aa6e90582d31a2c5f36705a9b8
The branch, master has been updated
via f9b5c51d9c2e92aa6e90582d31a2c5f36705a9b8 (commit)
via 53a599e4296225ea43020d09ed50cf9091e84215 (commit)
via 9fa3e7f6ea7b7b2f07ea5ca9d33c562c3dc8702d (commit)
via e9bb56e35ea82a2db5860f46c34da441bcf97382 (commit)
from 7fe2900e81e7ae091dbcff8c77f31e6e567ea88e (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 f9b5c51d9c2e92aa6e90582d31a2c5f36705a9b8
Author: Simon Josefsson <address@hidden>
Date: Fri Nov 6 15:15:01 2009 +0100
Add.
commit 53a599e4296225ea43020d09ed50cf9091e84215
Author: Simon Josefsson <address@hidden>
Date: Fri Nov 6 14:44:40 2009 +0100
Fix paths.
commit 9fa3e7f6ea7b7b2f07ea5ca9d33c562c3dc8702d
Author: Simon Josefsson <address@hidden>
Date: Fri Nov 6 14:40:17 2009 +0100
Update usage.
commit e9bb56e35ea82a2db5860f46c34da441bcf97382
Author: Simon Josefsson <address@hidden>
Date: Fri Nov 6 14:39:19 2009 +0100
Update gnulib files.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +
doc/cyclo/Makefile.am | 16 +++++++-------
gl/Makefile.am | 9 --------
gl/m4/getpagesize.m4 | 29 ---------------------------
gl/m4/gnulib-comp.m4 | 4 ---
lib/build-aux/pmccabe2html | 16 ++++++--------
lib/gl/Makefile.am | 9 --------
lib/gl/getpagesize.c | 39 -------------------------------------
lib/gl/m4/gnulib-comp.m4 | 6 ++--
lib/gltests/Makefile.am | 9 ++++++++
{gl => lib/gltests}/getpagesize.c | 0
11 files changed, 29 insertions(+), 110 deletions(-)
delete mode 100644 gl/m4/getpagesize.m4
mode change 100755 => 100644 lib/build-aux/pmccabe2html
delete mode 100644 lib/gl/getpagesize.c
rename {gl => lib/gltests}/getpagesize.c (100%)
diff --git a/NEWS b/NEWS
index 066d06a..ed22caf 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ SASL. That include the manual, the command line tool, and self
tests.
* Version 1.3.91 (unreleased) [experimental]
+** doc: Fix doc/cyclo/ output.
+
* Version 1.3.90 (released 2009-11-06) [experimental]
** tests/crypto: Also test newly added SHA-1 interfaces.
diff --git a/doc/cyclo/Makefile.am b/doc/cyclo/Makefile.am
index d482771..b14e750 100644
--- a/doc/cyclo/Makefile.am
+++ b/doc/cyclo/Makefile.am
@@ -15,15 +15,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = cyclo-gsasl.html
+EXTRA_DIST = cyclo-$(PACKAGE).html
-cyclo-gsasl.html:
+cyclo-$(PACKAGE).html:
$(PMCCABE) `find $(top_srcdir)/lib -name \*.[ch] | grep -v -e ../gl` \
| sort -nr \
- | $(AWK) -f $(top_srcdir)/lib/build-aux/pmccabe2html \
+ | $(AWK) -f ${top_srcdir}/lib/build-aux/pmccabe2html \
-v lang=html -v name="$(PACKAGE_NAME)" \
- -v
vcurl="http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=blob;f=%FILENAME%;hb=HEAD";
\
- -v url="http://www.gnu.org/software/gsasl/"; \
- -v css=../../lib/build-aux/pmccabe.css \
- > tmp
- mv tmp $@
+ -v
vcurl="http://git.savannah.gnu.org/gitweb/?p=$(PACKAGE).git;a=blob;f=%FILENAME%;hb=HEAD"
\
+ -v url="http://www.gnu.org/software/$(PACKAGE)/" \
+ -v css=${top_srcdir}/lib/build-aux/pmccabe.css \
+ > address@hidden
+ mv address@hidden $@
diff --git a/gl/Makefile.am b/gl/Makefile.am
index d96141b..47305b3 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -345,15 +345,6 @@ EXTRA_libgl_la_SOURCES += getopt.c getopt1.c
## end gnulib module getopt-posix
-## begin gnulib module getpagesize
-
-
-EXTRA_DIST += getpagesize.c
-
-EXTRA_libgl_la_SOURCES += getpagesize.c
-
-## end gnulib module getpagesize
-
## begin gnulib module getpass
diff --git a/gl/m4/getpagesize.m4 b/gl/m4/getpagesize.m4
deleted file mode 100644
index 0d07a3a..0000000
--- a/gl/m4/getpagesize.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-# getpagesize.m4 serial 7
-dnl Copyright (C) 2002, 2004-2005, 2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_GETPAGESIZE],
-[
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_CHECK_FUNCS([getpagesize])
- if test $ac_cv_func_getpagesize = no; then
- HAVE_GETPAGESIZE=0
- AC_CHECK_HEADERS([OS.h])
- if test $ac_cv_header_OS_h = yes; then
- HAVE_OS_H=1
- fi
- AC_CHECK_HEADERS([sys/param.h])
- if test $ac_cv_header_sys_param_h = yes; then
- HAVE_SYS_PARAM_H=1
- fi
- fi
- case "$host_os" in
- mingw*)
- REPLACE_GETPAGESIZE=1
- AC_LIBOBJ([getpagesize])
- ;;
- esac
-])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 8ad505a..2e40957 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -82,8 +82,6 @@ AC_SUBST([LTALLOCA])
gl_FUNC_GETOPT_GNU
gl_MODULE_INDICATOR([getopt-gnu])
gl_FUNC_GETOPT_POSIX
- gl_FUNC_GETPAGESIZE
- gl_UNISTD_MODULE_INDICATOR([getpagesize])
gl_FUNC_GETPASS
AC_SUBST([LIBINTL])
AC_SUBST([LTLIBINTL])
@@ -431,7 +429,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/getopt.in.h
lib/getopt1.c
lib/getopt_int.h
- lib/getpagesize.c
lib/getpass.c
lib/getpass.h
lib/gettext.h
@@ -529,7 +526,6 @@ AC_DEFUN([gl_FILE_LIST], [
m4/getdelim.m4
m4/getline.m4
m4/getopt.m4
- m4/getpagesize.m4
m4/getpass.m4
m4/gettext.m4
m4/gettimeofday.m4
diff --git a/lib/build-aux/pmccabe2html b/lib/build-aux/pmccabe2html
old mode 100755
new mode 100644
index bc0f6e8..dd397cf
--- a/lib/build-aux/pmccabe2html
+++ b/lib/build-aux/pmccabe2html
@@ -1,6 +1,4 @@
-#!/bin/sh
-exec awk -f "$0" "$@"
-# pmccabe2html - pmccabe to html converter
+# pmccabe2html - AWK script to convert pmccabe output to html
# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -23,16 +21,16 @@ exec awk -f "$0" "$@"
# Typical Invocation is from a Makefile.am:
#
-# cyclo-libidn.html:
+# cyclo-$(PACKAGE).html:
# $(PMCCABE) ${top_srcdir}/lib/*.[ch] \
# | sort -nr \
# | $(AWK) -f ${top_srcdir}/build-aux/pmccabe2html \
# -v lang=html -v name="$(PACKAGE_NAME)" \
-# -v
vcurl="http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=blob;f=%FILENAME%;hb=HEAD";
\
-# -v url="http://www.gnu.org/software/libidn/"; \
-# -v css=../../build-aux/pmccabe.css \
-# > tmp
-# mv tmp $@
+# -v
vcurl="http://git.savannah.gnu.org/gitweb/?p=$(PACKAGE).git;a=blob;f=%FILENAME%;hb=HEAD"
\
+# -v url="http://www.gnu.org/software/$(PACKAGE)/" \
+# -v css=${top_srcdir}/build-aux/pmccabe.css \
+# > address@hidden
+# mv address@hidden $@
#
# The variables available are:
# lang output language, either 'html' or 'wiki'
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index e8a2d96..82851ec 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -186,15 +186,6 @@ EXTRA_libgl_la_SOURCES += getline.c
## end gnulib module getline
-## begin gnulib module getpagesize
-
-
-EXTRA_DIST += getpagesize.c
-
-EXTRA_libgl_la_SOURCES += getpagesize.c
-
-## end gnulib module getpagesize
-
## begin gnulib module gettext
# This is for those projects which use "gettextize --intl" to put a source-code
diff --git a/lib/gl/getpagesize.c b/lib/gl/getpagesize.c
deleted file mode 100644
index febcbf3..0000000
--- a/lib/gl/getpagesize.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* getpagesize emulation for systems where it cannot be done in a C macro.
-
- Copyright (C) 2007 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible and Martin Lambers. */
-
-#include <config.h>
-
-/* Specification. */
-#include <unistd.h>
-
-/* This implementation is only for native Win32 systems. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-
-int
-getpagesize (void)
-{
- SYSTEM_INFO system_info;
- GetSystemInfo (&system_info);
- return system_info.dwPageSize;
-}
-
-#endif
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index dd7222e..64c5869 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -65,8 +65,6 @@ AC_DEFUN([gl_INIT],
gl_STDIO_MODULE_INDICATOR([getdelim])
gl_FUNC_GETLINE
gl_STDIO_MODULE_INDICATOR([getline])
- gl_FUNC_GETPAGESIZE
- gl_UNISTD_MODULE_INDICATOR([getpagesize])
dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
AM_GNU_GETTEXT_VERSION([0.17])
AC_SUBST([LIBINTL])
@@ -151,6 +149,8 @@ AC_DEFUN([gl_INIT],
m4_pushdef([gltests_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='gltests'
+ gl_FUNC_GETPAGESIZE
+ gl_UNISTD_MODULE_INDICATOR([getpagesize])
gl_FUNC_MMAP_ANON
AC_CHECK_HEADERS_ONCE([sys/mman.h])
AC_CHECK_FUNCS_ONCE([mprotect])
@@ -266,7 +266,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/gc.h
lib/getdelim.c
lib/getline.c
- lib/getpagesize.c
lib/gettext.h
lib/hmac-md5.c
lib/hmac-sha1.c
@@ -402,6 +401,7 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-wchar.c
tests/zerosize-ptr.h
tests=lib/dummy.c
+ tests=lib/getpagesize.c
tests=lib/intprops.h
tests=lib/verify.h
top/GNUmakefile
diff --git a/lib/gltests/Makefile.am b/lib/gltests/Makefile.am
index 81a8621..c81b6c0 100644
--- a/lib/gltests/Makefile.am
+++ b/lib/gltests/Makefile.am
@@ -113,6 +113,15 @@ EXTRA_DIST += test-getline.c
## end gnulib module getline-tests
+## begin gnulib module getpagesize
+
+
+EXTRA_DIST += getpagesize.c
+
+EXTRA_libtests_a_SOURCES += getpagesize.c
+
+## end gnulib module getpagesize
+
## begin gnulib module intprops
diff --git a/gl/getpagesize.c b/lib/gltests/getpagesize.c
similarity index 100%
rename from gl/getpagesize.c
rename to lib/gltests/getpagesize.c
hooks/post-receive
--
GNU gsasl
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-3-90-13-gf9b5c51,
Simon Josefsson <=