summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbuild-aux/config.rpath58
-rw-r--r--build-aux/maint.mk4
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/gnutls.texi4
-rw-r--r--gl/gnulib.mk2
-rw-r--r--gl/m4/getaddrinfo.m423
-rw-r--r--gl/m4/gnulib-cache.m44
-rw-r--r--gl/m4/gnulib-comp.m44
-rw-r--r--gl/override/doc/gpl-2.0.texi.diff (renamed from gl/override/doc/gpl.texi.diff)0
-rw-r--r--gl/override/doc/lgpl-2.1.texi.diff (renamed from gl/override/doc/lgpl.texi.diff)0
10 files changed, 61 insertions, 42 deletions
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index e082db6bb5..c547c68825 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2006 Free Software Foundation, Inc.
+# Copyright 1996-2007 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
@@ -64,7 +64,7 @@ else
;;
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -74,7 +74,7 @@ else
;;
newsos6)
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
wl='-Wl,'
@@ -100,7 +100,7 @@ else
osf3* | osf4* | osf5*)
wl='-Wl,'
;;
- sco3.2v5*)
+ rdos*)
;;
solaris*)
wl='-Wl,'
@@ -108,11 +108,14 @@ else
sunos4*)
wl='-Qoption ld '
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
wl='-Wl,'
;;
sysv4*MP*)
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ wl='-Wl,'
+ ;;
unicos*)
wl='-Wl,'
;;
@@ -189,11 +192,11 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs=no
fi
;;
- interix3*)
+ interix[3-9]*)
hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
@@ -280,7 +283,7 @@ else
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- hardcode_direct=yes
+ :
else
# We have old collect2
hardcode_direct=unsupported
@@ -359,7 +362,7 @@ else
hardcode_direct=yes
hardcode_minus_L=yes
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
@@ -412,18 +415,22 @@ else
hardcode_libdir_separator=:
;;
openbsd*)
- hardcode_direct=yes
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
else
- case "$host_os" in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ ld_shlibs=no
fi
;;
os2*)
@@ -471,7 +478,7 @@ else
ld_shlibs=yes
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
;;
sysv5* | sco3.2v5* | sco5v6*)
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -523,9 +530,6 @@ case "$host_os" in
;;
freebsd1*)
;;
- kfreebsd*-gnu)
- library_names_spec='$libname$shrext'
- ;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
@@ -551,7 +555,7 @@ case "$host_os" in
esac
library_names_spec='$libname$shrext'
;;
- interix3*)
+ interix[3-9]*)
library_names_spec='$libname$shrext'
;;
irix5* | irix6* | nonstopux*)
@@ -572,7 +576,7 @@ case "$host_os" in
;;
linux*oldld* | linux*aout* | linux*coff*)
;;
- linux*)
+ linux* | k*bsd*-gnu)
library_names_spec='$libname$shrext'
;;
knetbsd*-gnu)
@@ -598,6 +602,8 @@ case "$host_os" in
osf3* | osf4* | osf5*)
library_names_spec='$libname$shrext'
;;
+ rdos*)
+ ;;
solaris*)
library_names_spec='$libname$shrext'
;;
diff --git a/build-aux/maint.mk b/build-aux/maint.mk
index 81952027eb..ddae7e89e1 100644
--- a/build-aux/maint.mk
+++ b/build-aux/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment is intended to be useful by any GNU-like project.
# This file originate from coreutils, CPPI, Bison, and Autoconf.
-## Copyright (C) 2001-2006 Free Software Foundation, Inc.
+## Copyright (C) 2001-2007 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -109,7 +109,7 @@ syntax-check: $(syntax-check-rules)
# Update gettext files.
PACKAGE ?= $(shell basename $(PWD))
-POURL = http://www.iro.umontreal.ca/translation/maint/$(PACKAGE)/
+POURL = http://translationproject.org/latest/$(PACKAGE)/
PODIR ?= po
refresh-po:
rm -f $(PODIR)/*.po && \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f9195179f8..d88113b708 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,8 +28,8 @@ SUBDIRS += reference
endif
info_TEXINFOS = gnutls.texi
-gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl.texi \
- gpl.texi error_codes.texi gnutls-api.texi \
+gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl-2.1.texi \
+ gpl-2.0.texi error_codes.texi gnutls-api.texi \
gnutls-extra-api.texi ia-api.texi x509-api.texi pgp-api.texi \
my-bib-macros.texi examples/ex-client1.c examples/ex-client2.c \
examples/ex-session-info.c examples/ex-verify.c \
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index a51914dcbd..cb2c0c7bdc 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -3647,8 +3647,8 @@ functions:
@end menu
@include fdl.texi
-@include lgpl.texi
-@include gpl.texi
+@include lgpl-2.1.texi
+@include gpl-2.0.texi
@node Concept Index
@unnumbered Concept Index
diff --git a/gl/gnulib.mk b/gl/gnulib.mk
index 86d1f3e8ea..24cf284537 100644
--- a/gl/gnulib.mk
+++ b/gl/gnulib.mk
@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline gpl inet_ntop inet_pton lgpl maintainer-makefile progname readline version-etc-fsf
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf
MOSTLYCLEANFILES += core *.stackdump
diff --git a/gl/m4/getaddrinfo.m4 b/gl/m4/getaddrinfo.m4
index 1fda1364b8..4a1e09f775 100644
--- a/gl/m4/getaddrinfo.m4
+++ b/gl/m4/getaddrinfo.m4
@@ -6,6 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_GETADDRINFO],
[
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H
AC_MSG_NOTICE([checking how to do getaddrinfo, freeaddrinfo and getnameinfo])
AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
@@ -31,21 +32,33 @@ AC_DEFUN([gl_GETADDRINFO],
# We can't use AC_REPLACE_FUNCS here because gai_strerror may be an
# inline function declared in ws2tcpip.h, so we need to get that
# header included somehow.
- AC_MSG_CHECKING([for gai_strerror (possibly via ws2tcpip.h)])
- AC_TRY_LINK([
+ AC_CHECK_HEADERS_ONCE(netdb.h)
+ AC_CACHE_CHECK([for gai_strerror (possibly via ws2tcpip.h)],
+ gl_cv_func_gai_strerror, [
+ AC_TRY_LINK([
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
#ifdef HAVE_WS2TCPIP_H
#include <ws2tcpip.h>
#endif
], [gai_strerror (0);],
- AC_MSG_RESULT([yes]),
- [AC_MSG_RESULT([no])
- AC_LIBOBJ(gai_strerror)])
+ [gl_cv_func_gai_strerror=yes],
+ [gl_cv_func_gai_strerror=no])])
+ if test $gl_cv_func_gai_strerror = no; then
+ AC_LIBOBJ(gai_strerror)
+ fi
gl_PREREQ_GETADDRINFO
])
# Prerequisites of lib/getaddrinfo.h and lib/getaddrinfo.c.
AC_DEFUN([gl_PREREQ_GETADDRINFO], [
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H
AC_SEARCH_LIBS(gethostbyname, [inet nsl])
AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
AC_CHECK_FUNCS(gethostbyname,, [
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index dcc19a3c75..928df4471e 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline gpl inet_ntop inet_pton lgpl maintainer-makefile progname readline version-etc-fsf
+# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
-gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline gpl inet_ntop inet_pton lgpl maintainer-makefile progname readline version-etc-fsf])
+gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf])
gl_AVOID([snprintf vasnprintf])
gl_SOURCE_BASE([gl])
gl_M4_BASE([gl/m4])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index a4afc9afbd..e5689086b5 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -109,8 +109,8 @@ AC_DEFUN([gl_FILE_LIST], [
build-aux/maint.mk
doc/fdl.texi
doc/gendocs_template
- doc/gpl.texi
- doc/lgpl.texi
+ doc/gpl-2.0.texi
+ doc/lgpl-2.1.texi
lib/error.c
lib/error.h
lib/gai_strerror.c
diff --git a/gl/override/doc/gpl.texi.diff b/gl/override/doc/gpl-2.0.texi.diff
index 5e52212631..5e52212631 100644
--- a/gl/override/doc/gpl.texi.diff
+++ b/gl/override/doc/gpl-2.0.texi.diff
diff --git a/gl/override/doc/lgpl.texi.diff b/gl/override/doc/lgpl-2.1.texi.diff
index cba9ee7eaf..cba9ee7eaf 100644
--- a/gl/override/doc/lgpl.texi.diff
+++ b/gl/override/doc/lgpl-2.1.texi.diff
View Lorry Controller Status