[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#754260: RFS: terminology/0.6.0-1 [ITP]



On Tue, Aug 5, 2014 at 12:38 PM, Anthony F McInerney wrote:

> The code references lz4.c while lz4-dev supplies only lz4.h.
> Is there another way i can pull in the lz4 source package?
> Or am i just confused? :)

I think you are confused.

The package should link against the lz4 shared library rather than
embedding a copy of the library. To link against a shared library you
do not need the source code at all, just the header and the shared
library.

The attached files (completely untested) should do something like that
and fix other issues.

-- 
bye,
pabs

https://wiki.debian.org/PaulWise

Attachment: control
Description: Binary data

Attachment: rules
Description: Binary data

--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,8 @@
 
 AC_CHECK_FUNCS(mkstemps)
 
+AC_CHECK_HEADER([lz4.h], [AC_DEFINE([HAVE_LZ4_H], [1], [Define to 1 if you have <lz4.h>.])], [AC_MSG_ERROR([Please install the lz4 dev library https://code.google.com/p/lz4/])])
+
 EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
 
 with_max_log_level="EINA_LOG_LEVEL_ERR"
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,7 +7,7 @@
 -DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@
 
-terminology_LDADD = @TERMINOLOGY_LIBS@ @ELDBUS_LIBS@
+terminology_LDADD = @TERMINOLOGY_LIBS@ @ELDBUS_LIBS@ -llz4
 
 terminology_SOURCES = \
 private.h \
@@ -41,7 +41,6 @@
 termptygfx.c termptygfx.h \
 termptyext.c termptyext.h \
 termptysave.c termptysave.h \
-lz4/lz4.c lz4/lz4.h \
 utf8.c utf8.h \
 win.c win.h \
 utils.c utils.h \
--- a/src/bin/termptysave.c
+++ b/src/bin/termptysave.c
@@ -2,7 +2,7 @@
 #include <Elementary.h>
 #include "termpty.h"
 #include "termptysave.h"
-#include "lz4/lz4.h"
+#include <lz4.h>
 #include <sys/mman.h>
 
 #if defined (__MacOSX__) || (defined (__MACH__) && defined (__APPLE__))

Reply to: