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
21f2c0e6
Commit
21f2c0e6
authored
Jun 11, 2013
by
Alexandre Rostovtsev
Committed by
Alexandre Julliard
Jun 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Always check for pkg-config.
parent
fee9cd3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
95 additions
and
94 deletions
+95
-94
configure
configure
+94
-94
configure.ac
configure.ac
+1
-0
No files found.
configure
View file @
21f2c0e6
...
...
@@ -672,7 +672,6 @@ XSLT_LIBS
XSLT_CFLAGS
XML2_LIBS
XML2_CFLAGS
PKG_CONFIG
X_EXTRA_LIBS
X_LIBS
X_PRE_LIBS
...
...
@@ -711,6 +710,7 @@ CPP
OPENGL_LIBS
XLIB
MAINTAINER_MODE
PKG_CONFIG
MSGFMT
ICOTOOL
CONVERT
...
...
@@ -5152,6 +5152,98 @@ fi
done
test
-n
"
$MSGFMT
"
||
MSGFMT
=
"false"
if
test
-n
"
$ac_tool_prefix
"
;
then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
pkg-config
;
ac_word
=
$2
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for
$ac_word
"
>
&5
$as_echo_n
"checking for
$ac_word
... "
>
&6
;
}
if
${
ac_cv_prog_PKG_CONFIG
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
if
test
-n
"
$PKG_CONFIG
"
;
then
ac_cv_prog_PKG_CONFIG
=
"
$PKG_CONFIG
"
# Let the user override the test.
else
as_save_IFS
=
$IFS
;
IFS
=
$PATH_SEPARATOR
for
as_dir
in
$PATH
do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
ac_cv_prog_PKG_CONFIG
=
"
${
ac_tool_prefix
}
pkg-config"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
fi
done
done
IFS
=
$as_save_IFS
fi
fi
PKG_CONFIG
=
$ac_cv_prog_PKG_CONFIG
if
test
-n
"
$PKG_CONFIG
"
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$PKG_CONFIG
"
>
&5
$as_echo
"
$PKG_CONFIG
"
>
&6
;
}
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
fi
fi
if
test
-z
"
$ac_cv_prog_PKG_CONFIG
"
;
then
ac_ct_PKG_CONFIG
=
$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set
dummy pkg-config
;
ac_word
=
$2
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for
$ac_word
"
>
&5
$as_echo_n
"checking for
$ac_word
... "
>
&6
;
}
if
${
ac_cv_prog_ac_ct_PKG_CONFIG
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
if
test
-n
"
$ac_ct_PKG_CONFIG
"
;
then
ac_cv_prog_ac_ct_PKG_CONFIG
=
"
$ac_ct_PKG_CONFIG
"
# Let the user override the test.
else
as_save_IFS
=
$IFS
;
IFS
=
$PATH_SEPARATOR
for
as_dir
in
$PATH
do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
ac_cv_prog_ac_ct_PKG_CONFIG
=
"pkg-config"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
fi
done
done
IFS
=
$as_save_IFS
fi
fi
ac_ct_PKG_CONFIG
=
$ac_cv_prog_ac_ct_PKG_CONFIG
if
test
-n
"
$ac_ct_PKG_CONFIG
"
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_ct_PKG_CONFIG
"
>
&5
$as_echo
"
$ac_ct_PKG_CONFIG
"
>
&6
;
}
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
fi
if
test
"x
$ac_ct_PKG_CONFIG
"
=
x
;
then
PKG_CONFIG
=
""
else
case
$cross_compiling
:
$ac_tool_warned
in
yes
:
)
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: WARNING: using cross tools not prefixed with host triplet"
>
&5
$as_echo
"
$as_me
: WARNING: using cross tools not prefixed with host triplet"
>
&2
;
}
ac_tool_warned
=
yes
;;
esac
PKG_CONFIG
=
$ac_ct_PKG_CONFIG
fi
else
PKG_CONFIG
=
"
$ac_cv_prog_PKG_CONFIG
"
fi
if
test
"x
$enable_maintainer_mode
"
!=
"xyes"
then
...
...
@@ -9500,99 +9592,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op
if
test
"x
$with_xml
"
!=
"xno"
then
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
if
test
-n
"
$ac_tool_prefix
"
;
then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
pkg-config
;
ac_word
=
$2
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for
$ac_word
"
>
&5
$as_echo_n
"checking for
$ac_word
... "
>
&6
;
}
if
${
ac_cv_prog_PKG_CONFIG
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
if
test
-n
"
$PKG_CONFIG
"
;
then
ac_cv_prog_PKG_CONFIG
=
"
$PKG_CONFIG
"
# Let the user override the test.
else
as_save_IFS
=
$IFS
;
IFS
=
$PATH_SEPARATOR
for
as_dir
in
$PATH
do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
ac_cv_prog_PKG_CONFIG
=
"
${
ac_tool_prefix
}
pkg-config"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
fi
done
done
IFS
=
$as_save_IFS
fi
fi
PKG_CONFIG
=
$ac_cv_prog_PKG_CONFIG
if
test
-n
"
$PKG_CONFIG
"
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$PKG_CONFIG
"
>
&5
$as_echo
"
$PKG_CONFIG
"
>
&6
;
}
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
fi
fi
if
test
-z
"
$ac_cv_prog_PKG_CONFIG
"
;
then
ac_ct_PKG_CONFIG
=
$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set
dummy pkg-config
;
ac_word
=
$2
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for
$ac_word
"
>
&5
$as_echo_n
"checking for
$ac_word
... "
>
&6
;
}
if
${
ac_cv_prog_ac_ct_PKG_CONFIG
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
if
test
-n
"
$ac_ct_PKG_CONFIG
"
;
then
ac_cv_prog_ac_ct_PKG_CONFIG
=
"
$ac_ct_PKG_CONFIG
"
# Let the user override the test.
else
as_save_IFS
=
$IFS
;
IFS
=
$PATH_SEPARATOR
for
as_dir
in
$PATH
do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
ac_cv_prog_ac_ct_PKG_CONFIG
=
"pkg-config"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
fi
done
done
IFS
=
$as_save_IFS
fi
fi
ac_ct_PKG_CONFIG
=
$ac_cv_prog_ac_ct_PKG_CONFIG
if
test
-n
"
$ac_ct_PKG_CONFIG
"
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_ct_PKG_CONFIG
"
>
&5
$as_echo
"
$ac_ct_PKG_CONFIG
"
>
&6
;
}
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
fi
if
test
"x
$ac_ct_PKG_CONFIG
"
=
x
;
then
PKG_CONFIG
=
""
else
case
$cross_compiling
:
$ac_tool_warned
in
yes
:
)
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: WARNING: using cross tools not prefixed with host triplet"
>
&5
$as_echo
"
$as_me
: WARNING: using cross tools not prefixed with host triplet"
>
&2
;
}
ac_tool_warned
=
yes
;;
esac
PKG_CONFIG
=
$ac_ct_PKG_CONFIG
fi
else
PKG_CONFIG
=
"
$ac_cv_prog_PKG_CONFIG
"
fi
if
test
-n
"
$XML2_CFLAGS
"
;
then
:
if
test
-n
"
$XML2_CFLAGS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
XML2_CFLAGS
=
`
$PKG_CONFIG
--cflags
libxml-2.0 2>/dev/null
`
...
...
configure.ac
View file @
21f2c0e6
...
...
@@ -288,6 +288,7 @@ AC_CHECK_PROGS(RSVG, rsvg, false)
AC_CHECK_PROGS(CONVERT, convert, false)
AC_CHECK_PROGS(ICOTOOL, icotool, false)
AC_CHECK_PROGS(MSGFMT, msgfmt, false)
WINE_PATH_PKG_CONFIG
if test "x$enable_maintainer_mode" != "xyes"
then
...
...
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