2003-10-01 Mikael Hallendal <micke@imendio.com>
authorhallski <hallski>
Wed, 01 Oct 2003 13:54:53 +0000
changeset 41 c662bc438631
parent 40 a6c68984c06a
child 42 26a101222a6f
2003-10-01 Mikael Hallendal <micke@imendio.com> * configure.in: Tweaked the --with-ssl option a bit. * loudmouth.spec.in: - Added a with_ssl to be able to easily turn of GNU Tls support. - Fixes LM-14
ChangeLog
configure.in
loudmouth.spec.in
--- a/ChangeLog	Wed Oct 01 13:19:10 2003 +0000
+++ b/ChangeLog	Wed Oct 01 13:54:53 2003 +0000
@@ -1,3 +1,11 @@
+2003-10-01  Mikael Hallendal  <micke@imendio.com>
+
+	* configure.in: Tweaked the --with-ssl option a bit.
+	
+	* loudmouth.spec.in: 
+	- Added a with_ssl to be able to easily turn of GNU Tls support.
+	- Fixes LM-14
+
 2003-10-01  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-connection.c: (connection_do_open):
--- a/configure.in	Wed Oct 01 13:19:10 2003 +0000
+++ b/configure.in	Wed Oct 01 13:54:53 2003 +0000
@@ -94,7 +94,7 @@
 dnl +--------------------------------------------------------+
 dnl | Checking for SSL (through GnuTLS) support              |
 dnl +--------------------------------------------------------+
-AC_ARG_WITH(ssl, [  --without-ssl           disable ssl support],
+AC_ARG_WITH(ssl, [  --with-ssl=no/yes           define whether to look for SSL, default=yes],
 	    ac_ssl=$withval,
 	    ac_ssl=yes
 	    )
--- a/loudmouth.spec.in	Wed Oct 01 13:19:10 2003 +0000
+++ b/loudmouth.spec.in	Wed Oct 01 13:54:53 2003 +0000
@@ -1,20 +1,26 @@
 %define ver @VERSION@
 %define name @PACKAGE@
 
+%define with_ssl 1
+
 Summary: Loadmouth is a Jabber client written in C.
 Name: %name
 Version: %ver
 Release: imendio.1
+Vendor: Imendio
 URL: http://www.imendio.com/projects/loudmouth
 Source0: %{name}-%{ver}.tar.gz
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: glib2 >= @GLIB2_REQUIRED@
+BuildRequires: glib2-devel >= @GLIB2_REQUIRED@
+BuildRequires: gtk-doc >= 0.10
+
+%if %{with_ssl}
 Requires: gnutls >= @GNUTLS_REQUIRED@
-BuildRequires: glib2-devel >= @GLIB2_REQUIRED@
 BuildRequires: gnutls-devel >= @GNUTLS_REQUIRED@
-BuildRequires: gtk-doc >= 0.10
+%endif
 
 %description
 Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. 
@@ -24,7 +30,10 @@
 Group: 		Development/Libraries
 Requires:	%name = %{PACKAGE_VERSION}
 Requires:	glib2-devel >= @GLIB2_REQUIRED@
+
+%if %{with_ssl}
 Requires:       gnutls-devel >= @GNUTLS_REQUIRED@
+%endif
 
 %description devel
 Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. 
@@ -34,7 +43,13 @@
 
 %build
 
-%configure --enable-gtk-doc
+%configure --enable-gtk-doc \
+%if %{with_ssl}
+           --with-ssl=yes
+%else
+           --with-ssl=no
+%endif
+	  
 make
 
 %install