Blob Blame History Raw
diff -up dillo-3.0.4/src/Makefile.am.orig dillo-3.0.4/src/Makefile.am
--- dillo-3.0.4/src/Makefile.am.orig	2014-04-25 09:28:06.425699087 +0200
+++ dillo-3.0.4/src/Makefile.am	2014-04-25 09:29:31.937410865 +0200
@@ -19,7 +19,7 @@ dillo_LDADD = \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
 	@LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \
-	@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@
+	@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@ @LIBSSL_LIBS@
 
 dillo_SOURCES = \
 	dillo.cc \
diff -up dillo-3.0.4/test/Makefile.am.orig dillo-3.0.4/test/Makefile.am
--- dillo-3.0.4/test/Makefile.am.orig	2014-04-25 09:25:33.987211535 +0200
+++ dillo-3.0.4/test/Makefile.am	2014-04-25 09:30:24.656231870 +0200
@@ -34,7 +34,7 @@ dw_anchors_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_example_SOURCES = dw_example.cc
 dw_example_LDADD = \
@@ -42,7 +42,7 @@ dw_example_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_find_test_SOURCES = dw_find_test.cc
 dw_find_test_LDADD = \
@@ -50,7 +50,7 @@ dw_find_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_links_SOURCES = dw_links.cc
 dw_links_LDADD = \
@@ -58,7 +58,7 @@ dw_links_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_links2_SOURCES = dw_links2.cc
 dw_links2_LDADD = \
@@ -66,7 +66,7 @@ dw_links2_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_image_background_SOURCES = dw_image_background.cc
 dw_image_background_LDADD = \
@@ -74,7 +74,7 @@ dw_image_background_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_images_simple_SOURCES = dw_images_simple.cc
 dw_images_simple_LDADD = \
@@ -82,7 +82,7 @@ dw_images_simple_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_images_scaled_SOURCES = dw_images_scaled.cc
 dw_images_scaled_LDADD = \
@@ -90,7 +90,7 @@ dw_images_scaled_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_images_scaled2_SOURCES = dw_images_scaled2.cc
 dw_images_scaled2_LDADD = \
@@ -98,7 +98,7 @@ dw_images_scaled2_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_lists_SOURCES = dw_lists.cc
 dw_lists_LDADD = \
@@ -106,7 +106,7 @@ dw_lists_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_table_aligned_SOURCES = dw_table_aligned.cc
 dw_table_aligned_LDADD = \
@@ -114,7 +114,7 @@ dw_table_aligned_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_table_SOURCES = dw_table.cc
 dw_table_LDADD = \
@@ -122,7 +122,7 @@ dw_table_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_border_test_SOURCES = dw_border_test.cc
 dw_border_test_LDADD = \
@@ -130,7 +130,7 @@ dw_border_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 
 dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
@@ -139,7 +139,7 @@ dw_imgbuf_mem_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_resource_test_SOURCES = dw_resource_test.cc
 dw_resource_test_LDADD = \
@@ -147,7 +147,7 @@ dw_resource_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 dw_ui_test_SOURCES = \
 	dw_ui_test.cc \
@@ -158,7 +158,7 @@ dw_ui_test_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 shapes_SOURCES = shapes.cc
 shapes_LDADD = \
@@ -180,7 +180,7 @@ liang_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 trie_SOURCES = trie.cc
 
@@ -189,7 +189,7 @@ trie_LDADD = \
 	$(top_builddir)/dw/libDw-fltk.a \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
 
 notsosimplevector_SOURCES = notsosimplevector.cc
 
@@ -199,4 +199,4 @@ unicode_test_SOURCES = unicode_test.cc
 
 unicode_test_LDADD = \
 	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@