contrib: gnutls: skip automake

diff --git a/contrib/src/gnutls/gnutls-no-egd.patch b/contrib/src/gnutls/gnutls-no-egd.patch
index bd0dbd98e3f7a7e25dee5de034c496fe48a51195..5a83f92f86edfd68d69613e9f6ea5c9ba37b9697 100644 (file)
--- a/contrib/src/gnutls/gnutls-no-egd.patch
+++ b/contrib/src/gnutls/gnutls-no-egd.patch
@@ -7,6 +7,35 @@ diff -ru gnutls.orig//lib/nettle/Makefile.am gnutls//lib/nettle/Makefile.am
  
 -libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h
 +libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
+--- gnutls/lib/nettle/Makefile.in.orig 2011-11-22 23:27:22.099568057 -0500
++++ gnutls/lib/nettle/Makefile.in      2011-11-22 23:27:45.711685158 -0500
+@@ -117,8 +117,7 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ libcrypto_la_LIBADD =
+-am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo \
+-      egd.lo
++am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo
+ libcrypto_la_OBJECTS = $(am_libcrypto_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -829,7 +828,7 @@
+       -I$(srcdir)/../includes -I$(builddir)/../includes \
+       -I$(srcdir)/.. $(am__append_1)
+ noinst_LTLIBRARIES = libcrypto.la
+-libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h
++libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -883,7 +882,6 @@
+       -rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@
 diff -ru gnutls.orig//lib/nettle/rnd.c gnutls//lib/nettle/rnd.c
 --- gnutls.orig//lib/nettle/rnd.c      2011-07-19 20:25:09.000000000 +0300
 +++ gnutls//lib/nettle/rnd.c   2011-07-19 20:26:47.000000000 +0300

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 5da6fec9488035ff3ecce129491a23d3f70c25db..73a845671c9f4033a99d9f99946caddd8d0c562e 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -48,7 +48,6 @@ DEPS_gnutls = nettle $(DEPS_nettle)
 endif
 
 .gnutls: gnutls
-       cd $< && automake
        cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
        cd $</lib && $(MAKE) install
        touch $@