[Lunar-commits] r21470 - moonbase/trunk/zbeta/gaim-svn

[Moritz Heiber]

Author: moe
Date: 2006-09-21 13:31:57 +0000 (Thu, 21 Sep 2006)
New Revision: 21470

Modified:
   moonbase/trunk/zbeta/gaim-svn/BUILD
   moonbase/trunk/zbeta/gaim-svn/DEPENDS
Log:
First checkin' since a long time. Modifying DEPENDS to use the nss module
instead of mozilla (braindead). Also, there should not be any dependency on parts of XOrg7 (yet). If somebody still has the old XOrg that is going to waste
his X.



Modified: moonbase/trunk/zbeta/gaim-svn/BUILD
===================================================================
--- moonbase/trunk/zbeta/gaim-svn/BUILD	2006-09-21 12:19:40 UTC (rev 21469)
+++ moonbase/trunk/zbeta/gaim-svn/BUILD	2006-09-21 13:31:57 UTC (rev 21470)
@@ -1,5 +1,9 @@
 (
 
+  if ! module_installed libSM; then
+    OPTS="$OPTS --disable-sm";
+  fi &&
+
   default_cvs_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/zbeta/gaim-svn/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/gaim-svn/DEPENDS	2006-09-21 12:19:40 UTC (rev 21469)
+++ moonbase/trunk/zbeta/gaim-svn/DEPENDS	2006-09-21 13:31:57 UTC (rev 21470)
@@ -28,9 +28,6 @@
 optional_depends  "sqlite"          ""          "--disable-cap"         \
                   "for the Contact Availability Prediction plugin"      &&
 
-optional_depends  "libSM"           ""          "--disable-sm"          \
-                  "for X session management support"                    &&
-
 optional_depends  "startup-notification"                                \
                   ""  "--disable-startup-notification"                  \
                   "for window manager startup notification support"     &&
@@ -47,15 +44,15 @@
 optional_depends  "GConf2"    ""                ""                      \
                   "for GNOME support of Gaim URI handlers"              &&
 
-# MSN suuport needs either nns/nspr or gnutls
-optional_depends  "mozilla"                                             \
-                  "--enable-gnutls=no                                   \
-                   --with-nspr-libs=/usr/lib/mozilla/                   \
-                   --with-nspr-includes=/usr/include/mozilla/nspr/      \
-                   --with-nss-libs=/usr/lib/mozilla/                    \
-                   --with-nss-includes=/usr/include/mozilla/nss/        \
-                   --enable-nss=yes"            ""                      \
-                  "-*required* for msn support (say 'n' to gnutls if you say 'y' here)" &&
+optional_depends  "nss"                                            \
+                  "--enable-gnutls=no                              \
+                   --with-nspr-libs=/usr/lib/                      \
+                   --with-nspr-includes=/usr/include/nspr/         \
+                   --with-nss-libs=/usr/lib/                       \
+                   --with-nss-includes=/usr/include/nss/           \
+                   --enable-nss=yes"                               \
+                  ""                                               \
+                  "for MSN support (say 'n' to gnutls)" &&
 
 optional_depends  "gnutls"  "--enable-nss=no --enable-gnutls=yes"  ""   \
-                  "- *required* for msn support (say 'y' here if you said 'n' to mozilla)"
+                  "for MSN support (say 'y' here if you said 'n' to nss)"