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
d01063e1
Commit
d01063e1
authored
Jun 22, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Send pkg-config error messages to /dev/null.
parent
02bbf06c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
configure
configure
+8
-8
configure.ac
configure.ac
+6
-6
No files found.
configure
View file @
d01063e1
...
@@ -3988,7 +3988,7 @@ if test "$ac_x_libraries" = no; then
...
@@ -3988,7 +3988,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# See if we find them without any special options.
# Don't add to $LIBS permanently.
# Don't add to $LIBS permanently.
ac_save_LIBS
=
$LIBS
ac_save_LIBS
=
$LIBS
LIBS
=
"-lX
t
$LIBS
"
LIBS
=
"-lX
11
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
/* confdefs.h. */
_ACEOF
_ACEOF
...
@@ -4050,7 +4050,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
...
@@ -4050,7 +4050,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
do
# Don't even attempt the hair of trying to link an X program!
# Don't even attempt the hair of trying to link an X program!
for
ac_extension
in
a so sl
;
do
for
ac_extension
in
a so sl
;
do
if
test
-r
"
$ac_dir
/libX
t
.
$ac_extension
"
;
then
if
test
-r
"
$ac_dir
/libX
11
.
$ac_extension
"
;
then
ac_x_libraries
=
$ac_dir
ac_x_libraries
=
$ac_dir
break
2
break
2
fi
fi
...
@@ -10747,8 +10747,8 @@ XSLTINCL=""
...
@@ -10747,8 +10747,8 @@ XSLTINCL=""
if
test
"
$PKG_CONFIG
"
!=
"false"
if
test
"
$PKG_CONFIG
"
!=
"false"
then
then
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
ac_xml_libs
=
"
`
$PKG_CONFIG
--libs
libxml-2.0
`
"
ac_xml_libs
=
"
`
$PKG_CONFIG
--libs
libxml-2.0
2>/dev/null
`
"
ac_xml_cflags
=
"
`
$PKG_CONFIG
--cflags
libxml-2.0
`
"
ac_xml_cflags
=
"
`
$PKG_CONFIG
--cflags
libxml-2.0
2>/dev/null
`
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_xml_cflags
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_xml_cflags
"
for
ac_header
in
libxml/parser.h
for
ac_header
in
libxml/parser.h
...
@@ -11092,8 +11092,8 @@ fi
...
@@ -11092,8 +11092,8 @@ fi
done
done
CPPFLAGS
=
"
$ac_save_CPPFLAGS
"
CPPFLAGS
=
"
$ac_save_CPPFLAGS
"
ac_xslt_libs
=
"
`
$PKG_CONFIG
--libs
libxslt
`
"
ac_xslt_libs
=
"
`
$PKG_CONFIG
--libs
libxslt
2>/dev/null
`
"
ac_xslt_cflags
=
"
`
$PKG_CONFIG
--cflags
libxslt
`
"
ac_xslt_cflags
=
"
`
$PKG_CONFIG
--cflags
libxslt
2>/dev/null
`
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_xslt_cflags
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_xslt_cflags
"
...
@@ -11268,8 +11268,8 @@ HALINCL=""
...
@@ -11268,8 +11268,8 @@ HALINCL=""
if
test
"
$PKG_CONFIG
"
!=
"false"
if
test
"
$PKG_CONFIG
"
!=
"false"
then
then
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
ac_hal_libs
=
"
`
$PKG_CONFIG
--libs
hal
`
"
ac_hal_libs
=
"
`
$PKG_CONFIG
--libs
hal
2>/dev/null
`
"
ac_hal_cflags
=
"
`
$PKG_CONFIG
--cflags
hal
`
"
ac_hal_cflags
=
"
`
$PKG_CONFIG
--cflags
hal
2>/dev/null
`
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_hal_cflags
"
CPPFLAGS
=
"
$CPPFLAGS
$ac_hal_cflags
"
...
...
configure.ac
View file @
d01063e1
...
@@ -480,8 +480,8 @@ AC_SUBST(XSLTINCL,"")
...
@@ -480,8 +480,8 @@ AC_SUBST(XSLTINCL,"")
if test "$PKG_CONFIG" != "false"
if test "$PKG_CONFIG" != "false"
then
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CPPFLAGS="$CPPFLAGS"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0`"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0
2>/dev/null
`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
AC_CHECK_HEADERS(libxml/parser.h,
AC_CHECK_HEADERS(libxml/parser.h,
[AC_CHECK_LIB(xml2, xmlParseMemory,
[AC_CHECK_LIB(xml2, xmlParseMemory,
...
@@ -492,8 +492,8 @@ then
...
@@ -492,8 +492,8 @@ then
[AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
[AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
])
])
CPPFLAGS="$ac_save_CPPFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt`"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt
2>/dev/null
`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
[AC_CHECK_LIB(xslt, xsltCompilePattern,
[AC_CHECK_LIB(xslt, xsltCompilePattern,
...
@@ -512,8 +512,8 @@ AC_SUBST(HALINCL,"")
...
@@ -512,8 +512,8 @@ AC_SUBST(HALINCL,"")
if test "$PKG_CONFIG" != "false"
if test "$PKG_CONFIG" != "false"
then
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal`"
ac_hal_libs="`$PKG_CONFIG --libs hal
2>/dev/null
`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h])
AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h])
if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
...
...
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