forked from Mirrors/wine-wine
configure: Fix libxml2 detection on Mac OS X.
parent
14802872b8
commit
2a98b40a9f
|
@ -8836,11 +8836,15 @@ XSLTLIBS=""
|
|||
|
||||
XSLTINCL=""
|
||||
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
if test "$PKG_CONFIG" != "false"
|
||||
then
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
||||
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
||||
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
|
||||
|
@ -9197,8 +9201,14 @@ fi
|
|||
done
|
||||
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
if test "$PKG_CONFIG" != "false"
|
||||
then
|
||||
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
||||
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
||||
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"
|
||||
|
||||
|
||||
|
@ -9333,7 +9343,6 @@ fi
|
|||
done
|
||||
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
fi
|
||||
|
||||
HALINCL=""
|
||||
|
||||
|
|
13
configure.ac
13
configure.ac
|
@ -475,11 +475,15 @@ AC_SUBST(XML2LIBS,"")
|
|||
AC_SUBST(XML2INCL,"")
|
||||
AC_SUBST(XSLTLIBS,"")
|
||||
AC_SUBST(XSLTINCL,"")
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
if test "$PKG_CONFIG" != "false"
|
||||
then
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
|
||||
ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
|
||||
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"
|
||||
AC_CHECK_HEADERS(libxml/parser.h,
|
||||
[AC_CHECK_LIB(xml2, xmlParseMemory,
|
||||
|
@ -492,8 +496,14 @@ then
|
|||
[AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
|
||||
])
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
if test "$PKG_CONFIG" != "false"
|
||||
then
|
||||
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
|
||||
ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
|
||||
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"
|
||||
AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
|
||||
[AC_CHECK_LIB(xslt, xsltCompilePattern,
|
||||
|
@ -505,7 +515,6 @@ then
|
|||
# include <libxslt/pattern.h>
|
||||
#endif])
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
fi
|
||||
|
||||
dnl **** Check for libhal ****
|
||||
AC_SUBST(HALINCL,"")
|
||||
|
|
Loading…
Reference in New Issue