summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Boulton <richard@src.gnome.org>2001-02-20 18:43:32 +0000
committerRichard Boulton <richard@src.gnome.org>2001-02-20 18:43:32 +0000
commit71dc5aecd6b52243f43a4356299f7e6de4db4b2a (patch)
treec01587521236915181cdf3a2adca0d436bce4ed0
parent48bb6a227da8f2ffbf7e0597a90985f2de323a5f (diff)
downloadnautilus-71dc5aecd6b52243f43a4356299f7e6de4db4b2a.tar.gz
reviewed by: Ali Abdin <aliabdin@aucegypt.edu>
components/help/converters/gnome-db2html2/* Fix to bug 6700; doesn't include config.h unless HAVE_CONFIG_H is defined, and has correct instructions for compiling standalone.
-rw-r--r--ChangeLog8
-rw-r--r--components/help/converters/gnome-db2html2/README2
-rw-r--r--components/help/converters/gnome-db2html2/gdb3html.c2
-rw-r--r--components/help/converters/gnome-db2html2/sect-elements.c4
-rw-r--r--components/help/converters/gnome-db2html2/sect-preparse.c3
-rw-r--r--components/help/converters/gnome-db2html2/toc-elements.c3
6 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c57a2874..935cd7c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-20 Richard Boulton <richard@tartarus.org>
+
+ reviewed by: Ali Abdin <aliabdin@aucegypt.edu>
+
+ * components/help/converters/gnome-db2html2/*
+ Fix to bug 6700; doesn't include config.h unless HAVE_CONFIG_H
+ is defined, and has correct instructions for compiling standalone.
+
2001-02-20 Kjartan Maraas <kmaraas@gnome.org>
* components/services/summary/nautilus-summary-view.c: Fix some
diff --git a/components/help/converters/gnome-db2html2/README b/components/help/converters/gnome-db2html2/README
index fb873a0c3..e2371ef80 100644
--- a/components/help/converters/gnome-db2html2/README
+++ b/components/help/converters/gnome-db2html2/README
@@ -7,7 +7,7 @@ For those doc people who want to play with this, and don't want
to configure nautilus, you can compile it with the following
command line:
-gcc -o gnome-db2html2 `xml-config --cflags --libs` `gnome-config --cflags --libs glib` -Wall -g gdb3html.c toc-elements.c sect-elements.c sect-preparse.c
+gcc -o gnome-db2html2 `xml-config --cflags --libs` `gnome-config --cflags --libs gnome` -Wall -g gdb3html.c toc-elements.c sect-elements.c sect-preparse.c
You can run it by doing:
diff --git a/components/help/converters/gnome-db2html2/gdb3html.c b/components/help/converters/gnome-db2html2/gdb3html.c
index adcd96f5d..d1d2603d9 100644
--- a/components/help/converters/gnome-db2html2/gdb3html.c
+++ b/components/help/converters/gnome-db2html2/gdb3html.c
@@ -1,6 +1,8 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "gdb3html.h"
#include "toc-elements.h"
diff --git a/components/help/converters/gnome-db2html2/sect-elements.c b/components/help/converters/gnome-db2html2/sect-elements.c
index 4f4f5a409..81164bd9b 100644
--- a/components/help/converters/gnome-db2html2/sect-elements.c
+++ b/components/help/converters/gnome-db2html2/sect-elements.c
@@ -1,4 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "sect-elements.h"
#include "gnome.h"
diff --git a/components/help/converters/gnome-db2html2/sect-preparse.c b/components/help/converters/gnome-db2html2/sect-preparse.c
index 657a05a9b..cb3de2ce8 100644
--- a/components/help/converters/gnome-db2html2/sect-preparse.c
+++ b/components/help/converters/gnome-db2html2/sect-preparse.c
@@ -1,5 +1,8 @@
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "sect-elements.h"
#include "gnome.h"
diff --git a/components/help/converters/gnome-db2html2/toc-elements.c b/components/help/converters/gnome-db2html2/toc-elements.c
index 8aaa07293..4f52788c2 100644
--- a/components/help/converters/gnome-db2html2/toc-elements.c
+++ b/components/help/converters/gnome-db2html2/toc-elements.c
@@ -1,5 +1,8 @@
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <gnome.h>
#include "sect-elements.h"
#include "toc-elements.h"