From ee6801a428459a296eb45ae2adc5eaee9d455b5b Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 22 Dec 2009 16:58:06 +0000
Subject: [PATCH] fix iksemel build against gnutls 2.x (FSBUILD-219)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16019 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/iksemel/build/libgnutls.m4 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/libs/iksemel/build/libgnutls.m4 b/libs/iksemel/build/libgnutls.m4
index 01cea5a95d..479d5a2dcf 100644
--- a/libs/iksemel/build/libgnutls.m4
+++ b/libs/iksemel/build/libgnutls.m4
@@ -24,16 +24,24 @@ AC_ARG_WITH(libgnutls-prefix,
   fi
 
   AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
-  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   no_libgnutls=""
-  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-    no_libgnutls=yes
-  else
+  if test "$LIBGNUTLS_CONFIG" != "no"; then
     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
     LIBGNUTLS_LIBS="`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -lpthread"
     libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+  elif test "$PKG_CONFIG" != "no"; then
+    LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls`
+    LIBGNUTLS_LIBS="`$PKG_CONFIG --libs gnutls` -lpthread"
+    libgnutls_config_version=`$PKG_CONFIG --modversion gnutls`
+  else
+    no_libgnutls=yes
+  fi
 
+  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
+  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
+
+  if test x"$no_libgnutls" = x""; then
 
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"