forked from Mirrors/wine-wine
configure: Fix libxml2 detection on Mac OS X.
parent
14802872b8
commit
2a98b40a9f
|
@ -8836,12 +8836,16 @@ XSLTLIBS=""
|
||||||
|
|
||||||
XSLTINCL=""
|
XSLTINCL=""
|
||||||
|
|
||||||
|
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||||
if test "$PKG_CONFIG" != "false"
|
if test "$PKG_CONFIG" != "false"
|
||||||
then
|
then
|
||||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
||||||
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
|
else
|
||||||
|
ac_xml_libs="`xml2-config --libs 2>/dev/null`"
|
||||||
|
ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
|
||||||
|
|
||||||
for ac_header in libxml/parser.h
|
for ac_header in libxml/parser.h
|
||||||
do
|
do
|
||||||
|
@ -9196,10 +9200,16 @@ fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
|
if test "$PKG_CONFIG" != "false"
|
||||||
|
then
|
||||||
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
||||||
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
else
|
||||||
|
ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
|
||||||
|
ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
||||||
|
|
||||||
|
|
||||||
for ac_header in libxslt/pattern.h libxslt/transform.h
|
for ac_header in libxslt/pattern.h libxslt/transform.h
|
||||||
|
@ -9332,8 +9342,7 @@ fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
fi
|
|
||||||
|
|
||||||
HALINCL=""
|
HALINCL=""
|
||||||
|
|
||||||
|
|
27
configure.ac
27
configure.ac
|
@ -475,13 +475,17 @@ AC_SUBST(XML2LIBS,"")
|
||||||
AC_SUBST(XML2INCL,"")
|
AC_SUBST(XML2INCL,"")
|
||||||
AC_SUBST(XSLTLIBS,"")
|
AC_SUBST(XSLTLIBS,"")
|
||||||
AC_SUBST(XSLTINCL,"")
|
AC_SUBST(XSLTINCL,"")
|
||||||
|
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||||
if test "$PKG_CONFIG" != "false"
|
if test "$PKG_CONFIG" != "false"
|
||||||
then
|
then
|
||||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
||||||
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
|
else
|
||||||
AC_CHECK_HEADERS(libxml/parser.h,
|
ac_xml_libs="`xml2-config --libs 2>/dev/null`"
|
||||||
|
ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
|
||||||
|
AC_CHECK_HEADERS(libxml/parser.h,
|
||||||
[AC_CHECK_LIB(xml2, xmlParseMemory,
|
[AC_CHECK_LIB(xml2, xmlParseMemory,
|
||||||
[AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
|
[AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
|
||||||
XML2LIBS="$ac_xml_libs"
|
XML2LIBS="$ac_xml_libs"
|
||||||
|
@ -490,12 +494,18 @@ 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)
|
||||||
AC_CHECK_LIB(xml2, xmlNewDocPI,
|
AC_CHECK_LIB(xml2, xmlNewDocPI,
|
||||||
[AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
|
[AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
|
||||||
])
|
])
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
|
if test "$PKG_CONFIG" != "false"
|
||||||
|
then
|
||||||
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
||||||
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
||||||
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
else
|
||||||
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
|
ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
|
||||||
|
ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
|
||||||
|
AC_CHECK_HEADERS([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"
|
||||||
|
@ -504,8 +514,7 @@ then
|
||||||
[#ifdef HAVE_LIBXSLT_PATTERN_H
|
[#ifdef HAVE_LIBXSLT_PATTERN_H
|
||||||
# include <libxslt/pattern.h>
|
# include <libxslt/pattern.h>
|
||||||
#endif])
|
#endif])
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
fi
|
|
||||||
|
|
||||||
dnl **** Check for libhal ****
|
dnl **** Check for libhal ****
|
||||||
AC_SUBST(HALINCL,"")
|
AC_SUBST(HALINCL,"")
|
||||||
|
|
Loading…
Reference in New Issue