Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
79e0cb3a
Commit
79e0cb3a
authored
10 years ago
by
Sebastian Lackner
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
configure: Fix detection of gnutls on Ubuntu 14.10.
parent
871fc4a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+8
-8
8 additions, 8 deletions
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
with
9 additions
and
9 deletions
configure
+
8
−
8
View file @
79e0cb3a
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
View file @
79e0cb3a
...
...
@@ -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"],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment