From: Andrea Zagli <azagli@libero.it>
Date: Mon, 31 May 2010 15:36:21 +0000 (+0200)
Subject: Changes to autotools.
X-Git-Tag: 0.5.0~17
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=cc50d17ca13d24061a86a0cfbf82835d7e7333cb;p=zakaudit%2Flibzakaudit

Changes to autotools.
---

diff --git a/.gitignore b/.gitignore
index cae9cb8..d228bcc 100644
--- 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 ccbe197..a04d10b 100644
--- 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 681641e..2fcc9a2 100644
--- 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
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
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
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
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 3fb17ba..d69cfca 100644
--- 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
index 0000000..e69de29