--- configure.orig	2007-04-09 14:53:04.000000000 -0500
+++ configure	2010-04-01 03:29:39.000000000 -0500
@@ -20144,8 +20144,8 @@
 _ACEOF
 
    GNUTLS=1
-   CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
-   LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
+   CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
+   LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
    if test "$withval" != "yes"; then
 	GNUTLSROOT=$withval
 	LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
@@ -22926,7 +22926,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
 if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
-  LIBS="${LIBS} `libgnutls-config --libs`"
+  LIBS="${LIBS} `pkg-config gnutls --libs`"
 else
   { { echo "$as_me:$LINENO: error: Get the GNU TLS library (http://www.gnutls.org/)" >&5
 echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}