Alexandre Julliard : configure: Send pkg-config error messages to
/dev/null .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 22 06:17:15 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: d01063e1d25b732d02399b7e543ba37390a56f0e
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d01063e1d25b732d02399b7e543ba37390a56f0e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 22 12:07:57 2006 +0200
configure: Send pkg-config error messages to /dev/null.
---
configure | 16 ++++++++--------
configure.ac | 12 ++++++------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index c3faa60..4728e1d 100755
--- a/configure
+++ b/configure
@@ -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="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4050,7 +4050,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
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/libXt.$ac_extension"; then
+ if test -r "$ac_dir/libX11.$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"
diff --git a/configure.ac b/configure.ac
index 743ac69..8423981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
More information about the wine-cvs
mailing list