Sebastian Lackner : configure: Fix detection of gnutls on Ubuntu 14.10.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 79e0cb3a26f8ddefa12a7bf1023cf442f4072b81
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79e0cb3a26f8ddefa12a7bf102...

Author: Sebastian Lackner 
Date:   Sun Sep  7 08:09:54 2014 +0200

configure: Fix detection of gnutls on Ubuntu 14.10.

---

configure    | 16 ++++++++--------
 configure.ac |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 4b1a37d..6f45fee 100755
--- a/configure
+++ b/configure
@@ -6001,7 +6001,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    	       && LARGE_OFF_T % 2147483647 == 1)
    	      ? 1 : -1];
@@ -6047,7 +6047,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    	       && LARGE_OFF_T % 2147483647 == 1)
    	      ? 1 : -1];
@@ -6071,7 +6071,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    	       && LARGE_OFF_T % 2147483647 == 1)
    	      ? 1 : -1];
@@ -6116,7 +6116,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    	       && LARGE_OFF_T % 2147483647 == 1)
    	      ? 1 : -1];
@@ -6140,7 +6140,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    	       && LARGE_OFF_T % 2147483647 == 1)
    	      ? 1 : -1];
@@ -11278,10 +11278,10 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   case "$LIBEXT" in
     dll) ac_cv_lib_soname_gnutls=`$ac_cv_path_LDD conftest.exe | grep "gnutls" | sed -e "s/dll.*/dll/"';2,$d'` ;;
-    dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libgnutls.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\.$LIBEXT" | sed -e "s/^.*\[\(libgnutls\.$LIBEXT[^	 ]*\)\].*$/\1/"';2,$d'`
+    dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\(-deb0\)\{0,1\}\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libgnutls\(-deb0\)\{0,1\}.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\(-deb0\)\{0,1\}\.$LIBEXT" | sed -e "s/^.*\[\(libgnutls\(-deb0\)\{0,1\}\.$LIBEXT[^	 ]*\)\].*$/\1/"';2,$d'`
        if ${ac_cv_lib_soname_gnutls:+false} :; then :
-  ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\.$LIBEXT" | sed -e "s/^.*(libgnutls.$LIBEXT[^	 ]*).*$/\1/"';2,$d'`
+  ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\(-deb0\)\{0,1\}\.$LIBEXT" | sed -e "s/^.*(libgnutls\(-deb0\)\{0,1\}.$LIBEXT[^	 ]*).*$/\1/"';2,$d'`
 fi ;;
   esac
 fi
diff --git a/configure.ac b/configure.ac
index 5521af2..edf5408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1359,7 +1359,7 @@ then
         [AC_CHECK_HEADER(gnutls/gnutls.h,
             [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
-                [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
+                [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\(-deb0\)\{0,1\}]])])],
             [GNUTLS_CFLAGS=""])])
 fi
 WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],