[Lunar-commits] CVS: moonbase/mail/evolution BUILD, 1.10.2.1, 1.10.2.2 DEPENDS, 1.11.2.2, 1.11.2.3

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/mail/evolution
In directory dbguin.lunar-linux.org:/tmp/cvs-serv10437

Modified Files:
      Tag: GNOME_UNSTABLE
	BUILD DEPENDS 
Log Message:

Finally getting evolution to build with nss3 support for ssl connections, makeing mozill a hard dependancy for now


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/evolution/BUILD,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- BUILD	2 Feb 2004 22:29:56 -0000	1.10.2.1
+++ BUILD	10 Feb 2004 20:47:17 -0000	1.10.2.2
@@ -1,37 +1,19 @@
 (
 
-#  mkdir  evolution-db3                                           &&
-#  ( 
-#    cd  db-$DBVERSION/build_unix                                 &&
-#    ../dist/configure  --prefix=$SOURCE_DIRECTORY/evolution-db3  \
-#                       --disable-dynamic                         &&
-#    make                                                         &&
-#    make  install
-#  )                                                              &&
-
-  if [ -z "$DISPLAY" ] ; then
-    OPTS="$OPTS --disable-gtk-doc"
-    message "To get evolution devlopment documentation you must build with"
-    message "an active X windows connection. i.e. $DISPLAY is set."
-  fi								 &&
-
   ./configure  --prefix=/usr                                     \
                --sysconfdir=/etc                                 \
                --localstatedir=/var                              \
                --mandir=/usr/share/man		                 \
      	       --infodir=/usr/share/info	                 \
-               --enable-ipv6                                     \
-               --enable-gtk-doc                                  \
+               --enable-ipv6=yes                                 \
+               --enable-nntp=yes				 \
+               --enable-imapp=yes                                \
+               --enable-nss=yes                                  \
 	       $OPTS                                             &&
   default_make                                                   &&
 
-  # tweaks I needed to get it up:
   if ! grep -q '/usr/lib/bonobo/servers' /etc/bonobo-activation/bonobo-activation-config.xml ; then
     sedit "s:<searchpath>:<searchpath>\n\t<item>/usr/lib/bonobo/servers</item>:" /etc/bonobo-activation/bonobo-activation-config.xml
   fi								
-  
-#  if [ ! -e /usr/lib/libgal-2.0.so.2 ] ; then
-#    ln -s libgal-2.0.so.3 /usr/lib/libgal-2.0.so.2
-#  fi
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/evolution/DEPENDS,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- DEPENDS	10 Feb 2004 04:31:30 -0000	1.11.2.2
+++ DEPENDS	10 Feb 2004 20:47:17 -0000	1.11.2.3
@@ -1,7 +1,8 @@
 depends  gtkhtml31      &&
 depends  libgnomeprint  &&
 depends  libgnomeui     &&
-depends evolution-data-server &&
+depends  mozilla        &&
+depends  evolution-data-server &&
 optional_depends  "gnupg"       ""  ""  "for encrypted mail support"  &&
 optional_depends  "gnome-spell" ""  ""  "For spellcheck support"      &&
 
@@ -10,19 +11,18 @@
                   ""                                                  \
                   "for Palm support"                                  &&
 
-optional_depends  "gnome-pilot" "--enable-pilot-conduits=yes"         \
+optional_depends  "gnome-pilot"					      \
+                  "--enable-pilot-conduits=yes"        		      \
                   ""                                                  \
                   "for Palm Pilot support"                            &&
                   
-optional_depends  "mozilla"                                           \
-                  "--with-nspr-includes=/usr/include/mozilla/nspr     \
-                   --with-nspr-libs=/usr/lib/mozilla                  \
-                   --with-nss-includes=/usr/include/mozilla           \
-                   --with-nss-libs=/usr/lib/mozilla"                  \
-                  ""                                                  \
-                  "for mozilla/ssl support"                               &&
+optional_depends  "openldap"                                          \
+                  "--with-openldap=yes"                               \
+                  "--with-openldap=no"                                \
+                  "for LDAP support"                                  &&
+
+optional_depends  "gtk-doc"                                           \
+                  "--enable-gtk-doc"                                  \
+                  "--disable-gtk-doc"                                 \
+                  "for gtk-doc support"                              
 
-optional_depends  "openldap"             \
-                  "--with-openldap=yes"  \
-                  ""                     \
-                  "for LDAP support"