Fix incorrect placement of -lz (zlib) in autotools build
When I added support for the new Suunto EON Steel bluetooth download, I needed crc32(), and instead of cooking my own (libdivecomputer does do its own versions of the simpler crc functions), I made libdivecomputer just depend on zlib instead, which provides a convenient crc32() function. But I didn't add the new linker flag (-lz) in the right place in the automake. It worked fine for me on Linux, but apparently not so well on macos. This fixes it. Reported-and-tested-by: Benjamin <nystire@gmail.com> Tested-by: Axel Richter <Axel.Richter@freenet.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
208807180a
commit
0143be5497
@ -1,5 +1,5 @@
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||
LDADD = $(top_builddir)/src/libdivecomputer.la -lz
|
||||
LDADD = $(top_builddir)/src/libdivecomputer.la
|
||||
|
||||
bin_PROGRAMS = \
|
||||
dctool
|
||||
|
||||
@ -3,7 +3,7 @@ AM_CFLAGS = $(LIBUSB_CFLAGS) $(HIDAPI_CFLAGS)
|
||||
|
||||
lib_LTLIBRARIES = libdivecomputer.la
|
||||
|
||||
libdivecomputer_la_LIBADD = $(LIBUSB_LIBS) $(HIDAPI_LIBS) -lm
|
||||
libdivecomputer_la_LIBADD = $(LIBUSB_LIBS) $(HIDAPI_LIBS) -lm -lz
|
||||
libdivecomputer_la_LDFLAGS = \
|
||||
-version-info $(DC_VERSION_LIBTOOL) \
|
||||
-no-undefined \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user