fix base

Signed-off-by: Michael Rasmussen <mir@datanom.net>

diff --git a/configure.ac b/configure.ac
index 57aa161192ece2112c9a62723ff002454736fb1e..fcd45a5a627950b1c6a84e371f0ed23a583b8750 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ SQLITE3_REQUIRED=3.40
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GOBJECT_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
+AC_SUBST(SQLITE3_REQUIRED)
 
 # Checks for programs.
 AC_PROG_CC
@@ -51,10 +52,14 @@ PKG_CHECK_MODULES([GLIB],
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES([GTK], gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQUIRED])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE3_REQUIRED])
+AC_SUBST(SQLITE3_LIBS)
+AC_SUBST(SQLITE3_CFLAGS)
+
 # Checks for header files.
 AC_CHECK_HEADER([assert.h],
                AC_DEFINE([HAVE_ASSERT_H], [1], [Define to 1 if you have the <assert.h> header file.]))

diff --git a/src/Makefile.am b/src/Makefile.am
index cfb98dea2f77f19d853b8d50036a48996a0abfdc..07696d352efed04c86bb8e66b93923c83beddb87 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,16 +4,20 @@ AM_CPPFLAGS = \
            -I${top_srcdir} \
            -I${top_builddir} \
            @GLIB_CFLAGS@ \
-           @GTK_CFLAGS@
+           @GTK_CFLAGS@ \
+           @SQLITE3_CFLAGS@
 
 bin_PROGRAMS = lensdb 
 
 lensdb_SOURCES = \
-               main.c
+               main.c \
+               sqlite-storage.h \
+               sqlite-storage.c
 
 lensdb_LDADD = \
                @GLIB_LIBS@ \
-               @GTK_LIBS@
+               @GTK_LIBS@ \
+               @SQLITE3_LIBS@
 
 lensdb_LDFLAGS =
 

diff --git a/src/main.c b/src/main.c
index cd9671f531ae327c6b033af8b1d6fbf4105032db..53a291b2c1337bf979872babab7677dca64dc173 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,10 @@
+#ifdef HAVE_CONFIG_H
+#       include <config.h>
+#endif
+#include <glib.h>
+#include <glib-object.h>
+#include "sqlite-storage.h"
 
-int main(int argc, char** argv) {
+gint main(gint argc, gchar** argv) {
        return 0;
 }

diff --git a/src/sqlite-storage.c b/src/sqlite-storage.c
new file mode 100644 (file)
index 0000000..0154528
--- /dev/null
+++ b/src/sqlite-storage.c
@@ -0,0 +1,2 @@
+#include "sqlite-storage.h"
+

diff --git a/src/sqlite-storage.h b/src/sqlite-storage.h
new file mode 100644 (file)
index 0000000..f81e7dc
--- /dev/null
+++ b/src/sqlite-storage.h
@@ -0,0 +1,18 @@
+
+#ifndef __SQLITE_STORAGE_H__
+#define __SQLITE_STORAGE_H__
+
+#ifdef HAVE_CONFIG_H
+#       include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib-object.h>
+#include <sqlite3.h>
+
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#endif
+