update build system
This commit is contained in:
Chris Cromer
62
configure
vendored
62
configure
vendored
@@ -590,8 +590,8 @@ ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
LIBXML2_LIBS
|
||||
LIBXML2_CFLAGS
|
||||
libxml2_LIBS
|
||||
libxml2_CFLAGS
|
||||
PKG_CONFIG_LIBDIR
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG
|
||||
@@ -703,8 +703,8 @@ CPPFLAGS
|
||||
PKG_CONFIG
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG_LIBDIR
|
||||
LIBXML2_CFLAGS
|
||||
LIBXML2_LIBS'
|
||||
libxml2_CFLAGS
|
||||
libxml2_LIBS'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -1348,10 +1348,10 @@ Some influential environment variables:
|
||||
directories to add to pkg-config's search path
|
||||
PKG_CONFIG_LIBDIR
|
||||
path overriding pkg-config's built-in search path
|
||||
LIBXML2_CFLAGS
|
||||
C compiler flags for LIBXML2, overriding pkg-config
|
||||
LIBXML2_LIBS
|
||||
linker flags for LIBXML2, overriding pkg-config
|
||||
libxml2_CFLAGS
|
||||
C compiler flags for libxml2, overriding pkg-config
|
||||
libxml2_LIBS
|
||||
linker flags for libxml2, overriding pkg-config
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@@ -2521,6 +2521,9 @@ END
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@@ -3940,7 +3943,7 @@ http://www.libxml.org/." "$LINENO" 5
|
||||
rm -f conf.xmltest
|
||||
|
||||
|
||||
AM_CFLAGS=(`xml2-config --cflags`)
|
||||
AM_CFLAGS=(`xml2-config --cflags --libs`)
|
||||
|
||||
|
||||
|
||||
@@ -4064,11 +4067,11 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
|
||||
$as_echo_n "checking for LIBXML2... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
|
||||
$as_echo_n "checking for libxml2... " >&6; }
|
||||
|
||||
if test -n "$LIBXML2_CFLAGS"; then
|
||||
pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
|
||||
if test -n "$libxml2_CFLAGS"; then
|
||||
pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
|
||||
@@ -4076,7 +4079,7 @@ if test -n "$LIBXML2_CFLAGS"; then
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
|
||||
pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -4084,8 +4087,8 @@ fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$LIBXML2_LIBS"; then
|
||||
pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
|
||||
if test -n "$libxml2_LIBS"; then
|
||||
pkg_cv_libxml2_LIBS="$libxml2_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
|
||||
@@ -4093,7 +4096,7 @@ if test -n "$LIBXML2_LIBS"; then
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
|
||||
pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -4114,22 +4117,22 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
|
||||
libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
|
||||
else
|
||||
LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
|
||||
libxml2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$LIBXML2_PKG_ERRORS" >&5
|
||||
echo "$libxml2_PKG_ERRORS" >&5
|
||||
|
||||
as_fn_error $? "Package requirements (libxml-2.0) were not met:
|
||||
|
||||
$LIBXML2_PKG_ERRORS
|
||||
$libxml2_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables LIBXML2_CFLAGS
|
||||
and LIBXML2_LIBS to avoid the need to call pkg-config.
|
||||
Alternatively, you may set the environment variables libxml2_CFLAGS
|
||||
and libxml2_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details." "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
@@ -4140,21 +4143,23 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively, you may set the environment variables LIBXML2_CFLAGS
|
||||
and LIBXML2_LIBS to avoid the need to call pkg-config.
|
||||
Alternatively, you may set the environment variables libxml2_CFLAGS
|
||||
and libxml2_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
else
|
||||
LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
|
||||
LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
|
||||
libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS
|
||||
libxml2_LIBS=$pkg_cv_libxml2_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
ac_config_files="$ac_config_files Makefile src/Makefile"
|
||||
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -4900,6 +4905,7 @@ do
|
||||
case $ac_config_target in
|
||||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
|
||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user