[drgeo/goffice: 76/82] fix make distcheck. ditto. ditto. ucorrect path xmlinclude.h fix typo.

[Jean Bréfort <jbrefort src gnome org>]

commit 9672500d2aae73de866fd603802ec7b588172f41
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Mar 14 11:56:30 2006 +0000

    fix make distcheck. ditto. ditto. ucorrect path xmlinclude.h fix typo.
    
    2006-03-14  Jean Brefort  <jean brefort normalesup org>
    
    	* Makefile.am: fix make distcheck.
    	* configure.ac: ditto.
    	* geo/Makefile.am: ditto.
    	* geo/drgeo_view.h: ucorrect path xmlinclude.h
    	* goffice/Makefile.am: fix typo.

 ChangeLog           |    8 ++++++++
 Makefile.am         |   12 ++++++++++--
 configure.ac        |    8 ++++++++
 geo/Makefile.am     |    1 +
 geo/drgeo_view.h    |    2 +-
 goffice/Makefile.am |    2 +-
 6 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b9976ba..bd39fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,14 @@
 
 	* configure.ac: Added "vi" to ALL_LINGUAS.
 
+2006-03-14  Jean Brefort  <jean brefort normalesup org>
+
+	* Makefile.am: fix make distcheck.
+	* configure.ac: ditto.
+	* geo/Makefile.am: ditto.
+	* geo/drgeo_view.h: ucorrect path xmlinclude.h
+	* goffice/Makefile.am: fix typo.
+
 2006-03-07  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/drgeo.cc: make auto_* properties persitent (avoids bad bounds
diff --git a/Makefile.am b/Makefile.am
index 5b9f233..c07d28d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,13 @@ EXTRA_DIST = \
 	drgeo.spec.in $(desktop_in_files) TODO README NEWS AUTHORS COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in $(mime_in_files)
 
-CLEANFILES = *~ core drgeo.xml
+CLEANFILES = *~ core drgeo.xml drgeo.desktop
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	po/stamp-it
 
 desktopdir = $(datadir)/applications
 desktop_in_files = drgeo.desktop.in
@@ -59,7 +65,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 dist-hook:
 	cp drgeo.spec $(distdir)
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-update-databases
+DISTCHECK_CONFIGURE_FLAGS =	\
+	--disable-update-databases	\
+	--with-goffice-plugins-dir=\$${libdir}/goffice
 
 install-data-hook:
 if UPDATE_DATABASES
diff --git a/configure.ac b/configure.ac
index 4fc52f8..a4b1238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,14 @@ if test $go_has_component = yes; then
 	AC_SUBST(GODRGEO_CFLAGS)
 	AC_SUBST(GODRGEO_LIBS)
 	GOFFICE_PLUGINS_DIR=`pkg-config --variable=GOffice_plugins_dir libgoffice-0.3`
+	AC_ARG_WITH(
+		[goffice-plugins-dir],
+		[AC_HELP_STRING(
+			[--with-goffice-plugins-dir],
+			[path to GOffice plugins directory [default=auto]]
+		)],
+		[GOFFICE_PLUGINS_DIR=$withval]
+	)
 	AC_SUBST(GOFFICE_PLUGINS_DIR)
 	echo "yes"
 else
diff --git a/geo/Makefile.am b/geo/Makefile.am
index de12609..0879097 100644
--- a/geo/Makefile.am
+++ b/geo/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = \
 	-DDRGEO_ENCODEDIR=\""$(encodedir)"\"		\
 	-DDRGEO_SCMDIR=\""$(scmdir)"\"			\
 	-I$(includedir) 				\
+	-I$(top_srcdir)					\
 	$(DRGEO_CFLAGS)				
 
 lib_LTLIBRARIES = libgeo.la
diff --git a/geo/drgeo_view.h b/geo/drgeo_view.h
index 7e39a99..d5fe6e1 100644
--- a/geo/drgeo_view.h
+++ b/geo/drgeo_view.h
@@ -25,7 +25,7 @@
 
 
 #include <gtk/gtk.h>
-#include "xmlinclude.h"
+#include "../xmlinclude.h"
 
 
 enum drgeoViewType
diff --git a/goffice/Makefile.am b/goffice/Makefile.am
index d1e1334..b50c6cd 100644
--- a/goffice/Makefile.am
+++ b/goffice/Makefile.am
@@ -40,7 +40,7 @@ INCLUDES = \
 
 drgeo_la_SOURCES =	\
 		drgeo.cc	\
-		drgeo-impl.h	\
+		drgeo_impl.h	\
 		goffice_mdi.cc	\
 		goffice_mdi.h	\
 		drgeo_cairodrawable.cc	\