summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <micke@codefactory.se>2002-09-23 16:53:54 +0000
committerMikael Hallendal <hallski@src.gnome.org>2002-09-23 16:53:54 +0000
commita22c5185fa712c6aa429c1db26fba012de265296 (patch)
tree10464f6cbcae382a06f17bb69ec8321528f00362
parentf3482e12f87e749b472a871640e1c78e2feacd86 (diff)
downloadyelp-a22c5185fa712c6aa429c1db26fba012de265296.tar.gz
Don't include libgnome and gnome-vfs stuff.
2002-09-23 Mikael Hallendal <micke@codefactory.se> * src/yelp-db2html.c: Don't include libgnome and gnome-vfs stuff. * configure.in: Added DB2HTML_* variables. * src/Makefile.am (test_uri_LDADD): use special LIBS for yelp-db2html.
-rw-r--r--ChangeLog9
-rw-r--r--configure.in3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/yelp-db2html.c2
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f7ed33a3..2c928ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-23 Mikael Hallendal <micke@codefactory.se>
+
+ * src/yelp-db2html.c: Don't include libgnome and gnome-vfs stuff.
+
+ * configure.in: Added DB2HTML_* variables.
+
+ * src/Makefile.am (test_uri_LDADD): use special LIBS for
+ yelp-db2html.
+
2002-09-23 Sander Vesik <sander.vesik@sun.com>
* stylesheets/yelp-customization.xsl:
diff --git a/configure.in b/configure.in
index 9896d677..fb07ad90 100644
--- a/configure.in
+++ b/configure.in
@@ -58,6 +58,9 @@ else
fi
AC_DEFINE_UNQUOTED(GNOMELOCALEDIR, "$GNOMELOCALEDIR")
+PKG_CHECK_MODULES(DB2HTML, glib-2.0 >= 2.0.6 \
+ libxslt >= 1.0.15)
+
PKG_CHECK_MODULES(YELP, gnome-vfs-2.0 >= 1.1 \
libgnome-2.0 >= 2.0.2 \
libgnomeui-2.0 >= 1.103.0 \
diff --git a/src/Makefile.am b/src/Makefile.am
index d086a273..fe14ec2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,7 +71,7 @@ yelp_pregenerate_SOURCES = \
yelp-pregenerate.c yelp-pregenerate.h
yelp_db2html_LDADD = \
- @YELP_LIBS@
+ @DB2HTML_LIBS@
yelp_pregenerate_LDADD = \
@YELP_LIBS@
diff --git a/src/yelp-db2html.c b/src/yelp-db2html.c
index 3d97713f..cbf891bd 100644
--- a/src/yelp-db2html.c
+++ b/src/yelp-db2html.c
@@ -28,7 +28,6 @@
#include <sys/time.h>
#include <unistd.h>
#include <stdlib.h>
-#include <libgnome/gnome-i18n.h>
#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
#include <libxml/debugXML.h>
@@ -43,7 +42,6 @@
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
-#include <libgnomevfs/gnome-vfs-init.h>
#include "yelp-error.h"