gnutls: Fix GNU TLS detection & link flags in configure.ac

libetpan-gnutls-configure.diff

diff -wc libetpan-1.0.orig/configure.ac libetpan-1.0/configure.ac
*** libetpan-1.0.orig/configure.ac	2010-04-08 16:08:50.000000000 -0700
--- libetpan-1.0/configure.ac	2011-02-09 15:13:37.000000000 -0800
***************
*** 222,233 ****
    OCPPFLAGS="$CPPFLAGS"
    OLDFLAGS="$LDFLAGS"
    if test "x$with_gnutls" != "xyes" ; then
!     CPPFLAGS="CRPPFLAGS -I$with_gnutls/include"
      LDFLAGS="$LDFLAGS -L$with_gnutls/lib"
    fi
    GNUTLSLIB=""
    AC_CHECK_HEADER(gnutls/gnutls.h, [
!    AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes, [GNUTLSLIB="-lgnutls"])
    ])
    if test "x$with_gnutls" != "xyes"; then
     CPPFLAGS="$OCPPFLAGS"
--- 222,233 ----
    OCPPFLAGS="$CPPFLAGS"
    OLDFLAGS="$LDFLAGS"
    if test "x$with_gnutls" != "xyes" ; then
!     CPPFLAGS="$CPPFLAGS -I$with_gnutls/include"
      LDFLAGS="$LDFLAGS -L$with_gnutls/lib"
    fi
    GNUTLSLIB=""
    AC_CHECK_HEADER(gnutls/gnutls.h, [
!    AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes, [GNUTLSLIB="-lgnutls -lgcrypt -lgpg-error -lz"])
    ])
    if test "x$with_gnutls" != "xyes"; then
     CPPFLAGS="$OCPPFLAGS"
***************
*** 239,245 ****
  if test "x$with_gnutls" = "xyes"; then
    AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
    AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL])
!   GNUTLSLIB="-lgnutls"
  else
    GNUTLSLIB=""
  fi
--- 239,245 ----
  if test "x$with_gnutls" = "xyes"; then
    AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
    AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL])
!   GNUTLSLIB="-lgnutls -lgcrypt -lgpg-error -lz"
  else
    GNUTLSLIB=""
  fi