darlinghq/darling-libxml2
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libxml2.git synced 2025-01-29 14:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new patches from Toshio Kuratomi Daniel

Browse Source 
* libxml.m4 libxml2-spec.in: new patches from Toshio Kuratomi
Daniel
This commit is contained in:
Daniel Veillard 2001-04-26 19:29:02 +00:00
parent 67fee94e53
commit 2913e4cef5
3 changed files with 242 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Apr 26 21:27:43 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* libxml.m4 libxml2-spec.in: new patches from Toshio Kuratomi
Thu Apr 26 20:53:48 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Thu Apr 26 20:53:48 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* tree.[ch]: added xmlSaveFormatFile interface for saving * tree.[ch]: added xmlSaveFormatFile interface for saving

382
libxml.m4
View File

@ -1,22 +1,38 @@
dnl Code shamelessly stolen from glib-config by Sebastian Rittau # Configure paths for LIBXML2
dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # Toshio Kuratomi 2001-04-21
AC_DEFUN(AM_PATH_XML,[ # Adapted from:
# Configure paths for GLIB
# Owen Taylor 97-11-3
dnl AM_PATH_XML([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for XML, and define XML_CFLAGS and XML_LIBS
dnl
AC_DEFUN(AM_PATH_XML,[
AC_ARG_WITH(xml-prefix, AC_ARG_WITH(xml-prefix,
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
xml_config_prefix="$withval", xml_config_prefix="") xml_config_prefix="$withval", xml_config_prefix="")
AC_ARG_WITH(xml-exec-prefix,
[ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
AC_ARG_ENABLE(xmltest, AC_ARG_ENABLE(xmltest,
[ --disable-xmltest Do not try to compile and run a test XML program],, [ --disable-xmltest Do not try to compile and run a test LIBXML program],,
enable_xmltest=yes) enable_xmltest=yes)
if test x$xml_config_exec_prefix != x ; then
xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
if test x${XML_CONFIG+set} != xset ; then
XML_CONFIG=$xml_config_exec_prefix/bin/xml-config
fi
fi
if test x$xml_config_prefix != x ; then if test x$xml_config_prefix != x ; then
xml_config_args="$xml_config_args --prefix=$xml_config_prefix" xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
if test x${XML_CONFIG+set} != xset ; then if test x${XML_CONFIG+set} != xset ; then
XML_CONFIG=$xml_config_prefix/bin/xml-config XML_CONFIG=$xml_config_prefix/bin/xml-config
fi fi
fi fi
AC_PATH_PROG(XML_CONFIG, xml-config, no) AC_PATH_PROG(XML_CONFIG, xml-config, no)
min_xml_version=ifelse([$1], ,2.0.0, [$1]) min_xml_version=ifelse([$1], ,2.0.0,[$1])
AC_MSG_CHECKING(for libxml - version >= $min_xml_version) AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
no_xml="" no_xml=""
if test "$XML_CONFIG" = "no" ; then if test "$XML_CONFIG" = "no" ; then
@ -25,11 +41,11 @@ AC_ARG_ENABLE(xmltest,
XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags` XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags`
XML_LIBS=`$XML_CONFIG $xml_config_args --libs` XML_LIBS=`$XML_CONFIG $xml_config_args --libs`
xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \ xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \ xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \ xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xmltest" = "xyes" ; then if test "x$enable_xmltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
@ -37,15 +53,15 @@ AC_ARG_ENABLE(xmltest,
LIBS="$XML_LIBS $LIBS" LIBS="$XML_LIBS $LIBS"
dnl dnl
dnl Now check if the installed libxml is sufficiently new. dnl Now check if the installed libxml is sufficiently new.
dnl (Also sanity checks the results of xml-config to some extent)
dnl dnl
rm -f conf.xmltest rm -f conf.xmltest
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <xmlversion.h> #include <xmlversion.h>
#include <parser.h>
int int
main() main()
{ {
int xml_major_version, xml_minor_version, xml_micro_version; int xml_major_version, xml_minor_version, xml_micro_version;
@ -54,93 +70,114 @@ main()
system("touch conf.xmltest"); system("touch conf.xmltest");
tmp_version = xmlStrdup("$min_xml_version"); /* Capture xml-config output via autoconf/configure variables */
if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { /* HP/UX 9 (%@#!) writes to sscanf strings */
printf("%s, bad version string\n", "$min_xml_version"); tmp_version = (char *)strdup("$min_xml_version");
exit(1); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
} printf("%s, bad version string from xml-config\n", "$min_xml_version");
exit(1);
}
free(tmp_version);
tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION); /* Capture the version information from the header files */
if(sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
printf("%s, bad version string\n", "$min_xml_version"); if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
exit(1); printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
} exit(1);
}
free(tmp_version);
if((xml_major_version != $xml_config_major_version) || /* Compare xml-config output to the libxml headers */
(xml_minor_version != $xml_config_minor_version) || if ((xml_major_version != $xml_config_major_version) ||
(xml_micro_version != $xml_config_micro_version)) (xml_minor_version != $xml_config_minor_version) ||
(xml_micro_version != $xml_config_micro_version))
{ {
printf("\n*** 'xml-config --version' returned %d.%d.%d, but libxml (%d.%d.%d)\n", printf("*** libxml header files (version %d.%d.%d) do not match\n",
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version, xml_major_version, xml_minor_version, xml_micro_version);
xml_major_version, xml_minor_version, xml_micro_version); printf("*** xml-config (version %d.%d.%d)\n",
printf("*** was found! If xml-config was correct, then it is best\n"); $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
printf("*** to remove the old version of libxml. You may also be able to fix the error\n"); return 1;
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); }
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); /* Compare the headers to the library to make sure we match */
printf("*** required on your system.\n"); /* Less than ideal -- doesn't provide us with return value feedback,
printf("*** If xml-config was wrong, set the environment variable XML_CONFIG\n"); * only exits if there's a serious mismatch between header and library.
printf("*** to point to the correct copy of xml-config, and remove the file config.cache\n"); */
printf("*** before re-running configure\n"); LIBXML_TEST_VERSION;
}
else /* Test that the library is greater than our minimum version */
{ if ((xml_major_version > major) ||
if ((xml_major_version > major) || ((xml_major_version == major) && (xml_minor_version > minor)) ||
((xml_major_version == major) && (xml_minor_version > minor)) || ((xml_major_version == major) && (xml_minor_version == minor) &&
((xml_major_version == major) && (xml_minor_version == minor) && (xml_micro_version >= micro)))
(xml_micro_version >= micro))) {
{ return 0;
return 0; }
} else
else {
{ printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", xml_major_version, xml_minor_version, xml_micro_version);
xml_major_version, xml_minor_version, xml_micro_version); printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", major, minor, micro);
major, minor, micro); printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
printf("*** libxml is always available from ftp://ftp.gnome.org.\n"); printf("***\n");
printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** probably means that the wrong copy of the xml-config shell script is\n");
printf("*** probably means that the wrong copy of the xml-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** of LIBXML, but you can also set the XML_CONFIG environment to point to the\n");
printf("*** of libxml, but you can also set the XML_CONFIG environment to point to the\n"); printf("*** correct copy of xml-config. (In this case, you will have to\n");
printf("*** correct copy of xml-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
} }
return 1; return 1;
} }
],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS"
LIBS="$ac_save_LIBS" fi
fi
fi fi
if test "x$no_xml" = x ; then if test "x$no_xml" = x ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test "$XML_CONFIG" = "no" ; then if test "$XML_CONFIG" = "no" ; then
echo "*** The xml-config script installed by libxml could not be found" echo "*** The xml-config script installed by LIBXML could not be found"
echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the XML_CONFIG environment variable to the" echo "*** your path, or set the XML_CONFIG environment variable to the"
echo "*** full path to xml-config." echo "*** full path to xml-config."
else else
if test -f conf.xmltest ; then if test -f conf.xmltest ; then
: :
else else
echo "*** Could not run libxml test program, checking why..." echo "*** Could not run libxml test program, checking why..."
CFLAGS="$CFLAGS $XML_CFLAGS" CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$LIBS $XML_LIBS" LIBS="$LIBS $XML_LIBS"
dnl FIXME: AC_TRY_LINK AC_TRY_LINK([
fi #include <xmlversion.h>
fi #include <stdio.h>
], [ LIBXML_TEST_VERSION; return 0;],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml-config script: $XML_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
XML_CFLAGS="" XML_CFLAGS=""
XML_LIBS="" XML_LIBS=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(XML_CFLAGS) AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS) AC_SUBST(XML_LIBS)
@ -153,147 +190,155 @@ main()
# Configure paths for GLIB # Configure paths for GLIB
# Owen Taylor 97-11-3 # Owen Taylor 97-11-3
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for LIBXML, and define LIBXML_CFLAGS and LIBXML_LIBS dnl Test for XML, and define XML_CFLAGS and XML_LIBS
dnl dnl
AC_DEFUN(AM_PATH_XML2, AC_DEFUN(AM_PATH_XML2,[
[dnl AC_ARG_WITH(xml-prefix,
dnl Get the cflags and libraries from the xml2-config script [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
dnl xml_config_prefix="$withval", xml_config_prefix="")
AC_ARG_WITH(libxml-prefix,[ --with-libxml-prefix=PFX Prefix where LIBXML is installed (optional)], AC_ARG_WITH(xml-exec-prefix,
libxml_config_prefix="$withval", libxml_config_prefix="") [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
AC_ARG_WITH(libxml-exec-prefix,[ --with-libxml-exec-prefix=PFX Exec prefix where LIBXML is installed (optional)], xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
libxml_config_exec_prefix="$withval", libxml_config_exec_prefix="") AC_ARG_ENABLE(xmltest,
AC_ARG_ENABLE(libxmltest, [ --disable-libxmltest Do not try to compile and run a test LIBXML program], [ --disable-xmltest Do not try to compile and run a test LIBXML program],,
, enable_libxmltest=yes) enable_xmltest=yes)
if test x$libxml_config_exec_prefix != x ; then if test x$xml_config_exec_prefix != x ; then
libxml_config_args="$libxml_config_args --exec-prefix=$libxml_config_exec_prefix" xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
if test x${LIBXML_CONFIG2+set} != xset ; then if test x${XML2_CONFIG+set} != xset ; then
LIBXML_CONFIG2=$libxml_config_exec_prefix/bin/xml2-config XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config
fi fi
fi fi
if test x$libxml_config_prefix != x ; then if test x$xml_config_prefix != x ; then
libxml_config_args="$libxml_config_args --prefix=$libxml_config_prefix" xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
if test x${LIBXML_CONFIG2+set} != xset ; then if test x${XML2_CONFIG+set} != xset ; then
LIBXML_CONFIG2=$libxml_config_prefix/bin/xml2-config XML2_CONFIG=$xml_config_prefix/bin/xml2-config
fi fi
fi fi
AC_PATH_PROG(LIBXML_CONFIG2, xml2-config, no) AC_PATH_PROG(XML2_CONFIG, xml2-config, no)
min_libxml_version=ifelse([$1], ,2.0.0,$1) min_xml_version=ifelse([$1], ,2.0.0,[$1])
AC_MSG_CHECKING(for LIBXML - version >= $min_libxml_version) AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
no_libxml="" no_xml=""
if test "$LIBXML_CONFIG2" = "no" ; then if test "$XML2_CONFIG" = "no" ; then
no_libxml=yes no_xml=yes
else else
LIBXML_CFLAGS=`$LIBXML_CONFIG2 $libxml_config_args --cflags` XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
LIBXML_LIBS=`$LIBXML_CONFIG2 $libxml_config_args --libs` XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
libxml_config_major_version=`$LIBXML_CONFIG2 $libxml_config_args --version | \ xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
libxml_config_minor_version=`$LIBXML_CONFIG2 $libxml_config_args --version | \ xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
libxml_config_micro_version=`$LIBXML_CONFIG2 $libxml_config_args --version | \ xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xmltest" = "xyes" ; then
if test "x$enable_libxmltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $LIBXML_CFLAGS" CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$LIBXML_LIBS $LIBS" LIBS="$XML_LIBS $LIBS"
dnl dnl
dnl Now check if the installed LIBXML is sufficiently new. (Also sanity dnl Now check if the installed libxml is sufficiently new.
dnl checks the results of xml2-config to some extent dnl (Also sanity checks the results of xml2-config to some extent)
dnl dnl
rm -f conf.libxmltest rm -f conf.xmltest
AC_TRY_RUN([ AC_TRY_RUN([
#include <xmlversion.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <xmlversion.h>
int int
main () main()
{ {
int xml_major_version, xml_minor_version, xml_micro_version;
int major, minor, micro; int major, minor, micro;
int libxml_major_version, libxml_minor_version, libxml_micro_version;
char *tmp_version; char *tmp_version;
system ("touch conf.libxmltest"); system("touch conf.xmltest");
/* Capture xml2-config output via autoconf/configure variables */ /* Capture xml2-config output via autoconf/configure variables */
/* HP/UX 9 (%@#!) writes to sscanf strings */ /* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = (char *)strdup("$min_libxml_version"); tmp_version = (char *)strdup("$min_xml_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_libxml_version"); printf("%s, bad version string from xml2-config\n", "$min_xml_version");
exit(1); exit(1);
} }
free(tmp_version); free(tmp_version);
/* Capture the version information from the header files */ /* Capture the version information from the header files */
sscanf(LIBXML_DOTTED_VERSION, "%d.%d.%d", &libxml_major_version, &libxml_minor_version, &libxml_micro_version); tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
exit(1);
}
free(tmp_version);
/* Compare xml2-config output to the libxml headers */ /* Compare xml2-config output to the libxml headers */
if ((libxml_major_version != $libxml_config_major_version) || if ((xml_major_version != $xml_config_major_version) ||
(libxml_minor_version != $libxml_config_minor_version) || (xml_minor_version != $xml_config_minor_version) ||
(libxml_micro_version != $libxml_config_micro_version)) (xml_micro_version != $xml_config_micro_version))
{ {
printf("*** LIBXML header files (version %d.%d.%d) do not match\n", printf("*** libxml header files (version %d.%d.%d) do not match\n",
libxml_major_version, libxml_minor_version, libxml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** xml2-config (version %d.%d.%d)\n", printf("*** xml2-config (version %d.%d.%d)\n",
$libxml_config_major_version, $libxml_config_minor_version, $libxml_config_micro_version); $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
return 1; return 1;
} }
/* Compare the headers to the library to make sure we match */ /* Compare the headers to the library to make sure we match */
/* Less than ideal -- doesn't provide us with return value feedback, /* Less than ideal -- doesn't provide us with return value feedback,
* only exits if there's a serious mismatch between header and library. * only exits if there's a serious mismatch between header and library.
*/ */
LIBXML_TEST_VERSION; LIBXML_TEST_VERSION;
if ((libxml_major_version > major) ||
((libxml_major_version == major) && (libxml_minor_version > minor)) || /* Test that the library is greater than our minimum version */
((libxml_major_version == major) && (libxml_minor_version == minor) && (libxml_micro_version >= micro))) if ((xml_major_version > major) ||
((xml_major_version == major) && (xml_minor_version > minor)) ||
((xml_major_version == major) && (xml_minor_version == minor) &&
(xml_micro_version >= micro)))
{ {
return 0; return 0;
} }
else else
{ {
printf("\n*** An old version of LIBXML (%d.%d.%d) was found.\n", printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
libxml_major_version, libxml_minor_version, libxml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** You need a version of LIBXML newer than %d.%d.%d. The latest version of\n", printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
major, minor, micro); major, minor, micro);
printf("*** LIBXML is always available from ftp://ftp.xmlsoft.org.\n"); printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
printf("***\n"); printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the xml2-config shell script is\n"); printf("*** probably means that the wrong copy of the xml2-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of LIBXML, but you can also set the LIBXML_CONFIG2 environment to point to the\n"); printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
printf("*** correct copy of xml2-config. (In this case, you will have to\n"); printf("*** correct copy of xml2-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n"); printf("*** so that the correct libraries are found at run-time))\n");
} }
return 1; return 1;
} }
],, no_libxml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
if test "x$no_libxml" = x ; then
AC_MSG_RESULT(yes (version $libxml_config_major_version.$libxml_config_minor_version.$libxml_config_micro_version)) if test "x$no_xml" = x ; then
AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test "$LIBXML_CONFIG2" = "no" ; then if test "$XML2_CONFIG" = "no" ; then
echo "*** The xml2-config script installed by LIBXML could not be found" echo "*** The xml2-config script installed by LIBXML could not be found"
echo "*** If LIBXML was installed in PREFIX, make sure PREFIX/bin is in" echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the LIBXML_CONFIG2 environment variable to the" echo "*** your path, or set the XML2_CONFIG environment variable to the"
echo "*** full path to xml2-config." echo "*** full path to xml2-config."
else else
if test -f conf.libxmltest ; then if test -f conf.xmltest ; then
: :
else else
echo "*** Could not run LIBXML test program, checking why..." echo "*** Could not run libxml test program, checking why..."
CFLAGS="$CFLAGS $LIBXML_CFLAGS" CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$LIBS $LIBXML_LIBS" LIBS="$LIBS $XML_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <xmlversion.h> #include <xmlversion.h>
#include <stdio.h> #include <stdio.h>
@ -304,22 +349,23 @@ main ()
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that" echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the" [ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed" echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml2-config script: $LIBXML_CONFIG2" ]) echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
LIBXML_CFLAGS=""
LIBXML_LIBS="" XML_CFLAGS=""
XML_LIBS=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(LIBXML_CFLAGS) AC_SUBST(XML_CFLAGS)
AC_SUBST(LIBXML_LIBS) AC_SUBST(XML_LIBS)
rm -f conf.libxmltest rm -f conf.xmltest
]) ])

36
libxml.spec.in
View File

@ -1,6 +1,7 @@
# Note that this is NOT a relocatable package # Note that this is NOT a relocatable package
%define ver @VERSION@ %define ver @VERSION@
%define prefix /usr %define prefix /usr
%define datadir %{prefix}/share
Summary: Library providing XML and HTML support Summary: Library providing XML and HTML support
Name: libxml2 Name: libxml2
@ -12,7 +13,7 @@ Source: ftp://xmlsoft.org/libxml2-%{ver}.tar.gz
BuildRoot: /var/tmp/libxml2-%{PACKAGE_VERSION}-root BuildRoot: /var/tmp/libxml2-%{PACKAGE_VERSION}-root
URL: http://xmlsoft.org/ URL: http://xmlsoft.org/
Docdir: %{prefix}/doc Docdir: %{datadir}/doc
%description %description
This library allows to manipulate XML files. It includes support This library allows to manipulate XML files. It includes support
@ -45,6 +46,13 @@ URI library.
%changelog %changelog
* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
[2.3.7]
- Added libxml.m4 to the distribution file list
- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
- Moved programmer documentation into the devel package
* Thu Sep 23 1999 Daniel Veillard <Daniel.Veillard@w3.org> * Thu Sep 23 1999 Daniel Veillard <Daniel.Veillard@w3.org>
- corrected the spec file alpha stuff - corrected the spec file alpha stuff
@ -72,15 +80,15 @@ URI library.
# Needed for snapshot releases. # Needed for snapshot releases.
if [ ! -f configure ]; then if [ ! -f configure ]; then
%ifarch alpha %ifarch alpha
CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
%else %else
CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
%endif %endif
else else
%ifarch alpha %ifarch alpha
CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
%else %else
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
%endif %endif
fi fi
@ -94,9 +102,9 @@ fi
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/man/man1 install -d $RPM_BUILD_ROOT%{datadir}/man/man1
install -d $RPM_BUILD_ROOT/usr/man/man4 install -d $RPM_BUILD_ROOT%{datadir}/man/man4
make prefix=$RPM_BUILD_ROOT%{prefix} install make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{datadir}/man install
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -109,10 +117,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
%doc /usr/man/man1/xmllint.1* %doc /usr/share/man/man1/xmllint.1*
%doc /usr/man/man1/xml2-config.1* %doc /usr/share/man/man4/libxml.4*
%doc /usr/man/man4/libxml.4*
%doc doc/*.html doc/html
%{prefix}/lib/lib*.so.* %{prefix}/lib/lib*.so.*
%{prefix}/bin/xmllint %{prefix}/bin/xmllint
@ -120,8 +126,14 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%doc /usr/share/man/man1/xml2-config.1*
%doc doc/*.html doc/html
%{prefix}/lib/lib*.so %{prefix}/lib/lib*.so
%{prefix}/lib/*a %{prefix}/lib/*a
%{prefix}/lib/*.sh %{prefix}/lib/*.sh
%{prefix}/include/* %{prefix}/include/*
%{prefix}/bin/xml2-config %{prefix}/bin/xml2-config
%{prefix}/share/aclocal/libxml.m4
# I'm not certain if this should be included in the distribution or not.
#%{prefix}/lib/pkgconfig/libxml-2.0.pc