Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > contrib-release-src > by-pkgid > 7e912624071b914fa7534aa3a15af189 > files > 1

xmlsec1-1.2.14-3mdv2010.1.src.rpm

diff -Naur xmlsec1-1.2.14/configure xmlsec1-1.2.14.oden/configure
--- xmlsec1-1.2.14/configure	2009-12-05 22:19:39.000000000 +0100
+++ xmlsec1-1.2.14.oden/configure	2009-12-06 13:33:33.081095931 +0100
@@ -13242,7 +13242,7 @@
 
 
 
-GNUTLS_CONFIG="libgnutls-config"
+GNUTLS_CONFIG="pkg-config gnutls"
 XMLSEC_NO_GNUTLS="1"
 GNUTLS_MIN_VERSION="0.8.1"
 GNUTLS_NEW_MIN_VERSION="1.0.0"
@@ -13493,7 +13493,7 @@
     if test "z$with_gnutls" != "z" ; then
 	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
     fi
-    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
+    if ! $GNUTLS_CONFIG --modversion > /dev/null 2>&1 ; then
 	if test "z$with_gnutls" != "z" ; then
 	    as_fn_error "Unable to find gnutls at '$with_gnutls'" "$LINENO" 5
 	else
@@ -13501,7 +13501,7 @@
 $as_echo "no" >&6; }
 	fi
     else
-        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+        vers=`$GNUTLS_CONFIG --modversion | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	if test "$vers" -ge "$minvers" ; then
 	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"
diff -Naur xmlsec1-1.2.14/configure.in xmlsec1-1.2.14.oden/configure.in
--- xmlsec1-1.2.14/configure.in	2009-12-05 22:19:17.000000000 +0100
+++ xmlsec1-1.2.14.oden/configure.in	2009-12-06 13:33:33.078096073 +0100
@@ -798,7 +798,7 @@
 dnl ==========================================================================
 dnl See if we can find GnuTLS
 dnl ==========================================================================
-GNUTLS_CONFIG="libgnutls-config"
+GNUTLS_CONFIG="pkg-config gnutls"
 XMLSEC_NO_GNUTLS="1"
 GNUTLS_MIN_VERSION="0.8.1"
 GNUTLS_NEW_MIN_VERSION="1.0.0"
@@ -837,14 +837,14 @@
     if test "z$with_gnutls" != "z" ; then
 	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
     fi
-    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
+    if ! $GNUTLS_CONFIG --modversion > /dev/null 2>&1 ; then
 	if test "z$with_gnutls" != "z" ; then
 	    AC_MSG_ERROR(Unable to find gnutls at '$with_gnutls')
 	else 
 	    AC_MSG_RESULT(no)
 	fi
     else
-        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+        vers=`$GNUTLS_CONFIG --modversion | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	if test "$vers" -ge "$minvers" ; then
 	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"