[SM-Commit] PERFORCE change 78511 by George J. Sherwood for review

Perforce Review Daemon p4review at smee.org
Thu Apr 27 11:35:01 EDT 2006


Change 78511 by george_sherwood at georges on 2006/04/27 16:31:44

	integrate fix to build without openssl.  Bug 11316.

Affected files ...

... //sgl/grimoires/test/chat-im/licq/BUILD#4 integrate
... //sgl/grimoires/test/chat-im/licq/DEPENDS#3 integrate
... //sgl/grimoires/test/chat-im/licq/HISTORY#15 integrate
... //sgl/grimoires/test/chat-im/licq/INSTALL#4 integrate

Differences ...

==== //sgl/grimoires/test/chat-im/licq/BUILD#4 (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/test/chat-im/licq/DEPENDS#3 (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/test/chat-im/licq/HISTORY#15 (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
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/chat-im/licq/INSTALL#4 (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                                                &&



More information about the SM-Commit mailing list