X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure;h=4447bb977424a2e089188e0ce403d8aae96b86bd;hb=a27310520f595a63be801671c6817e5ce54ec90d;hp=5dee0e54add075d5367afd56e6e2e1faf833bb98;hpb=3bd48376ad42f7f992078041895a3a32d37a5909;p=xestiaab%2F.git diff --git a/source/configure b/source/configure index 5dee0e5..4447bb9 100755 --- a/source/configure +++ b/source/configure @@ -630,6 +630,9 @@ DEBUG_TRUE FOUND_UUIDGEN_RES_FALSE FOUND_UUIDGEN_RES_TRUE FOUND_UUIDGEN +FOUND_FILE_RES_FALSE +FOUND_FILE_RES_TRUE +FOUND_FILE FOUND_XML2CONFIG_RES_FALSE FOUND_XML2CONFIG_RES_TRUE FOUND_XML2CONFIG @@ -4338,6 +4341,65 @@ fi # libxml2 Library +CPPFLAGSOLD=CPPFLAGS +CPPFLAGS=`xml2-config --cflags` + +# Extract the first word of "xml2-config", so it can be a program name with args. +set dummy xml2-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_FOUND_XML2CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$FOUND_XML2CONFIG"; then + ac_cv_prog_FOUND_XML2CONFIG="$FOUND_XML2CONFIG" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_FOUND_XML2CONFIG="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_FOUND_XML2CONFIG" && ac_cv_prog_FOUND_XML2CONFIG="no" +fi +fi +FOUND_XML2CONFIG=$ac_cv_prog_FOUND_XML2CONFIG +if test -n "$FOUND_XML2CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_XML2CONFIG" >&5 +$as_echo "$FOUND_XML2CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x$FOUND_XML2CONFIG = xyes; then + FOUND_XML2CONFIG_RES_TRUE= + FOUND_XML2CONFIG_RES_FALSE='#' +else + FOUND_XML2CONFIG_RES_TRUE='#' + FOUND_XML2CONFIG_RES_FALSE= +fi + + +if test -z "$FOUND_XML2CONFIG_RES_TRUE"; then : + else + echo "Cannot find the xml2-config program on your system. +If it is installed on your system, adjust your PATH environment +variable before running configure again." + exit -1 + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml2" >&5 $as_echo_n "checking for main in -lxml2... " >&6; } if ${ac_cv_lib_xml2_main+:} false; then : @@ -4404,15 +4466,19 @@ fi done -# Extract the first word of "xml2-config", so it can be a program name with args. -set dummy xml2-config; ac_word=$2 +CPPFLAGS=CPPFLAGSOLD + +# file application + +# Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_FOUND_XML2CONFIG+:} false; then : +if ${ac_cv_prog_FOUND_FILE+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$FOUND_XML2CONFIG"; then - ac_cv_prog_FOUND_XML2CONFIG="$FOUND_XML2CONFIG" # Let the user override the test. + if test -n "$FOUND_FILE"; then + ac_cv_prog_FOUND_FILE="$FOUND_FILE" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4421,7 +4487,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_FOUND_XML2CONFIG="yes" + ac_cv_prog_FOUND_FILE="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4429,31 +4495,31 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_FOUND_XML2CONFIG" && ac_cv_prog_FOUND_XML2CONFIG="no" + test -z "$ac_cv_prog_FOUND_FILE" && ac_cv_prog_FOUND_FILE="no" fi fi -FOUND_XML2CONFIG=$ac_cv_prog_FOUND_XML2CONFIG -if test -n "$FOUND_XML2CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_XML2CONFIG" >&5 -$as_echo "$FOUND_XML2CONFIG" >&6; } +FOUND_FILE=$ac_cv_prog_FOUND_FILE +if test -n "$FOUND_FILE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_FILE" >&5 +$as_echo "$FOUND_FILE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test x$FOUND_XML2CONFIG = xyes; then - FOUND_XML2CONFIG_RES_TRUE= - FOUND_XML2CONFIG_RES_FALSE='#' + if test x$FOUND_FILE = xyes; then + FOUND_FILE_RES_TRUE= + FOUND_FILE_RES_FALSE='#' else - FOUND_XML2CONFIG_RES_TRUE='#' - FOUND_XML2CONFIG_RES_FALSE= + FOUND_FILE_RES_TRUE='#' + FOUND_FILE_RES_FALSE= fi -if test -z "$FOUND_XML2CONFIG_RES_TRUE"; then : +if test -z "$FOUND_FILE_RES_TRUE"; then : else - echo "Cannot find the xml2-config program on your system. + echo "Cannot find the file program on your system. If it is installed on your system, adjust your PATH environment variable before running configure again." exit -1 @@ -4867,6 +4933,10 @@ if test -z "${FOUND_XML2CONFIG_RES_TRUE}" && test -z "${FOUND_XML2CONFIG_RES_FAL as_fn_error $? "conditional \"FOUND_XML2CONFIG_RES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${FOUND_FILE_RES_TRUE}" && test -z "${FOUND_FILE_RES_FALSE}"; then + as_fn_error $? "conditional \"FOUND_FILE_RES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${FOUND_UUIDGEN_RES_TRUE}" && test -z "${FOUND_UUIDGEN_RES_FALSE}"; then as_fn_error $? "conditional \"FOUND_UUIDGEN_RES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5