sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] PERFORCE change 79231 by Arwed von Merkatz for review
- From: Perforce Review Daemon <p4review AT smee.org>
- To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
- Subject: [SM-Commit] PERFORCE change 79231 by Arwed von Merkatz for review
- Date: Sat, 13 May 2006 18:55:02 +0100 (BST)
Change 79231 by arwed_von_merkatz@arwed-Otherland on 2006/05/13 18:53:44
dependency fixes, bug #11316
Affected files ...
... //sgl/grimoires/stable-rc/0.4/chat-im/licq/BUILD#2 integrate
... //sgl/grimoires/stable-rc/0.4/chat-im/licq/DEPENDS#2 integrate
... //sgl/grimoires/stable-rc/0.4/chat-im/licq/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/chat-im/licq/INSTALL#2 integrate
... //sgl/grimoires/stable/0.3/chat-im/licq/BUILD#2 integrate
... //sgl/grimoires/stable/0.3/chat-im/licq/DEPENDS#2 integrate
... //sgl/grimoires/stable/0.3/chat-im/licq/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/chat-im/licq/INSTALL#2 integrate
Differences ...
==== //sgl/grimoires/stable-rc/0.4/chat-im/licq/BUILD#2 (xtext) ====
@@ -40,6 +40,7 @@
$OPTS &&
make &&
+ if ! list_find "$OPTS" "--disable-openssl"; then
cd $SOURCE_DIRECTORY/plugins/msn &&
if [ "$LICQ_CVS" == "y" ]; then
make -f Makefile.cvs
@@ -48,8 +49,8 @@
--sysconfdir=/etc \
--localstatedir=/var \
$OPTS &&
- make &&
-
+ make
+ fi &&
cd $SOURCE_DIRECTORY/plugins/auto-reply &&
if [ "$LICQ_CVS" == "y" ]; then
==== //sgl/grimoires/stable-rc/0.4/chat-im/licq/DEPENDS#2 (xtext) ====
@@ -12,7 +12,10 @@
depends qt-x11
fi &&
depends autoconf &&
-optional_depends "openssl" "" "" "for secure communication between
clients" &&
+optional_depends "openssl" \
+ "" \
+ "--disable-openssl" \
+ "for secure communication between clients" &&
if [ "$QTGUI" == "y" ]; then
optional_depends "kdelibs" \
"--with-kde" \
==== //sgl/grimoires/stable-rc/0.4/chat-im/licq/HISTORY#2 (text) ====
@@ -1,3 +1,8 @@
+2006-04-27 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Disabled openssl on optional_depends. Bug #11316
+ * BUILD: Don't build msn if no openssl. Bug #11316
+ * INSTALL: Don't install msn if no openssl. Bug #11316
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
==== //sgl/grimoires/stable-rc/0.4/chat-im/licq/INSTALL#2 (xtext) ====
@@ -27,8 +27,10 @@
cd $SOURCE_DIRECTORY/plugins/email &&
make install &&
+ if ! list_find "$OPTS" "--disable-openssl"; then
cd $SOURCE_DIRECTORY/plugins/msn &&
- make install &&
+ make install
+ fi &&
cd $SOURCE_DIRECTORY/plugins/auto-reply &&
make install &&
==== //sgl/grimoires/stable/0.3/chat-im/licq/BUILD#2 (xtext) ====
@@ -40,6 +40,7 @@
$OPTS &&
make &&
+ if ! list_find "$OPTS" "--disable-openssl"; then
cd $SOURCE_DIRECTORY/plugins/msn &&
if [ "$LICQ_CVS" == "y" ]; then
make -f Makefile.cvs
@@ -48,8 +49,8 @@
--sysconfdir=/etc \
--localstatedir=/var \
$OPTS &&
- make &&
-
+ make
+ fi &&
cd $SOURCE_DIRECTORY/plugins/auto-reply &&
if [ "$LICQ_CVS" == "y" ]; then
==== //sgl/grimoires/stable/0.3/chat-im/licq/DEPENDS#2 (xtext) ====
@@ -12,7 +12,10 @@
depends qt-x11
fi &&
depends autoconf &&
-optional_depends "openssl" "" "" "for secure communication between
clients" &&
+optional_depends "openssl" \
+ "" \
+ "--disable-openssl" \
+ "for secure communication between clients" &&
if [ "$QTGUI" == "y" ]; then
optional_depends "kdelibs" \
"--with-kde" \
==== //sgl/grimoires/stable/0.3/chat-im/licq/HISTORY#2 (text) ====
@@ -1,3 +1,8 @@
+2006-04-27 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Disabled openssl on optional_depends. Bug #11316
+ * BUILD: Don't build msn if no openssl. Bug #11316
+ * INSTALL: Don't install msn if no openssl. Bug #11316
+
2005-10-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.3RC2
* desktop/licq.desktop: Added file
==== //sgl/grimoires/stable/0.3/chat-im/licq/INSTALL#2 (xtext) ====
@@ -27,8 +27,10 @@
cd $SOURCE_DIRECTORY/plugins/email &&
make install &&
+ if ! list_find "$OPTS" "--disable-openssl"; then
cd $SOURCE_DIRECTORY/plugins/msn &&
- make install &&
+ make install
+ fi &&
cd $SOURCE_DIRECTORY/plugins/auto-reply &&
make install &&
- [SM-Commit] PERFORCE change 79231 by Arwed von Merkatz for review, Perforce Review Daemon, 05/13/2006
Archive powered by MHonArc 2.6.24.