diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 129 |
1 files changed, 106 insertions, 23 deletions
@@ -808,6 +808,8 @@ sigc_LIBS sigc_CFLAGS GnuTLS_LIBS GnuTLS_CFLAGS +libxml2_LIBS +libxml2_CFLAGS PKG_CONFIG INCLUDED_LTDL_FALSE INCLUDED_LTDL_TRUE @@ -977,6 +979,8 @@ CFLAGS CPP CXXCPP PKG_CONFIG +libxml2_CFLAGS +libxml2_LIBS GnuTLS_CFLAGS GnuTLS_LIBS sigc_CFLAGS @@ -1653,6 +1657,10 @@ Some influential environment variables: CPP C preprocessor CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility + libxml2_CFLAGS + C compiler flags for libxml2, overriding pkg-config + libxml2_LIBS + linker flags for libxml2, overriding pkg-config GnuTLS_CFLAGS C compiler flags for GnuTLS, overriding pkg-config GnuTLS_LIBS linker flags for GnuTLS, overriding pkg-config @@ -5330,13 +5338,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5333: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5341: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5336: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5344: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5339: output\"" >&5) + (eval echo "\"\$as_me:5347: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6424,7 +6432,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6427 "configure"' > conftest.$ac_ext + echo '#line 6435 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8763,11 +8771,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:8766: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8770: \$? = $ac_status" >&5 + echo "$as_me:8778: \$? = $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. @@ -9087,11 +9095,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:9090: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9098: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9094: \$? = $ac_status" >&5 + echo "$as_me:9102: \$? = $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. @@ -9192,11 +9200,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:9195: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9203: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9199: \$? = $ac_status" >&5 + echo "$as_me:9207: \$? = $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 @@ -9247,11 +9255,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:9250: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9258: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9254: \$? = $ac_status" >&5 + echo "$as_me:9262: \$? = $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 @@ -12052,7 +12060,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12055 "configure" +#line 12063 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12152,7 +12160,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12155 "configure" +#line 12163 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14163,11 +14171,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:14166: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14174: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14170: \$? = $ac_status" >&5 + echo "$as_me:14178: \$? = $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. @@ -14262,11 +14270,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:14265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14273: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14269: \$? = $ac_status" >&5 + echo "$as_me:14277: \$? = $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 @@ -14314,11 +14322,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:14317: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14325: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14321: \$? = $ac_status" >&5 + echo "$as_me:14329: \$? = $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 @@ -16237,7 +16245,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 16240 "configure" +#line 16248 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17610,6 +17618,81 @@ $as_echo "no" >&6; } fi pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for libxml2" >&5 +$as_echo_n "checking for libxml2... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$libxml2_CFLAGS"; then + pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$libxml2_LIBS"; then + pkg_cv_libxml2_LIBS="$libxml2_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"` + else + libxml2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$libxml2_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Test for libxml 2.0 failed." >&5 +$as_echo "$as_me: error: Test for libxml 2.0 failed." >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:$LINENO: error: Test for libxml 2.0 failed." >&5 +$as_echo "$as_me: error: Test for libxml 2.0 failed." >&2;} + { (exit 1); exit 1; }; } +else + libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS + libxml2_LIBS=$pkg_cv_libxml2_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + +pkg_failed=no { $as_echo "$as_me:$LINENO: checking for GnuTLS" >&5 $as_echo_n "checking for GnuTLS... " >&6; } @@ -17834,7 +17917,7 @@ fi $as_echo_n "checking for MySQL libraries... " >&6; } if test "$MYSQL_CONFIG" != "no"; then - MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" + MYSQL_CFLAGS="`$MYSQL_CONFIG --include`" MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" MYSQL_VERSION=`$MYSQL_CONFIG --version` @@ -17901,7 +17984,7 @@ $as_echo "no" >&6; } -CPPFLAGS='-I${top_srcdir}'"/src $GnuTLS_CFLAGS $sigc_CFLAGS $MYSQL_CFLAGS $INCLTDL $CPPFLAGS" +CPPFLAGS='-I${top_srcdir}'"/src $libxml2_CFLAGS $GnuTLS_CFLAGS $sigc_CFLAGS $MYSQL_CFLAGS $INCLTDL $CPPFLAGS" { $as_echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi_krb5" >&5 $as_echo_n "checking for gss_init_sec_context in -lgssapi_krb5... " >&6; } |