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
56cb4545
Commit
56cb4545
authored
7 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Silence error when krb5-config is missing.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
83fbb78d
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
+2
-2
2 additions, 2 deletions
configure
configure.ac
+3
-1
3 additions, 1 deletion
configure.ac
with
5 additions
and
3 deletions
configure
+
2
−
2
View file @
56cb4545
...
...
@@ -13753,13 +13753,13 @@ then
KRB5_CFLAGS=`$PKG_CONFIG --cflags krb5 2>/dev/null`
fi
fi
test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`krb5-config --cflags`}
test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`
${KRB5_CONFIG:-
krb5-config
}
--cflags
2>/dev/null
`}
if ${KRB5_LIBS:+false} :; then :
if ${PKG_CONFIG+:} false; then :
KRB5_LIBS=`$PKG_CONFIG --libs krb5 2>/dev/null`
fi
fi
test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`krb5-config --libs`}
test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`
${KRB5_CONFIG:-
krb5-config
}
--libs
2>/dev/null
`}
$as_echo "$as_me:${as_lineno-$LINENO}: krb5 cflags: $KRB5_CFLAGS" >&5
$as_echo "$as_me:${as_lineno-$LINENO}: krb5 libs: $KRB5_LIBS" >&5
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
3
−
1
View file @
56cb4545
...
...
@@ -1629,7 +1629,9 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
dnl **** Check for krb5 ****
if test "x$with_krb5" != "xno"
then
WINE_PACKAGE_FLAGS(KRB5,[krb5],,[`krb5-config --cflags`],[`krb5-config --libs`],
WINE_PACKAGE_FLAGS(KRB5,[krb5],,
[`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`],
[`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`],
[AC_CHECK_HEADERS([krb5/krb5.h])
if test "$ac_cv_header_krb5_krb5_h" = "yes"
then
...
...
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