[PATCH 1 of 2] Use curl without-zlib support

Wald Commits scm-commit at wald.intevation.org
Wed Aug 27 10:40:46 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1409128806 -7200
# Node ID 3baee344550231f20818d944178fafba91239b90
# Parent  dbf5ea18cb20d07aac91d84c0fdf3d692529c35d
Use curl without-zlib support

diff -r dbf5ea18cb20 -r 3baee3445502 INSTALL
--- a/INSTALL	Tue Aug 26 17:04:11 2014 +0200
+++ b/INSTALL	Wed Aug 27 10:40:06 2014 +0200
@@ -74,7 +74,8 @@
     --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict \
     --disable-proxy --disable-rtsp --disable-ldaps --disable-ldap --disable-file \
     --disable-ftp --enable-http --enable-shared=no -enable-static=yes \
-    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path
+    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path \
+    --without-zlib
 
 To compile the software you can use plain cmake. An out of source build is
 highly suggested. For build options see CMakeList.txt
diff -r dbf5ea18cb20 -r 3baee3445502 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Tue Aug 26 17:04:11 2014 +0200
+++ b/ui/CMakeLists.txt	Wed Aug 27 10:40:06 2014 +0200
@@ -205,7 +205,6 @@
    ui_common
    trustbridge_common
    ${CURL_LIBRARIES}
-   z
    ${POLARSSL_LIBRARIES}
    ${EXTRA_STATIC_LIBS}
    ${PROFILING_LIBS})
diff -r dbf5ea18cb20 -r 3baee3445502 ui/tests/CMakeLists.txt
--- a/ui/tests/CMakeLists.txt	Tue Aug 26 17:04:11 2014 +0200
+++ b/ui/tests/CMakeLists.txt	Wed Aug 27 10:40:06 2014 +0200
@@ -48,7 +48,6 @@
      Qt5::Test Qt5::Widgets
      trustbridge_common
      ${CURL_LIBRARIES}
-     z
      ${POLARSSL_LIBRARIES}
      ${EXTRA_STATIC_LIBS})
 endmacro()


More information about the Trustbridge-commits mailing list