MINIDOM_MAJOR_VERSION=0
MINIDOM_MINOR_VERSION=1
-MINIDOM_MICRO_VERSION=0
+MINIDOM_MICRO_VERSION=4
MINIDOM_VERSION=$MINIDOM_MAJOR_VERSION.$MINIDOM_MINOR_VERSION.$MINIDOM_MICRO_VERSION
MINIDOM_VERSION_INFO=`expr $MINIDOM_MAJOR_VERSION + $MINIDOM_MINOR_VERSION`:$MINIDOM_MICRO_VERSION:$MINIDOM_MINOR_VERSION
libxml2,
[ --with-libxml2[=ARG] compile with libxml 2.x library [default=auto]],
libxml2=$withval,
- libxml2=auto
+ libxml2="auto"
)
AM_INIT_AUTOMAKE(minidom, $MINIDOM_VERSION)
dnl Checks for programs.
AC_PROG_CC
+AC_LANG_C
AC_PROG_RANLIB
dnl Checks for libraries.
`glib-config --libs`
)
-AC_CHECK_LIB(xml, xmlParseDocument,
- [
- CFLAGS="$CFLAGS `xml-config --cflags`"
- CXXFLAGS="$CXXFLAGS `xml-config --cflags`"
- LIBS="$LIBS `xml-config --libs`"
- ],
- ,
- `xml-config --libs`
-)
+AC_CHECK_PROG(XML_CONFIG, xml2-config, xml2-config, no)
+if test $XML_CONFIG = "no"; then
+ AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config, no)
+fi
+AC_SUBST(XML_CONFIG)
+
+if test $XML_CONFIG = "no"; then
+ AC_MSG_ERROR(could not find configuration script for libxml)
+fi
+
+if test $XML_CONFIG = "xml2-config" -a $libxml2 = "auto"; then
+ libxml2="yes"
+fi
+
+CFLAGS="$CFLAGS `$XML_CONFIG --cflags`"
+CXXFLAGS="$CXXFLAGS `$XML_CONFIG --cflags`"
+LIBS="$LIBS `$XML_CONFIG --libs`"
dnl if the user gave no explicit libxml2 option, try to guess its value
if test $libxml2 = "auto"; then
dnl Checks for header files.
-AC_OUTPUT(Makefile)
+AC_OUTPUT([
+ Makefile
+ minidom.spec
+])