Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c19da578
Commit
c19da578
authored
Apr 12, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Set wine_makedep variable outside of the cache check.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a5b22c86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
31 deletions
+31
-31
configure
configure
+17
-16
configure.ac
configure.ac
+14
-15
No files found.
configure
View file @
c19da578
...
...
@@ -5711,25 +5711,26 @@ else
wine_cv_toolsdir
=
"
$with_wine64
"
fi
fi
if
test
-z
"
$wine_cv_toolsdir
"
;
then
wine_makedep
=
tools/makedep
wine_cv_toolsdir
=
"
\$
(top_builddir)"
elif
test
-d
"
$wine_cv_toolsdir
/tools/winebuild"
;
then
wine_makedep
=
$wine_cv_toolsdir
/tools/makedep
case
"
$wine_cv_toolsdir
"
in
/
*
)
;;
*
)
wine_cv_toolsdir
=
"
\$
(top_builddir)/
$wine_cv_toolsdir
"
;;
esac
enable_tools
=
${
enable_tools
:-
no
}
test
-f
"
$wine_makedep
"
||
as_fn_error
$?
"the Wine tools have not yet been built in
$wine_cv_toolsdir
"
"
$LINENO
"
5
else
as_fn_error
$?
"could not find Wine tools in
$wine_cv_toolsdir
"
"
$LINENO
"
5
fi
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$wine_cv_toolsdir
"
>
&5
$as_echo
"
$wine_cv_toolsdir
"
>
&6
;
}
TOOLSDIR
=
$wine_cv_toolsdir
if
test
-z
"
$wine_cv_toolsdir
"
;
then
wine_makedep
=
tools/makedep
TOOLSDIR
=
"
\$
(top_builddir)"
elif
test
-d
"
$wine_cv_toolsdir
/tools/winebuild"
;
then
wine_makedep
=
$wine_cv_toolsdir
/tools/makedep
case
"
$wine_cv_toolsdir
"
in
/
*
)
TOOLSDIR
=
$wine_cv_toolsdir
;;
*
)
TOOLSDIR
=
"
\$
(top_builddir)/
$wine_cv_toolsdir
"
;;
esac
enable_tools
=
${
enable_tools
:-
no
}
test
-f
"
$wine_makedep
"
||
as_fn_error
$?
"the Wine tools have not yet been built in
$wine_cv_toolsdir
"
"
$LINENO
"
5
else
as_fn_error
$?
"could not find Wine tools in
$wine_cv_toolsdir
"
"
$LINENO
"
5
fi
if
test
-n
"
$host_alias
"
-a
"
$host_alias
"
!=
"
$build_alias
"
then
TARGETFLAGS
=
"-b
$host_alias
$TARGETFLAGS
"
...
...
configure.ac
View file @
c19da578
...
...
@@ -243,22 +243,21 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
elif test -n "$with_wine64"; then
wine_cv_toolsdir="$with_wine64"
fi
fi
if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in
/*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac
enable_tools=${enable_tools:-no}
test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir])
else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi])
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
AC_SUBST(TOOLSDIR,"\$(top_builddir)")
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in
/*) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) ;;
*) AC_SUBST(TOOLSDIR,"\$(top_builddir)/$wine_cv_toolsdir") ;;
esac
enable_tools=${enable_tools:-no}
test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir])
else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi
if test -n "$host_alias" -a "$host_alias" != "$build_alias"
then
AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment