This commit is contained in:
matthieu 2010-10-03 14:27:14 +00:00
parent 3c4f0cc6df
commit 3ea6e813ac
4 changed files with 280 additions and 25 deletions

View File

@ -124,8 +124,14 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@
HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@
HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@
HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@

287
lib/libXi/configure vendored
View File

@ -918,7 +918,13 @@ LIBTOOL
XI_CFLAGS
XI_LIBS
XMLTO
HAVE_XMLTO_TEXT_TRUE
HAVE_XMLTO_TEXT_FALSE
HAVE_XMLTO_TRUE
HAVE_XMLTO_FALSE
ASCIIDOC
HAVE_ASCIIDOC_TRUE
HAVE_ASCIIDOC_FALSE
HAVE_DOCTOOLS_TRUE
HAVE_DOCTOOLS_FALSE
INSTALL_MANPAGES_TRUE
@ -941,6 +947,8 @@ with_gnu_ld
enable_libtool_lock
with_pic
with_tags
with_xmlto
with_asciidoc
enable_malloc0returnsnull
'
ac_precious_vars='build_alias
@ -1615,6 +1623,10 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
--with-xmlto Use xmlto to regenerate documentation (default: yes,
if installed)
--with-asciidoc Use asciidoc to regenerate documentation (default:
yes, if installed)
Some influential environment variables:
CC C compiler command
@ -6467,7 +6479,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6470 "configure"' > conftest.$ac_ext
echo '#line 6482 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -9090,11 +9102,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9105: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:9097: \$? = $ac_status" >&5
echo "$as_me:9109: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -9380,11 +9392,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9383: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9395: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:9387: \$? = $ac_status" >&5
echo "$as_me:9399: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -9484,11 +9496,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9487: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9491: \$? = $ac_status" >&5
echo "$as_me:9503: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -11884,7 +11896,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11887 "configure"
#line 11899 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11984,7 +11996,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11987 "configure"
#line 11999 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14393,11 +14405,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14396: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14408: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14400: \$? = $ac_status" >&5
echo "$as_me:14412: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14497,11 +14509,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14500: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14512: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14504: \$? = $ac_status" >&5
echo "$as_me:14516: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -16080,11 +16092,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:16083: $lt_compile\"" >&5)
(eval echo "\"\$as_me:16095: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:16087: \$? = $ac_status" >&5
echo "$as_me:16099: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -16184,11 +16196,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:16187: $lt_compile\"" >&5)
(eval echo "\"\$as_me:16199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:16191: \$? = $ac_status" >&5
echo "$as_me:16203: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -18399,11 +18411,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18402: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18414: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18406: \$? = $ac_status" >&5
echo "$as_me:18418: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -18689,11 +18701,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18692: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18704: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18696: \$? = $ac_status" >&5
echo "$as_me:18708: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -18793,11 +18805,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18796: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18808: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18800: \$? = $ac_status" >&5
echo "$as_me:18812: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -21669,7 +21681,18 @@ XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS"
# Check for xmlto and asciidoc for man page conversion
# (only needed by people building tarballs)
# Extract the first word of "xmlto", so it can be a program name with args.
# Check whether --with-xmlto was given.
if test "${with_xmlto+set}" = set; then
withval=$with_xmlto; use_xmlto=$withval
else
use_xmlto=auto
fi
if test "x$use_xmlto" = x"auto"; then
# Extract the first word of "xmlto", so it can be a program name with args.
set dummy xmlto; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@ -21709,8 +21732,124 @@ $as_echo "no" >&6; }
fi
if test "x$XMLTO" = "x"; then
{ $as_echo "$as_me:$LINENO: WARNING: xmlto not found - documentation targets will be skipped" >&5
$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;}
have_xmlto=no
else
have_xmlto=yes
fi
elif test "x$use_xmlto" = x"yes" ; then
# Extract the first word of "xmlto", so it can be a program name with args.
set dummy xmlto; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_XMLTO+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $XMLTO in
[\\/]* | ?:[\\/]*)
ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
# Extract the first word of "asciidoc", so it can be a program name with args.
;;
esac
fi
XMLTO=$ac_cv_path_XMLTO
if test -n "$XMLTO"; then
{ $as_echo "$as_me:$LINENO: result: $XMLTO" >&5
$as_echo "$XMLTO" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$XMLTO" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: --with-xmlto=yes specified but xmlto not found in PATH" >&5
$as_echo "$as_me: error: --with-xmlto=yes specified but xmlto not found in PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
have_xmlto=yes
elif test "x$use_xmlto" = x"no" ; then
if test "x$XMLTO" != "x"; then
{ $as_echo "$as_me:$LINENO: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5
$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;}
fi
have_xmlto=no
else
{ { $as_echo "$as_me:$LINENO: error: --with-xmlto expects 'yes' or 'no'" >&5
$as_echo "$as_me: error: --with-xmlto expects 'yes' or 'no'" >&2;}
{ (exit 1); exit 1; }; }
fi
# Test for a minimum version of xmlto, if provided.
# Test for the ability of xmlto to generate a text target
have_xmlto_text=no
cat > conftest.xml << "EOF"
EOF
if test "$have_xmlto" = yes; then
if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then
have_xmlto_text=yes
else
{ $as_echo "$as_me:$LINENO: WARNING: xmlto cannot generate text format, this format skipped" >&5
$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
fi
fi
rm -f conftest.xml
if test $have_xmlto_text = yes; then
HAVE_XMLTO_TEXT_TRUE=
HAVE_XMLTO_TEXT_FALSE='#'
else
HAVE_XMLTO_TEXT_TRUE='#'
HAVE_XMLTO_TEXT_FALSE=
fi
if test "$have_xmlto" = yes; then
HAVE_XMLTO_TRUE=
HAVE_XMLTO_FALSE='#'
else
HAVE_XMLTO_TRUE='#'
HAVE_XMLTO_FALSE=
fi
# Check whether --with-asciidoc was given.
if test "${with_asciidoc+set}" = set; then
withval=$with_asciidoc; use_asciidoc=$withval
else
use_asciidoc=auto
fi
if test "x$use_asciidoc" = x"auto"; then
# Extract the first word of "asciidoc", so it can be a program name with args.
set dummy asciidoc; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@ -21750,6 +21889,83 @@ $as_echo "no" >&6; }
fi
if test "x$ASCIIDOC" = "x"; then
{ $as_echo "$as_me:$LINENO: WARNING: asciidoc not found - documentation targets will be skipped" >&5
$as_echo "$as_me: WARNING: asciidoc not found - documentation targets will be skipped" >&2;}
have_asciidoc=no
else
have_asciidoc=yes
fi
elif test "x$use_asciidoc" = x"yes" ; then
# Extract the first word of "asciidoc", so it can be a program name with args.
set dummy asciidoc; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_ASCIIDOC+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $ASCIIDOC in
[\\/]* | ?:[\\/]*)
ac_cv_path_ASCIIDOC="$ASCIIDOC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ASCIIDOC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
ASCIIDOC=$ac_cv_path_ASCIIDOC
if test -n "$ASCIIDOC"; then
{ $as_echo "$as_me:$LINENO: result: $ASCIIDOC" >&5
$as_echo "$ASCIIDOC" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ASCIIDOC" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: --with-asciidoc=yes specified but asciidoc not found in PATH" >&5
$as_echo "$as_me: error: --with-asciidoc=yes specified but asciidoc not found in PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
have_asciidoc=yes
elif test "x$use_asciidoc" = x"no" ; then
if test "x$ASCIIDOC" != "x"; then
{ $as_echo "$as_me:$LINENO: WARNING: ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified" >&5
$as_echo "$as_me: WARNING: ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified" >&2;}
fi
have_asciidoc=no
else
{ { $as_echo "$as_me:$LINENO: error: --with-asciidoc expects 'yes' or 'no'" >&5
$as_echo "$as_me: error: --with-asciidoc expects 'yes' or 'no'" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$have_asciidoc" = yes; then
HAVE_ASCIIDOC_TRUE=
HAVE_ASCIIDOC_FALSE='#'
else
HAVE_ASCIIDOC_TRUE='#'
HAVE_ASCIIDOC_FALSE=
fi
if test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"; then
have_doctools=yes
else
@ -22002,6 +22218,27 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_XMLTO_TEXT_TRUE}" && test -z "${HAVE_XMLTO_TEXT_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"HAVE_XMLTO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_ASCIIDOC_TRUE}" && test -z "${HAVE_ASCIIDOC_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ASCIIDOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"HAVE_ASCIIDOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_DOCTOOLS_TRUE}" && test -z "${HAVE_DOCTOOLS_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCTOOLS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5

View File

@ -127,8 +127,14 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@
HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@
HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@
HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@

View File

@ -134,8 +134,14 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@
HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@
HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@
HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@