Bug#529818: [Fwd: Re: Bug#529818: Patch to detect gnutls]

[Kumar Appaiah]

The patch present in the attached mail has been confirmed to be
working by Boris Petersen.

Thanks.

Kumar
-- 
Kumar Appaiah

--- Begin Message ---

Dear Boris,

On Sat, Aug 29, 2009 at 12:29:18PM +0200, Boris Petersen wrote:
> 1. clone the git repo
> # git clone git://repo.or.cz/centerim.git
> 2. create a branch which looks like 4.22.7 release
> # git branch test 4.22.7
> 3. checkout the newly created branch
> # git checkout test
> 4. apply your patch
> # patch -p1 < ../gnutls.patch
> 5. run ./autogen.sh to create the configure scripts
> # ./autogen.sh
> 6. run ./configure
> # ./configure
> 
> and here comes the error:
> checking for OpenSSL... found in /usr
> checking for main in -lcrypto... yes
> checking for main in -lssl... yes
> checking for SSLeay_add_all_algorithms in -lcrypto... no
> configure: error: Could not find gnutls-extra. Stopping.
> 
> I attached the config.log i hope that helps.

Thanks for bearing with me. The error was still unreproducible; till I
installed libssl-dev. When libssl-dev _and_ gnutls are installed, a
nasty error in my patch surfaced; I had missed the logic in closing
parentheses.

I have attached another patch, which should now work in all
cases. Please do let me know if it works.

Again, sorry for making you look at this several times, and thanks for
being patient with me. :-)

Kumar
-- 
Kumar Appaiah

diff -Nru --exclude changelog centerim-4.22.7/configure.ac centerim-4.22.7/configure.ac
--- centerim-4.22.7/configure.ac	2009-02-22 09:41:47.000000000 -0600
+++ centerim-4.22.7/configure.ac	2009-08-29 10:19:46.000000000 -0500
@@ -187,7 +187,7 @@
         fi
 
         if test "x$with_ssl" = "xno" -a -z "$with_nss_compat"; then
-                AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
+                AC_CHECK_LIB(gnutls-extra, gnutls_global_init_extra, [
                         AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo)
 
                         if test -z "$LZO_LIBS"; then
@@ -203,7 +203,9 @@
                         LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
                         AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls])
                         with_ssl="yes"
-                ])
+                ], AC_MSG_ERROR(
+Could not find gnutls-extra. Stopping.
+      ))
         fi
 
         if test "x$with_ssl" = "xno"; then

--- End Message ---

signature.asc
Description: Digital signature