forked from Mirrors/wine-wine
parent
746cd5c026
commit
d7f6424199
|
@ -8906,31 +8906,24 @@ done
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
||||||
|
|
||||||
|
|
||||||
|
for ac_header in libxslt/pattern.h libxslt/transform.h
|
||||||
for ac_header in libxslt/xslt.h \
|
|
||||||
libxslt/pattern.h \
|
|
||||||
libxslt/transform.h
|
|
||||||
do
|
do
|
||||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
||||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
||||||
else
|
else
|
||||||
# Is the header compilable?
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
||||||
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
$ac_includes_default
|
#ifdef HAVE_LIBXSLT_PATTERN_H
|
||||||
|
# include <libxslt/pattern.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <$ac_header>
|
#include <$ac_header>
|
||||||
_ACEOF
|
_ACEOF
|
||||||
rm -f conftest.$ac_objext
|
rm -f conftest.$ac_objext
|
||||||
|
@ -8954,100 +8947,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
(exit $ac_status); }; }; then
|
(exit $ac_status); }; }; then
|
||||||
ac_header_compiler=yes
|
eval "$as_ac_Header=yes"
|
||||||
else
|
else
|
||||||
echo "$as_me: failed program was:" >&5
|
echo "$as_me: failed program was:" >&5
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
ac_header_compiler=no
|
eval "$as_ac_Header=no"
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
||||||
echo "${ECHO_T}$ac_header_compiler" >&6
|
|
||||||
|
|
||||||
# Is the header present?
|
|
||||||
echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
||||||
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <$ac_header>
|
|
||||||
_ACEOF
|
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
||||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } >/dev/null; then
|
|
||||||
if test -s conftest.err; then
|
|
||||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
|
||||||
ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
||||||
else
|
|
||||||
ac_cpp_err=
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ac_cpp_err=yes
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cpp_err"; then
|
|
||||||
ac_header_preproc=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_header_preproc=no
|
|
||||||
fi
|
|
||||||
rm -f conftest.err conftest.$ac_ext
|
|
||||||
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
||||||
echo "${ECHO_T}$ac_header_preproc" >&6
|
|
||||||
|
|
||||||
# So? What about this header?
|
|
||||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
||||||
yes:no: )
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
||||||
ac_header_preproc=yes
|
|
||||||
;;
|
|
||||||
no:yes:* )
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
||||||
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
||||||
(
|
|
||||||
cat <<\_ASBOX
|
|
||||||
## ------------------------------------ ##
|
|
||||||
## Report this to wine-devel@winehq.org ##
|
|
||||||
## ------------------------------------ ##
|
|
||||||
_ASBOX
|
|
||||||
) |
|
|
||||||
sed "s/^/$as_me: WARNING: /" >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
||||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
eval "$as_ac_Header=\$ac_header_preproc"
|
|
||||||
fi
|
fi
|
||||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||||
|
|
||||||
fi
|
|
||||||
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||||
|
|
|
@ -462,14 +462,15 @@ then
|
||||||
ac_xslt_libs="`$PKG_CONFIG --libs libxslt`"
|
ac_xslt_libs="`$PKG_CONFIG --libs libxslt`"
|
||||||
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`"
|
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`"
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
||||||
AC_CHECK_HEADERS(libxslt/xslt.h \
|
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
|
||||||
libxslt/pattern.h \
|
|
||||||
libxslt/transform.h,
|
|
||||||
[AC_CHECK_LIB(xslt, xsltCompilePattern,
|
[AC_CHECK_LIB(xslt, xsltCompilePattern,
|
||||||
[AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
|
[AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
|
||||||
XSLTLIBS="$ac_xslt_libs"
|
XSLTLIBS="$ac_xslt_libs"
|
||||||
XSLTINCL="$ac_xslt_cflags"],,$ac_xslt_libs)
|
XSLTINCL="$ac_xslt_cflags"],,$ac_xslt_libs)
|
||||||
])
|
],,
|
||||||
|
[#ifdef HAVE_LIBXSLT_PATTERN_H
|
||||||
|
# include <libxslt/pattern.h>
|
||||||
|
#endif])
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -293,9 +293,6 @@
|
||||||
/* Define to 1 if you have the <libxslt/transform.h> header file. */
|
/* Define to 1 if you have the <libxslt/transform.h> header file. */
|
||||||
#undef HAVE_LIBXSLT_TRANSFORM_H
|
#undef HAVE_LIBXSLT_TRANSFORM_H
|
||||||
|
|
||||||
/* Define to 1 if you have the <libxslt/xslt.h> header file. */
|
|
||||||
#undef HAVE_LIBXSLT_XSLT_H
|
|
||||||
|
|
||||||
/* Define if you have the Xxf86dga library version 2 */
|
/* Define if you have the Xxf86dga library version 2 */
|
||||||
#undef HAVE_LIBXXF86DGA2
|
#undef HAVE_LIBXXF86DGA2
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue