[Lunar-commits] r18821 - in moonbase/trunk: . gnome-platform/gnome-vfs2 libs/neon

[Moritz Heiber]

Author: moe
Date: 2006-02-22 13:35:23 +0000 (Wed, 22 Feb 2006)
New Revision: 18821

Modified:
   moonbase/trunk/aliases
   moonbase/trunk/gnome-platform/gnome-vfs2/BUILD
   moonbase/trunk/gnome-platform/gnome-vfs2/DEPENDS
   moonbase/trunk/libs/neon/BUILD
   moonbase/trunk/libs/neon/DEPENDS
Log:
Adding the %SSL alias as I proposed about two weeks ago. It
ships around very ugly DEPENDS files and a bug in the neon
configure script.



Modified: moonbase/trunk/aliases
===================================================================
--- moonbase/trunk/aliases	2006-02-22 13:00:12 UTC (rev 18820)
+++ moonbase/trunk/aliases	2006-02-22 13:35:23 UTC (rev 18821)
@@ -7,3 +7,4 @@
 %X:XOrg XOrg-test xfree86 xfree86-beta
 %XMLRENDERER: libxml2 expat
 %XSCREENSAVER:xscreensaver xscreensaver-gtk1 xscreensaver-kde
+%SSL:openssl gnutls

Modified: moonbase/trunk/gnome-platform/gnome-vfs2/BUILD
===================================================================
--- moonbase/trunk/gnome-platform/gnome-vfs2/BUILD	2006-02-22 13:00:12 UTC (rev 18820)
+++ moonbase/trunk/gnome-platform/gnome-vfs2/BUILD	2006-02-22 13:35:23 UTC (rev 18821)
@@ -1,5 +1,14 @@
 (
 
+   if module_installed openssl ; then
+	OPTS="$OPTS --enable-openssl \
+		    --with-openssl-includes=/usr/include/openssl \
+		    --with-openssl-libs=/usr/lib \
+		    --disable-gnutls"
+   else
+	OPTS="$OPTS --enable-gnutls --disable-openssl"
+   fi &&
+
    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD                    \
                 --sysconfdir=/etc                 \

Modified: moonbase/trunk/gnome-platform/gnome-vfs2/DEPENDS
===================================================================
--- moonbase/trunk/gnome-platform/gnome-vfs2/DEPENDS	2006-02-22 13:00:12 UTC (rev 18820)
+++ moonbase/trunk/gnome-platform/gnome-vfs2/DEPENDS	2006-02-22 13:35:23 UTC (rev 18821)
@@ -3,9 +3,8 @@
 depends GConf2			&&
 depends libxml2			&&
 depends gnome-mime-data2	&&
+depends %SSL			&&
 optional_depends "hal" "--enable-hal" "--disable-hal" "for hal support" &&
-optional_depends "openssl" "--enable-openssl --with-openssl-includes=/usr/include/openssl --with-openssl-libs=/usr/lib" "--disable-openssl" "for ssl support" &&
 optional_depends "samba" "--enable-samba --with-samba-includes=/usr/include --with-samba-libs=/usr/lib" "--disable-samba" "for samba support" &&
-optional_depends "gnutls" "--enable-gnutls" "--disable-gnutls" "for tls support (use only when saying 'n' to openssl" &&
 optional_depends "howl" "--enable-howl" "--disable-howl" "for howl zeroconf networking support"
 

Modified: moonbase/trunk/libs/neon/BUILD
===================================================================
--- moonbase/trunk/libs/neon/BUILD	2006-02-22 13:00:12 UTC (rev 18820)
+++ moonbase/trunk/libs/neon/BUILD	2006-02-22 13:35:23 UTC (rev 18821)
@@ -1,5 +1,11 @@
 (
 
+  if module_installed openssl ; then
+	OPTS="$OPTS --with-ssl=openssl"
+  else
+	OPTS="$OPTS --with-ssl=gnutls"
+  fi &&
+
   OPTS="$OPTS --enable-shared"
   default_build
 

Modified: moonbase/trunk/libs/neon/DEPENDS
===================================================================
--- moonbase/trunk/libs/neon/DEPENDS	2006-02-22 13:00:12 UTC (rev 18820)
+++ moonbase/trunk/libs/neon/DEPENDS	2006-02-22 13:35:23 UTC (rev 18821)
@@ -1,4 +1,2 @@
 depends %XMLRENDERER &&
-
-optional_depends  "openssl"  "--with-ssl"  "--without-ssl"  \
-                  "for SSL support"
+depends %SSL