diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rwxr-xr-x | autogen.sh | 6 | ||||
-rw-r--r-- | src/yelp-db2html.c | 5 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2004-01-27 Frederic Crozat <fcrozat@mandrakesoft.com> + + * autogen.sh: + Handle GNOME2_PATH variable. + + * src/yelp-db2html.c: (main): + Don't try to parse html file (Mdk bug #4743). + 2003-11-10 Shaun McCance <shaunm@gnome.org> * configure.in: Version 2.4.2 @@ -36,6 +36,12 @@ ACLOCAL=aclocal-1.4 DIE=1 } +# if GNOME2_DIR set, modify ACLOCAL_FLAGS ... +if [ -n "$GNOME2_DIR" ]; then + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" +fi + + (grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && { (libtool --version) < /dev/null > /dev/null 2>&1 || { echo diff --git a/src/yelp-db2html.c b/src/yelp-db2html.c index 1441f2c5..0276b56b 100644 --- a/src/yelp-db2html.c +++ b/src/yelp-db2html.c @@ -99,11 +99,14 @@ main (gint argc, gchar **argv) if (strstr (docpath, ".sgml")) { db_doc = docbParseFile (docpath, "UTF-8"); - } else { + } else if (strstr (docpath, ".xml")) { db_doc = xmlParseFile (docpath); #ifdef LIBXML_XINCLUDE_ENABLED xmlXIncludeProcess (db_doc); #endif + } else { + g_warning ("Unknown Docbook format for '%s'.", docpath); + exit (1); } if (db_doc == NULL) { |