... | ... |
@@ -17834,7 +17834,7 @@ fi |
17834 | 17834 |
|
17835 | 17835 |
|
17836 | 17836 |
|
17837 |
- |
|
17837 |
+with_xml_val="yes" |
|
17838 | 17838 |
want_xml="auto" |
17839 | 17839 |
# Check whether --enable-xml was given. |
17840 | 17840 |
if test "${enable_xml+set}" = set; then : |
... | ... |
@@ -17851,39 +17851,44 @@ $as_echo_n "checking for libxml2 installation... " >&6; } |
17851 | 17851 |
|
17852 | 17852 |
# Check whether --with-xml was given. |
17853 | 17853 |
if test "${with_xml+set}" = set; then : |
17854 |
- withval=$with_xml; |
|
17855 |
- if test "$withval" |
|
17856 |
- then |
|
17857 |
- XML_HOME="$withval" |
|
17858 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $XML_HOME" >&5 |
|
17859 |
-$as_echo "using $XML_HOME" >&6; } |
|
17860 |
- else |
|
17861 |
- as_fn_error $? "cannot assign blank value to --with-xml" "$LINENO" 5 |
|
17862 |
- fi |
|
17854 |
+ withval=$with_xml; with_xml_val=$withval |
|
17855 |
+ |
|
17856 |
+fi |
|
17857 |
+ |
|
17858 |
+fi |
|
17863 | 17859 |
|
17860 |
+if test "x$with_xml_val" = "xno"; then : |
|
17861 |
+ XML_HOME="" |
|
17862 |
+elif test "x$with_xml_val" = "xyes"; then : |
|
17863 |
+ XML_HOME="/usr/local" |
|
17864 | 17864 |
else |
17865 |
+ XML_HOME="$with_xml_val" |
|
17866 |
+fi |
|
17865 | 17867 |
|
17866 |
- XML_HOME=/usr/local |
|
17867 |
- if test ! -x "$XML_HOME/bin/xml2-config" |
|
17868 |
- then |
|
17869 |
- XML_HOME=/usr |
|
17870 |
- if test ! -x "$XML_HOME/bin/xml2-config" |
|
17871 |
- then |
|
17872 |
- XML_HOME="" |
|
17873 |
- fi |
|
17874 |
- fi |
|
17875 |
- if test "x$XML_HOME" != "x"; then |
|
17876 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5 |
|
17877 |
-$as_echo "$XML_HOME" >&6; } |
|
17878 |
- else |
|
17879 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
|
17880 |
-$as_echo "not found" >&6; } |
|
17881 |
- fi |
|
17868 |
+if test "x$XML_HOME" != "x"; then : |
|
17869 |
+ |
|
17870 |
+ if test ! -x "$XML_HOME/bin/xml2-config"; then : |
|
17871 |
+ XML_HOME="" |
|
17872 |
+fi |
|
17873 |
+ |
|
17874 |
+fi |
|
17875 |
+ |
|
17876 |
+if test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"; then : |
|
17882 | 17877 |
|
17878 |
+ if test -x "/usr/bin/xml2-config"; then : |
|
17879 |
+ XML_HOME="/usr" |
|
17883 | 17880 |
fi |
17884 | 17881 |
|
17885 | 17882 |
fi |
17886 | 17883 |
|
17884 |
+if test "x$XML_HOME" != "x"; then |
|
17885 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5 |
|
17886 |
+$as_echo "$XML_HOME" >&6; } |
|
17887 |
+else |
|
17888 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
|
17889 |
+$as_echo "not found" >&6; } |
|
17890 |
+fi |
|
17891 |
+ |
|
17887 | 17892 |
found_xml="no" |
17888 | 17893 |
XMLCONF_VERSION="" |
17889 | 17894 |
XML_CPPFLAGS="" |
... | ... |
@@ -17898,6 +17903,8 @@ $as_echo "$XMLCONF_VERSION" >&6; } |
17898 | 17898 |
found_xml="yes" |
17899 | 17899 |
XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" |
17900 | 17900 |
XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" |
17901 |
+ $as_echo "$XML_CPPFLAGS" |
|
17902 |
+ $as_echo "$XML_LIBS" |
|
17901 | 17903 |
else |
17902 | 17904 |
as_fn_error $? "xml2-config failed" "$LINENO" 5 |
17903 | 17905 |
fi |
... | ... |
@@ -17920,6 +17927,9 @@ $as_echo "found" >&6; } |
17920 | 17920 |
save_LDFLAGS="$LDFLAGS" |
17921 | 17921 |
LDFLAGS="$LDFLAGS $XML_LIBS" |
17922 | 17922 |
|
17923 |
+ $as_echo "CPPFLAGS: $CPPFLAGS" |
|
17924 |
+ $as_echo "LD_FLAGS: $LDFLAGS" |
|
17925 |
+ |
|
17923 | 17926 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlTextReaderRead in -lxml2" >&5 |
17924 | 17927 |
$as_echo_n "checking for xmlTextReaderRead in -lxml2... " >&6; } |
17925 | 17928 |
if ${ac_cv_lib_xml2_xmlTextReaderRead+:} false; then : |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
- |
|
1 |
+with_xml_val="yes" |
|
2 | 2 |
want_xml="auto" |
3 | 3 |
AC_ARG_ENABLE([xml], |
4 | 4 |
[AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], |
... | ... |
@@ -8,32 +8,28 @@ XML_HOME="" |
8 | 8 |
if test "X$want_xml" != "Xno"; then |
9 | 9 |
AC_MSG_CHECKING([for libxml2 installation]) |
10 | 10 |
AC_ARG_WITH([xml], |
11 |
- [AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library |
|
12 |
- @<:@default=/usr/local or /usr if not found in /usr/local@:>@])], |
|
13 |
- [ |
|
14 |
- if test "$withval" |
|
15 |
- then |
|
16 |
- XML_HOME="$withval" |
|
17 |
- AC_MSG_RESULT([using $XML_HOME]) |
|
18 |
- else |
|
19 |
- AC_MSG_ERROR([cannot assign blank value to --with-xml]) |
|
20 |
- fi |
|
21 |
- ], [ |
|
22 |
- XML_HOME=/usr/local |
|
23 |
- if test ! -x "$XML_HOME/bin/xml2-config" |
|
24 |
- then |
|
25 |
- XML_HOME=/usr |
|
26 |
- if test ! -x "$XML_HOME/bin/xml2-config" |
|
27 |
- then |
|
28 |
- XML_HOME="" |
|
29 |
- fi |
|
30 |
- fi |
|
31 |
- if test "x$XML_HOME" != "x"; then |
|
32 |
- AC_MSG_RESULT([$XML_HOME]) |
|
33 |
- else |
|
34 |
- AC_MSG_RESULT([not found]) |
|
35 |
- fi |
|
36 |
- ]) |
|
11 |
+ AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library |
|
12 |
+ @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), |
|
13 |
+ [with_xml_val=$withval] |
|
14 |
+ ) |
|
15 |
+fi |
|
16 |
+ |
|
17 |
+AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], |
|
18 |
+ [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], |
|
19 |
+ [XML_HOME="$with_xml_val"]) |
|
20 |
+ |
|
21 |
+AS_IF([test "x$XML_HOME" != "x"], [ |
|
22 |
+ AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""]) |
|
23 |
+ ]) |
|
24 |
+ |
|
25 |
+AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [ |
|
26 |
+ AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"]) |
|
27 |
+ ]) |
|
28 |
+ |
|
29 |
+if test "x$XML_HOME" != "x"; then |
|
30 |
+ AC_MSG_RESULT([$XML_HOME]) |
|
31 |
+else |
|
32 |
+ AC_MSG_RESULT([not found]) |
|
37 | 33 |
fi |
38 | 34 |
|
39 | 35 |
found_xml="no" |
... | ... |
@@ -48,6 +44,8 @@ if test "x$XML_HOME" != "x"; then |
48 | 48 |
found_xml="yes" |
49 | 49 |
XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" |
50 | 50 |
XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" |
51 |
+ AS_ECHO("$XML_CPPFLAGS") |
|
52 |
+ AS_ECHO("$XML_LIBS") |
|
51 | 53 |
else |
52 | 54 |
AC_MSG_ERROR([xml2-config failed]) |
53 | 55 |
fi |
... | ... |
@@ -67,6 +65,9 @@ if test "X$found_xml" != "Xno"; then |
67 | 67 |
save_LDFLAGS="$LDFLAGS" |
68 | 68 |
LDFLAGS="$LDFLAGS $XML_LIBS" |
69 | 69 |
|
70 |
+ AS_ECHO("CPPFLAGS: $CPPFLAGS") |
|
71 |
+ AS_ECHO("LD_FLAGS: $LDFLAGS") |
|
72 |
+ |
|
70 | 73 |
AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"], [$XML_LIBS]) |
71 | 74 |
|
72 | 75 |
CPPFLAGS="$save_CPPFLAGS" |