[SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-6-g90981c1

[Simon Josefsson]

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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=90981c16adf60a071f6d2d451d8d7296b4a7b9f8

The branch, master has been updated
       via  90981c16adf60a071f6d2d451d8d7296b4a7b9f8 (commit)
       via  761548003b39be1e5649ec244ebc326c325dfbb2 (commit)
       via  addfb5b109df8640eb5cc63bdc51e70fc2d499d8 (commit)
      from  b5428d9518bc582190c78a9b1da9460a73cb5e18 (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 90981c16adf60a071f6d2d451d8d7296b4a7b9f8
Author: Simon Josefsson <address@hidden>
Date:   Fri Oct 28 16:19:24 2011 +0200

    Fix bootstrap rule to avoid duplicate gettext files.

commit 761548003b39be1e5649ec244ebc326c325dfbb2
Author: Simon Josefsson <address@hidden>
Date:   Fri Oct 28 15:49:12 2011 +0200

    Remove old hack.

commit addfb5b109df8640eb5cc63bdc51e70fc2d499d8
Author: Simon Josefsson <address@hidden>
Date:   Fri Oct 28 15:45:14 2011 +0200

    Drop guile libgnutls-extra stuff.

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk                  |    5 +++--
 guile/pre-inst-guile.in |    3 +--
 guile/src/Makefile.am   |   33 +++------------------------------
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index c6b619d..23c4131 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -59,8 +59,9 @@ autoreconf:
                cp $$f `echo $$f | sed 's/.in//'`; \
        done
        mv build-aux/config.rpath build-aux/config.rpath-
-       test -f ./configure || autoreconf --install
-       test `hostname` = "gaggia" && cp gl/m4/size_max.m4 m4/ || true
+       autopoint
+       rm -f m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 
m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 m4/intlmacosx.m4 
m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes-pri.m4 m4/lcmessage.m4 m4/lib-ld.m4 
m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 
m4/printf-posix.m4 m4/progtest.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 
m4/wchar_t.m4 m4/wint_t.m4 m4/visibility.m4 m4/xsize.m4
+       test -f ./configure || AUTOPOINT=true autoreconf --install
        mv build-aux/config.rpath- build-aux/config.rpath
 
 update-po: refresh-po
diff --git a/guile/pre-inst-guile.in b/guile/pre-inst-guile.in
index b078b74..078597c 100644
--- a/guile/pre-inst-guile.in
+++ b/guile/pre-inst-guile.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2010, 2011 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
@@ -25,5 +25,4 @@ export GUILE_LOAD_PATH
 
 exec @abs_top_builddir@/libtool --mode=execute                             \
        -dlopen "@abs_top_builddir@/guile/src/libguile-gnutls-v-1.la"        \
-       -dlopen "@abs_top_builddir@/guile/src/libguile-gnutls-extra-v-1.la"  \
        @GUILE@ "$@"
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 21bf00e..f26b3bc 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -1,5 +1,5 @@
 #  GnuTLS --- Guile bindings for GnuTLS.
-#  Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2007-2011 Free Software Foundation, Inc.
 #
 #  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -27,13 +27,11 @@ EXTRA_DIST =                                        \
 
 BUILT_SOURCES = enum-map.i.c smob-types.i.c enums.h smobs.h    \
                priorities.i.c                                  \
-               extra-smobs.h extra-enums.h                     \
-               extra-enum-map.i.c extra-smob-types.i.c         \
-                core.x errors.x extra.x
+                core.x errors.x
 
 CLEANFILES = $(BUILT_SOURCES)
 
-lib_LTLIBRARIES = libguile-gnutls-v-1.la libguile-gnutls-extra-v-1.la
+lib_LTLIBRARIES = libguile-gnutls-v-1.la
 
 # Linking against GnuTLS.
 GNUTLS_CORE_LIBS  = $(top_builddir)/lib/libgnutls.la
@@ -50,18 +48,9 @@ libguile_gnutls_v_1_la_LIBADD = \
        $(GNUTLS_CORE_LIBS) $(GNULIB_LIBS) \
        $(GUILE_LDFLAGS)
 
-libguile_gnutls_extra_v_1_la_SOURCES = extra.c
-libguile_gnutls_extra_v_1_la_CFLAGS =          \
-  $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS)
-libguile_gnutls_extra_v_1_la_LIBADD =          \
-  $(GNUTLS_CORE_LIBS) \
-  $(builddir)/libguile-gnutls-v-1.la           \
-  $(GNULIB_LIBS) $(GUILE_LDFLAGS)
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/includes \
        -I$(top_builddir)/lib/includes  \
-       -I$(top_srcdir)/extra/includes \
        -I$(top_builddir) \
        -I$(builddir)
 
@@ -98,22 +87,6 @@ smob-types.i.c: $(srcdir)/make-smob-types.scm
 priorities.i.c: $(srcdir)/make-session-priorities.scm
        $(GUILE_FOR_BUILD) $^ > $@
 
-
-# GnuTLS-extra
-
-extra-enums.h: $(srcdir)/make-enum-header.scm
-       $(GUILE_FOR_BUILD) $^ extra > $@
-
-extra-enum-map.i.c: $(srcdir)/make-enum-map.scm
-       $(GUILE_FOR_BUILD) $^ extra > $@
-
-extra-smobs.h: $(srcdir)/make-smob-header.scm
-       $(GUILE_FOR_BUILD) $^ extra > $@
-
-extra-smob-types.i.c: $(srcdir)/make-smob-types.scm
-       $(GUILE_FOR_BUILD) $^ extra > $@
-
-
 # C file snarfing.
 
 # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be


hooks/post-receive
-- 
GNU gnutls