fix various build errors

5 files changed, 97 insertions, 2 deletions

diff --git a/package/miredo/patches/patch-Makefile_am b/package/miredo/patches/patch-Makefile_am
new file mode 100644
index 000000000..887ebf9d3
--- /dev/null
+++ b/package/miredo/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- miredo-1.2.6.orig/Makefile.am	2012-09-12 15:03:59.000000000 +0200
++++ miredo-1.2.6/Makefile.am	2014-06-25 18:17:31.653364453 +0200
+@@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = 1.11 \
+ 	no-dist-gzip \
+ 	no-exeext
+ 
+-SUBDIRS = po doc misc compat libteredo libtun6 src
++SUBDIRS = misc compat libteredo libtun6 src
+ DIST_SUBDIRS = m4 $(SUBDIRS)
+ noinst_HEADERS = include/gettext.h
+ EXTRA_DIST = autogen.sh Doxyfile.in
diff --git a/package/miredo/patches/patch-configure_ac b/package/miredo/patches/patch-configure_ac
index f2e24d7b4..6dacab77e 100644
--- a/package/miredo/patches/patch-configure_ac
+++ b/package/miredo/patches/patch-configure_ac
@@ -1,6 +1,15 @@
 --- miredo-1.2.6.orig/configure.ac	2013-05-23 17:51:41.000000000 +0200
-+++ miredo-1.2.6/configure.ac	2013-11-08 16:09:54.000000000 +0100
-@@ -149,12 +149,17 @@ LIBS="$LIBS_save"
++++ miredo-1.2.6/configure.ac	2014-06-25 18:17:49.829469301 +0200
+@@ -55,8 +55,6 @@ AM_SILENT_RULES([yes])
+ # Checks for libraries.
+ AS_MESSAGE([checking required libraries...])
+ AM_BINRELOC
+-AM_GNU_GETTEXT_VERSION([0.18.1])
+-AM_GNU_GETTEXT([external])
+ 
+ LIBRT=""
+ AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"])
+@@ -149,12 +147,17 @@ LIBS="$LIBS_save"
  AS_MESSAGE([checking optional features...])
  
  # POSIX capabilities
diff --git a/package/miredo/patches/patch-libteredo_Makefile_am b/package/miredo/patches/patch-libteredo_Makefile_am
new file mode 100644
index 000000000..aeeea6f1b
--- /dev/null
+++ b/package/miredo/patches/patch-libteredo_Makefile_am
@@ -0,0 +1,13 @@
+--- miredo-1.2.6.orig/libteredo/Makefile.am	2013-05-23 17:40:42.000000000 +0200
++++ miredo-1.2.6/libteredo/Makefile.am	2014-06-25 18:19:47.878146465 +0200
+@@ -17,9 +17,8 @@
+ # *  http://www.gnu.org/copyleft/gpl.html                               *
+ # ***********************************************************************
+ 
+-SUBDIRS = . test
++SUBDIRS = .
+ localedir = @datadir@/locale
+-LTLIBINTL = @LTLIBINTL@
+ 
+ AM_CPPFLAGS = -I@top_srcdir@/include -I@top_srcdir@ \
+ 	-D_REENTRANT -DLOCALEDIR=\"$(localedir)\"
diff --git a/package/miredo/patches/patch-libtun6_Makefile_am b/package/miredo/patches/patch-libtun6_Makefile_am
new file mode 100644
index 000000000..3a5cc8c8e
--- /dev/null
+++ b/package/miredo/patches/patch-libtun6_Makefile_am
@@ -0,0 +1,19 @@
+--- miredo-1.2.6.orig/libtun6/Makefile.am	2008-02-16 15:52:07.000000000 +0100
++++ miredo-1.2.6/libtun6/Makefile.am	2014-06-25 18:22:44.855149653 +0200
+@@ -21,7 +21,6 @@ localedir = @datadir@/locale
+ 
+ AM_CPPFLAGS = -I@top_srcdir@/include -I@top_srcdir@ \
+ 	-D_REENTRANT -DLOCALEDIR=\"$(localedir)\"
+-LIBINTL = @LIBINTL@
+ 
+ lib_LTLIBRARIES = libtun6.la
+ check_PROGRAMS = libtun6-diagnose
+@@ -32,7 +31,7 @@ include_libtun6_HEADERS = tun6.h
+ 
+ # libtun6.a
+ libtun6_la_SOURCES = tun6.c diag.c
+-libtun6_la_LIBADD = @LTLIBINTL@ ../compat/libcompat.la
++libtun6_la_LIBADD = ../compat/libcompat.la
+ libtun6_la_LDFLAGS = -no-undefined -export-symbols-regex tun6_.* \
+ 	-version-info 1:1:1
+ 
diff --git a/package/miredo/patches/patch-src_Makefile_am b/package/miredo/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..dee9552db
--- /dev/null
+++ b/package/miredo/patches/patch-src_Makefile_am
@@ -0,0 +1,43 @@
+--- miredo-1.2.6.orig/src/Makefile.am	2012-09-12 15:03:59.000000000 +0200
++++ miredo-1.2.6/src/Makefile.am	2014-06-25 18:26:22.564364775 +0200
+@@ -22,8 +22,6 @@ localedir = $(datadir)/locale
+ top_srcdir = @top_srcdir@
+ sysconfdir = @sysconfdir@
+ 
+-LIBINTL = @LIBINTL@
+-LTLIBINTL = @LTLIBINTL@
+ LIBCAP = @LIBCAP@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -D_REENTRANT \
+@@ -41,7 +39,7 @@ TESTS =
+ 
+ libmiredo_la_SOURCES = main.c miredo.c miredo.h \
+ 			conf.c conf.h binreloc.c binreloc.h
+-libmiredo_la_LIBADD = $(LTLIBINTL) $(LIBCAP) $(BINRELOC_LIBS) \
++libmiredo_la_LIBADD = $(LIBCAP) $(BINRELOC_LIBS) \
+ 			../compat/libcompat.la
+ libmiredo_la_LDFLAGS = -no-undefined -static
+ #libmiredo_la_LDFLAGS = -no-undefined -release @VERSION@
+@@ -53,7 +51,7 @@ libmiredo_la_LDFLAGS = -no-undefined -st
+ # miredo
+ miredo_SOURCES = relayd.c
+ miredo_LDADD = ../libtun6/libtun6.la ../libteredo/libteredo.la libmiredo.la \
+-		@LIBRT@ $(LIBINTL)
++		@LIBRT@
+ 
+ # privproc
+ miredo_privproc_SOURCES = privproc.c privproc.h
+@@ -65,11 +63,11 @@ endif
+ 
+ # miredo-server
+ miredo_server_SOURCES = serverd.c
+-miredo_server_LDADD = ../libteredo/libteredo-server.la libmiredo.la $(LIBINTL)
++miredo_server_LDADD = ../libteredo/libteredo-server.la libmiredo.la
+ 
+ # miredo-checkconf
+ miredo_checkconf_SOURCES = checkconf.c
+-miredo_checkconf_LDADD = libmiredo.la $(LIBINTL)
++miredo_checkconf_LDADD = libmiredo.la
+ 
+ install-exec-local:
+ 	$(install_sh) -d "$(DESTDIR)$(localstatedir)/run"