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
d01063e1
Commit
d01063e1
authored
18 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Send pkg-config error messages to /dev/null.
parent
02bbf06c
Loading
Loading
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
+6
-6
6 additions, 6 deletions
configure.ac
with
14 additions
and
14 deletions
configure
+
8
−
8
View file @
d01063e1
...
...
@@ -3988,7 +3988,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX
t
$LIBS"
LIBS="-lX
11
$LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
...
...
@@ -4050,7 +4050,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
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
break 2
fi
...
...
@@ -10747,8 +10747,8 @@ XSLTINCL=""
if test "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0
2>/dev/null
`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
for ac_header in libxml/parser.h
...
...
@@ -11092,8 +11092,8 @@ fi
done
CPPFLAGS="$ac_save_CPPFLAGS"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt
2>/dev/null
`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
...
...
@@ -11268,8 +11268,8 @@ HALINCL=""
if test "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal`"
ac_hal_libs="`$PKG_CONFIG --libs hal
2>/dev/null
`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
6
−
6
View file @
d01063e1
...
...
@@ -480,8 +480,8 @@ AC_SUBST(XSLTINCL,"")
if test "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0
2>/dev/null
`"
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
AC_CHECK_HEADERS(libxml/parser.h,
[AC_CHECK_LIB(xml2, xmlParseMemory,
...
...
@@ -492,8 +492,8 @@ then
[AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
])
CPPFLAGS="$ac_save_CPPFLAGS"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt
2>/dev/null
`"
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
[AC_CHECK_LIB(xslt, xsltCompilePattern,
...
...
@@ -512,8 +512,8 @@ AC_SUBST(HALINCL,"")
if test "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal`"
ac_hal_libs="`$PKG_CONFIG --libs hal
2>/dev/null
`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal
2>/dev/null
`"
CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
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"
...
...
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