* It now compiles.

diff --git a/Makefile.am b/Makefile.am
index 713cffb..a2e3558 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,4 +13,4 @@ program_version.c:
        echo '";' >> program_version.c
 
 src_scdataviz_SOURCES = src/graph.c src/matdb.c src/scdataviz.c src/graphwidget.c src/matdb-dotcode.c program_version.c
-LIBS += $(GLIB_LIBS) $(GIO_LIBS) $(GTK_LIBS)
+LIBS += $(GLIB_LIBS) $(GIO_LIBS) $(GTK_LIBS) -lm

diff --git a/configure.ac b/configure.ac
index 39202e5..6a306b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, have_glib=true, have_glib=false)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.18, have_glib=true, have_glib=false)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -15,7 +15,7 @@ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.18, have_gio=true, have_gio=false)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 3.1, have_gtk=true, have_gtk=false)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18, have_gtk=true, have_gtk=false)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 

diff --git a/src/graph.c b/src/graph.c
index 8a48b76..b0dfc40 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -26,12 +26,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **  at http://gnomejournal.org/article/34/writing-a--using-cairo-and-gtk28
 
 ** Started on  Thu Jul 17 10:51:32 2008 Johnny Q. Hacker
-** Last update Thu Oct 15 21:37:21 2009 Johnny Q. Hacker
+** Last update Thu Oct 15 21:51:41 2009 Johnny Q. Hacker
 */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include "config.h"
 #include "graph.h"
 
 #ifdef DEBUG

diff --git a/src/graphwidget.c b/src/graphwidget.c
index beba3c9..978cc3f 100644 (file)
--- a/src/graphwidget.c
+++ b/src/graphwidget.c
@@ -26,11 +26,11 @@
 **  at http://gnomejournal.org/article/34/writing-a-widget-using-cairo-and-gtk28
 
 ** Started on  Thu Jul 17 10:51:32 2008 Johnny Q. Hacker
-** Last update Thu Oct  8 17:13:50 2009 Johnny Q. Hacker
+** Last update Thu Oct 15 21:53:34 2009 Johnny Q. Hacker
 */
 
-#include <graphwidget.h>
 #include <math.h>
+#include "graphwidget.h"
 
 G_DEFINE_TYPE(GraphWidget, graph_widget, GTK_TYPE_DRAWING_AREA);
 

diff --git a/src/graphwidget.h b/src/graphwidget.h
index cb2e390..9f52b7c 100644 (file)
--- a/src/graphwidget.h
+++ b/src/graphwidget.h
@@ -23,14 +23,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ** Started on  Thu Jul 17 10:51:32 2008 Johnny Q. Hacker
-** Last update Thu Oct  8 14:28:34 2009 Johnny Q. Hacker
+** Last update Thu Oct 15 22:16:50 2009 Johnny Q. Hacker
 */
 
 #ifndef        GRAPHWIDGET_H_
 #define GRAPHWIDGET_H_
 
 #include <gtk/gtkdrawingarea.h>
-#include <graph.h>
+#include "graph.h"
 
 typedef struct _GraphWidget {
   GtkDrawingArea parent_instance;

diff --git a/src/matdb-dotcode.c b/src/matdb-dotcode.c
index df195fb..526e539 100644 (file)
--- a/src/matdb-dotcode.c
+++ b/src/matdb-dotcode.c
@@ -20,11 +20,12 @@
 
 */
 
-#include <matdb-dotcode.h>
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <strings.h>
 #include <stdlib.h>
+#include "config.h"
+#include "matdb-dotcode.h"
 
 #ifdef DEBUG
 #undef DEBUG

diff --git a/src/matdb-dotcode.h b/src/matdb-dotcode.h
index ebe4719..4a023db 100644 (file)
--- a/src/matdb-dotcode.h
+++ b/src/matdb-dotcode.h
@@ -23,7 +23,7 @@
 #ifndef MATDB_DOTCODE_H_
 #define MATDB_DOTCODE_H_
 
-#include <matdb.h>
+#include "matdb.h"
 
 struct matdb* read_matdb_dotcode(const GString *name, int *err);
 

diff --git a/src/matdb.c b/src/matdb.c
index 644eb40..3cbc598 100644 (file)
--- a/src/matdb.c
+++ b/src/matdb.c
@@ -20,9 +20,9 @@
 
 */
 
-#include <matdb.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "matdb.h"
 
 static void print_property(gpointer key, gpointer value, gpointer user_data) {
   fprintf(stderr, "\t\t%s=%g:\n", (char*)key, *(double*)value);

diff --git a/src/scdataviz.c b/src/scdataviz.c
index 812cd26..68d6c74 100644 (file)
--- a/src/scdataviz.c
+++ b/src/scdataviz.c
@@ -24,14 +24,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ** Started on  Thu Jul 17 11:03:27 2008 Johnny Q. Hacker
-** Last update Thu Oct  8 19:13:57 2009 Johnny Q. Hacker
+** Last update Thu Oct 15 21:51:34 2009 Johnny Q. Hacker
 */
 
-#include <gtk/gtk.h>
-#include <graphwidget.h>
-#include <matdb-dotcode.h>
 #include <stdlib.h>
 #include <strings.h>
+#include <gtk/gtk.h>
+#include "config.h"
+#include "matdb-dotcode.h"
+#include "graphwidget.h"
 
 #define DEBUG_SHOW_ONLY_BOWED