Dear Boris,

On Wed, Aug 19, 2009 at 11:45:37AM +0200, Boris Petersen wrote:
> since i'm using testing i have 2.6.6-1 installed. btw your patch
> doesn't apply to 4.22.7
> 
> libgnutls-dev:
>   Installed: 2.6.6-1
>   Candidate: 2.6.6-1
>   Version table:
>      2.8.1-2 0
>         500 http://10.1.1.113 unstable/main Packages
>  *** 2.6.6-1 0
>         990 http://10.1.1.113 testing/main Packages
>         100 /var/lib/dpkg/status
>      2.4.2-6+lenny1 0
>         500 http://10.1.1.113 stable/updates/main Packages
>         500 http://10.1.1.113 stable/main Packages
> 

I disagree... the patch does seem to apply, and the build does
complete. However, I agree that it may fail with older versions of
gnutls.

[ku...@aceslinc /tmp/c/centerim-4.22.7] patch -p1
--- centerim-4.22.7~/configure.ac       2009-02-22 09:41:47.000000000 -0600
+++ centerim-4.22.7/configure.ac        2009-08-17 23:31:26.000000000 -0500
@@ -187,8 +187,8 @@
         fi

         if test "x$with_ssl" = "xno" -a -z "$with_nss_compat"; then
-                AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
-                        AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo)
+       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
                                  AC_CHECK_LIB(lzo2, lzo1x_1_compress, 
LZO_LIBS=-llzo2, [
@@ -203,8 +203,9 @@
                         LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
                         AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls])
                         with_ssl="yes"
-                ])
-        fi
+        fi,AC_MSG_ERROR(
+Could not find gnutls-extra. Stopping.
+      ))

         if test "x$with_ssl" = "xno"; then
                 PKG_PROG_PKG_CONFIG

patching file configure.ac

Let me try to come up with something even more robust.

Thanks.

Kumar
-- 
Kumar Appaiah

Attachment: signature.asc
Description: Digital signature

Reply via email to