Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ae24457e22d537740a027ac1d4d9c0d27c2cb38)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ae24457e22d537740a027ac1d4d9c0d27c2cb38)
  • Date: Thu, 24 May 2012 02:43:07 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

http/cadaver/CONFIGURE | 15 ----------
http/cadaver/DEPENDS | 67
++++++++++++++++++++++++++++++-------------------
http/cadaver/HISTORY | 2 +
3 files changed, 44 insertions(+), 40 deletions(-)

New commits:
commit ad89e10550110663ac1989c95e5f020b98aec57f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cadaver: ssl & xml options depend on bundled version of neon library

diff --git a/http/cadaver/CONFIGURE b/http/cadaver/CONFIGURE
index 0f96cc8..3462c0a 100755
--- a/http/cadaver/CONFIGURE
+++ b/http/cadaver/CONFIGURE
@@ -1,23 +1,8 @@
-config_query_list CADAVER_SSL "Which SSL backend do you want for SSL
support?" \
- none \
- openssl \
- gnutls &&
-
config_query_list CADAVER_THREADS "Specify multithreading API:" \
none \
posix \
pth &&

-if [[ $CADAVER_SSL != none ]] && [[ $CADAVER_THREADS == posix ]]; then
- config_query_option CADAVER_OPTS "Enable SSL library thread-safety using
POSIX threads?" y \
- "--enable-threadsafe-ssl=posix" \
- "--disable-threadsafe-ssl"
-fi &&
-
-config_query_list CADAVER_XML "Specify XML Parser:" \
- expat \
- libxml2 &&
-
config_query_option CADAVER_OPTS "Enable runtime debugging messages?" n \
"--enable-debugging" \
"--disable-debugging" &&
diff --git a/http/cadaver/DEPENDS b/http/cadaver/DEPENDS
index d553472..3d764ba 100755
--- a/http/cadaver/DEPENDS
+++ b/http/cadaver/DEPENDS
@@ -1,3 +1,45 @@
+optional_depends -sub DAV neon \
+ "--without-included-neon" \
+ "--with-included-neon" \
+ "to use system neon library" &&
+
+if ! is_depends_enabled $SPELL neon; then
+ config_query_list CADAVER_SSL "Which SSL backend do you want for SSL
support?" \
+ none \
+ openssl \
+ gnutls &&
+
+ case $CADAVER_SSL in
+ none) OPTS="--without-ssl $OPTS"
+ ;;
+ openssl) depends openssl "--with-ssl=openssl"
+ ;;
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ esac &&
+
+ if [[ $CADAVER_SSL != none ]] && [[ $CADAVER_THREADS == posix ]]; then
+ config_query_option CADAVER_OPTS "Enable SSL library thread-safety using
POSIX threads?" y \
+ "--enable-threadsafe-ssl=posix" \
+ "--disable-threadsafe-ssl"
+ fi &&
+
+ config_query_list CADAVER_XML "Specify XML Parser:" \
+ expat \
+ libxml2 &&
+
+ if [[ $CADAVER_XML == expat ]]; then
+ OPTS="--with-expat --without-libxml2 $OPTS" &&
+
+ optional_depends expat \
+ "--without-included-expat" \
+ "--with-included-expat" \
+ "to use system expat library"
+ else
+ depends libxml2 '--with-libxml2 --without-expat'
+ fi
+fi &&
+
optional_depends readline \
"--enable-readline" \
"--disable-readline" \
@@ -8,31 +50,6 @@ optional_depends gettext \
"--disable-nls" \
"for Native Language Support" &&

-case $CADAVER_SSL in
- none) OPTS="--without-ssl $OPTS"
- ;;
- openssl) depends openssl "--with-ssl=openssl"
- ;;
- gnutls) depends gnutls "--with-ssl=gnutls"
- ;;
-esac &&
-
-if [[ $CADAVER_XML == expat ]]; then
- OPTS="--with-expat --without-libxml2 $OPTS" &&
-
- optional_depends expat \
- "--without-included-expat" \
- "--with-included-expat" \
- "to use system expat library"
-else
- depends libxml2 '--with-libxml2 --without-expat'
-fi
-
-optional_depends -sub DAV neon \
- "--without-included-neon" \
- "--with-included-neon" \
- "to use system neon library" &&
-
optional_depends ca-certificates \

"--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt" \
"--without-ca-bundle" \
diff --git a/http/cadaver/HISTORY b/http/cadaver/HISTORY
index a8e71b8..1ef7e1c 100644
--- a/http/cadaver/HISTORY
+++ b/http/cadaver/HISTORY
@@ -1,5 +1,7 @@
2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use DAV subdependency from neon
+ * CONFIGURE: ssl & xml options don't make any sense when system neon
+ library is in use

2012-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, CONFIGURE, BUILD, DEPENDS: spell created



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ae24457e22d537740a027ac1d4d9c0d27c2cb38), Vlad Glagolev, 05/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page