Bugzilla – Attachment 169 Details for
Bug 674
libzip < 0.11 compatibility fix
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Add zip_discard() macro when libzip < 0.11
configure.ac.diff (text/plain), 713 bytes, created by
Sönke Peters
on 2015-10-25 19:43:00 CET
(
hide
)
Description:
Add zip_discard() macro when libzip < 0.11
Filename:
MIME Type:
Creator:
Sönke Peters
Created:
2015-10-25 19:43:00 CET
Size:
713 bytes
patch
obsolete
>diff --git a/configure.ac b/configure.ac >index 0380534..fe247fe 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -431,9 +431,11 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes]) > ############################## > > # Add mandatory dependencies to module list. >-SR_APPEND([SR_PKGLIBS], ['libzip >= 0.11']) >+SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10']) > AC_SUBST([SR_PKGLIBS]) > >+AC_CHECK_FUNC([zip_discard], [], [AC_DEFINE([zip_discard(x)], [], [Define zip_discard() as found in libzip >= 0.11])]) >+ > # Retrieve the compile and link flags for all modules combined. > # Also, bail out at this point if any module dependency is not met. > PKG_CHECK_MODULES([LIBSIGROK], [glib-2.0 >= 2.32.0 $SR_PKGLIBS])
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 674
: 169