Changes to autotools.

diff --git a/.gitignore b/.gitignore
index cae9cb8bd52faa3b43a3ff772948f650c754d745..d228bcc3568401eb6fbc5fd6154f9d5971f9c6f7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ config.h
 *.log
 *.status
 *.sub
+*bak
 configure
 depcomp
 docs/reference/version.xml

diff --git a/Makefile.am b/Makefile.am
index ccbe1977751a48b1147ffd3b403f7c1d4e8627bf..a04d10b0dcc7ce294ef65e63245a817edebd3376 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src docs tests
 
 EXTRA_DIST = \
         libaudit.pc.in

diff --git a/configure.ac b/configure.ac
index 681641eb0fd48f9aa346eaae711d4d691bbe2af6..2fcc9a24a4a3ffa4eaa82aef9f1455576a2609f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,9 @@ AC_CONFIG_FILES([
   libaudit.pc
   Makefile
   src/Makefile
+  docs/Makefile
+  docs/sql/Makefile
+  tests/Makefile
 ])
 
 AC_OUTPUT

diff --git a/doc/sql/audit.sql b/doc/sql/audit.sql
deleted file mode 100644 (file)
index db5c2d1..0000000
--- a/doc/sql/audit.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-CREATE TABLE datasources (
-       id integer NOT NULL,
-       name character(30) DEFAULT '',
-       cnc_string character(255) DEFAULT '',
-       status character(1) DEFAULT '',
-       CONSTRAINT datasources_pkey PRIMARY KEY (id)
-);
-
-CREATE TABLE tables (
-       id integer NOT NULL,
-       name character(30) DEFAULT '',
-       status character(1) DEFAULT '',
-       id_datasources integer NOT NULL,
-       CONSTRAINT tables_pkey PRIMARY KEY (id)
-);
-
-CREATE TABLE fields (
-       id integer NOT NULL,
-       id_tables integer NOT NULL,
-       name character(30) DEFAULT '',
-       status character(1) DEFAULT '',
-       CONSTRAINT campi_pkey PRIMARY KEY (id)
-);
-
-CREATE TABLE actions (
-       id bigint NOT NULL,
-       type integer,
-       dn character(200) DEFAULT '',
-       date timestamp without time zone,
-       id_tables integer,
-       CONSTRAINT actions_pkey PRIMARY KEY (id)
-);
-
-CREATE TABLE values (
-       id bigint NOT NULL,
-       id_actions bigint NOT NULL,
-       id_fields integer NOT NULL,
-       value character varying DEFAULT '',
-       CONSTRAINT valori_pkey PRIMARY KEY (id)
-);

diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644 (file)
index 0000000..ee7fa76
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = sql

diff --git a/docs/sql/Makefile.am b/docs/sql/Makefile.am
new file mode 100644 (file)
index 0000000..8e5c1b0
--- /dev/null
+++ b/docs/sql/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+             audit.sql

diff --git a/docs/sql/audit.sql b/docs/sql/audit.sql
new file mode 100644 (file)
index 0000000..db5c2d1
--- /dev/null
+++ b/docs/sql/audit.sql
@@ -0,0 +1,40 @@
+CREATE TABLE datasources (
+       id integer NOT NULL,
+       name character(30) DEFAULT '',
+       cnc_string character(255) DEFAULT '',
+       status character(1) DEFAULT '',
+       CONSTRAINT datasources_pkey PRIMARY KEY (id)
+);
+
+CREATE TABLE tables (
+       id integer NOT NULL,
+       name character(30) DEFAULT '',
+       status character(1) DEFAULT '',
+       id_datasources integer NOT NULL,
+       CONSTRAINT tables_pkey PRIMARY KEY (id)
+);
+
+CREATE TABLE fields (
+       id integer NOT NULL,
+       id_tables integer NOT NULL,
+       name character(30) DEFAULT '',
+       status character(1) DEFAULT '',
+       CONSTRAINT campi_pkey PRIMARY KEY (id)
+);
+
+CREATE TABLE actions (
+       id bigint NOT NULL,
+       type integer,
+       dn character(200) DEFAULT '',
+       date timestamp without time zone,
+       id_tables integer,
+       CONSTRAINT actions_pkey PRIMARY KEY (id)
+);
+
+CREATE TABLE values (
+       id bigint NOT NULL,
+       id_actions bigint NOT NULL,
+       id_fields integer NOT NULL,
+       value character varying DEFAULT '',
+       CONSTRAINT valori_pkey PRIMARY KEY (id)
+);

diff --git a/src/audit.c b/src/audit.c
index 3fb17ba67af9957585b16426e9fcc7c1d914d0ab..d69cfca156b84152950328da1d8f2e9fada91051 100644 (file)
--- a/src/audit.c
+++ b/src/audit.c
@@ -287,7 +287,9 @@ static Datasource
 *get_datasource_from_name (Audit *audit,
                            const char *datasource)
 {
-       GList *f = g_list_first (audit->datasources);
+       AuditPrivate *priv = AUDIT_GET_PRIVATE (audit);
+
+       GList *f = g_list_first (priv->datasources);
 
        while (f != NULL)
                {

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644 (file)
index 0000000..e69de29