From 9b4a024ae837d723b8d68a56646c4f72390c6ef2 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@src.gnome.org>
Date: Sun, 26 Mar 2000 23:15:34 +0000
Subject: [PATCH] Revert, revert, try another thing

---
 configure.in                       | 4 ++--
 src/Makefile.am                    | 4 ++--
 src/corba-sheet.c                  | 2 +-
 src/corba-workbook-factory.c       | 2 +-
 src/corba-workbook.c               | 2 +-
 src/embeddable-grid.c              | 2 +-
 src/sheet-vector.c                 | 2 +-
 src/sheet-vector.h                 | 2 +-
 wizards/graphics/Makefile.am       | 4 ++--
 wizards/graphics/graphic-context.h | 2 +-
 wizards/graphics/graphic-type.c    | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.in b/configure.in
index c56732c32..d3e8a8fff 100644
--- a/configure.in
+++ b/configure.in
@@ -248,10 +248,10 @@ AC_MSG_CHECKING(for GnomePrint libraries >= 0.13)
 if gnome-config --libs print > /dev/null 2>&1; then 
     vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" | \
         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-    if test "$vers" -ge 13; then
+    if test "$vers" -ge 14; then
         AC_MSG_RESULT(found)
     else
-        AC_MSG_ERROR(You need at least GNOME print 0.13 for this version of Gnumeric)
+        AC_MSG_ERROR(You need at least GNOME print 0.14 for this version of Gnumeric)
     fi
 else
     AC_MSG_ERROR(Did not find GnomePrint installed)
diff --git a/src/Makefile.am b/src/Makefile.am
index e9e1afee9..2927e02bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,8 +30,8 @@ INCLUDES = 						\
 	-DGNUMERIC_VERSION=\""$(VERSION)"\"		\
         -DGNUMERIC_GLADEDIR=\""$(gladedir)"\"           \
 	-I$(includedir)				 	\
-	-I$(top_srcdir)/idl				\
-	-I$(srcdir)/idl					\
+	-I$(top_srcdir)/				\
+	-I$(srcdir)/					\
 	-I$(srcdir)/widgets				\
 	-I$(srcdir)/functions				\
 	-I$(srcdir)/dialogs				\
diff --git a/src/corba-sheet.c b/src/corba-sheet.c
index 63fb18faa..7868c9901 100644
--- a/src/corba-sheet.c
+++ b/src/corba-sheet.c
@@ -15,7 +15,7 @@
 #include "sheet.h"
 #include "selection.h"
 #include "gnumeric.h"
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 #include "corba.h"
 #include "utils.h"
 #include "ranges.h"
diff --git a/src/corba-workbook-factory.c b/src/corba-workbook-factory.c
index 02aad6bb1..e879c7a59 100644
--- a/src/corba-workbook-factory.c
+++ b/src/corba-workbook-factory.c
@@ -12,7 +12,7 @@
 #include "sheet.h"
 #include "gnumeric.h"
 #include "workbook.h"
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 #include "corba.h"
 #include "command-context-corba.h"
 
diff --git a/src/corba-workbook.c b/src/corba-workbook.c
index d36f61cdc..bd1e5ef59 100644
--- a/src/corba-workbook.c
+++ b/src/corba-workbook.c
@@ -11,7 +11,7 @@
 #include "sheet.h"
 #include "gnumeric.h"
 #include "workbook.h"
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 #include "xml-io.h"
 #include "corba.h"
 #include "commands.h"
diff --git a/src/embeddable-grid.c b/src/embeddable-grid.c
index 1980b8d6d..3d7a8a46d 100644
--- a/src/embeddable-grid.c
+++ b/src/embeddable-grid.c
@@ -13,7 +13,7 @@
 #include <config.h>
 #include <bonobo/bonobo-embeddable.h>
 #include <bonobo/bonobo-embeddable-factory.h>
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 #include "sheet.h"
 #include "workbook.h"
 #include "embeddable-grid.h"
diff --git a/src/sheet-vector.c b/src/sheet-vector.c
index e2716dc43..5d34be494 100644
--- a/src/sheet-vector.c
+++ b/src/sheet-vector.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include <bonobo/bonobo-object.h>
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 #include "gnumeric.h"
 #include "sheet-vector.h"
 #include "sheet.h"
diff --git a/src/sheet-vector.h b/src/sheet-vector.h
index 01dd11b1f..d17334878 100644
--- a/src/sheet-vector.h
+++ b/src/sheet-vector.h
@@ -3,7 +3,7 @@
 
 #include <libgnome/gnome-defs.h>
 #include <bonobo/bonobo-object.h>
-#include "Gnumeric.h"
+#include "idl/Gnumeric.h"
 
 BEGIN_GNOME_DECLS
 
diff --git a/wizards/graphics/Makefile.am b/wizards/graphics/Makefile.am
index 2092c92d1..d5ef26791 100644
--- a/wizards/graphics/Makefile.am
+++ b/wizards/graphics/Makefile.am
@@ -35,8 +35,8 @@ INCLUDES = 						\
         -DGNUMERIC_ICONSDIR=\""$(iconsdir)"\"           \
 	-I$(includedir)				 	\
 	-I$(top_srcdir)/src				\
-	-I$(srcdir)/idl					\
-	-I$(top_srcdir)/idl				\
+	-I$(srcdir)/					\
+	-I$(top_srcdir)/				\
 	$(GNOME_INCLUDEDIR)
 
 EXTRA_DIST = $(glade_DATA) $(glade_msgs)
diff --git a/wizards/graphics/graphic-context.h b/wizards/graphics/graphic-context.h
index 87e728e38..5025b71e9 100644
--- a/wizards/graphics/graphic-context.h
+++ b/wizards/graphics/graphic-context.h
@@ -4,7 +4,7 @@
 #include "str.h"
 #include "expr.h"
 #include "sheet-vector.h"
-#include "Graph.h"
+#include "idl/Graph.h"
 
 typedef enum {
 	SERIES_COLUMNS,
diff --git a/wizards/graphics/graphic-type.c b/wizards/graphics/graphic-type.c
index e34dd00c3..29f3976fe 100644
--- a/wizards/graphics/graphic-type.c
+++ b/wizards/graphics/graphic-type.c
@@ -10,7 +10,7 @@
 #include <gnome.h>
 #include "gnumeric.h"
 #include <glade/glade.h>
-#include "Graph.h"
+#include "idl/Graph.h"
 #include "wizard.h"
 #include "graphic-type.h"
 
-- 
2.11.4.GIT