- improved configuration script

- added suport of 'make dist'
- fixed some bugs with DB supporting

git-svn-id: svn://svn.zabbix.com/trunk@3814 97f52cf1-0a1b-0410-bd0e-c28be96e8082

9 files changed, 99 insertions, 63 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 71989a3a..63facae2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-AGENT_DIRS = zabbix_agent zabbix_get zabbix_sender
-SERVER_DIRS = zabbix_server
+DIST_SUBDIRS = \
+	libs \
+	zabbix_agent \
+	zabbix_get \
+	zabbix_sender \
+	zabbix_server
 
 if AGENT
-AGENT_SUBDIRS = $(AGENT_DIRS)
-else
-AGENT_EXTRA_SUBDIRS = $(AGENT_DIRS)
+AGENT_SUBDIRS = \
+	zabbix_agent \
+	zabbix_get \
+	zabbix_sender
 endif
 
 if SERVER
-SERVER_SUBDIRS = $(SERVER_DIRS)
-else
-SERVER_EXTRA_SUBDIRS = $(SERVER_DIRS)
+SERVER_SUBDIRS = zabbix_server
 endif
 
-SUBDIRS = libs $(AGENT_SUBDIRS) $(SERVER_SUBDIRS)
-EXTRA_SUBDIRS = $(AGENT_EXTRA_SUBDIRS) $(SERVER_EXTRA_SUBDIRS)
+SUBDIRS = \
+	libs \
+	$(AGENT_SUBDIRS) \
+	$(SERVER_SUBDIRS)
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index 37b5530b..9c76675b 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1,12 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-SERVER_DIRS = zbxdbhigh zbxemail zbxsms zbxcomms
+DIST_SUBDIRS = \
+	zbxdbhigh \
+	zbxemail \
+	zbxsms \
+	zbxcomms \
+	zbxcrypto \
+	zbxcommon \
+	zbxlog \
+	zbxnet \
+	zbxnix \
+	zbxconf \
+	zbxsysinfo \
+	zbxplugin \
+	zbxsys 
 
 if SERVER
-SERVER_SUBDIRS = $(SERVER_DIRS)
-else
-EXTRA_SUBDIRS = $(SERVER_DIRS)
+SERVER_SUBDIRS = zbxdbhigh zbxemail zbxsms zbxcomms
 endif
 
 SUBDIRS = zbxcrypto zbxcommon zbxlog zbxnet zbxnix zbxconf zbxsysinfo zbxplugin zbxsys $(SERVER_SUBDIRS)
 
+EXTRA_DISTR = zbxwin32
diff --git a/src/libs/zbxcommon/Makefile.am b/src/libs/zbxcommon/Makefile.am
index e9efd230..65d2c90d 100644
--- a/src/libs/zbxcommon/Makefile.am
+++ b/src/libs/zbxcommon/Makefile.am
@@ -11,4 +11,4 @@ libzbxcommon_a_SOURCES = \
 	zbxgetopt.c \
 	alias.c
 
-EXTRA_DIR = gnuregex.c
+EXTRA_DIST = gnuregex.c
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index be5dc8e0..d174d23e 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -358,12 +358,12 @@ int DBexecute(const char *fmt, ...)
 	}
 	
 lbl_exec:
-	if(SQLITE_OK != (sql_ret = sqlite3_exec(sqlite, sql, NULL, 0, &error)))
+	if(SQLITE_OK != (ret = sqlite3_exec(sqlite, sql, NULL, 0, &error)))
 	{
-		if(sql_ret == SQLITE_BUSY) goto lbl_exec; /* attention deadlock!!! */
+		if(ret == SQLITE_BUSY) goto lbl_exec; /* attention deadlock!!! */
 		
 		zabbix_log( LOG_LEVEL_ERR, "Query::%s",sql);
-		zabbix_log(LOG_LEVEL_ERR, "Query failed [%i]:%s", sql_ret, error);
+		zabbix_log(LOG_LEVEL_ERR, "Query failed [%i]:%s", ret, error);
 		sqlite3_free(error);
 		if(!sqlite_transaction_started)
 		{
@@ -523,8 +523,8 @@ DB_RESULT DBselect(const char *fmt, ...)
 	sqlo_stmt_handle_t sth;
 #endif
 #ifdef	HAVE_SQLITE3
-	int sql_ret = SUCCEED;
-	char *error=0;
+	int ret = FAIL;
+	char *error=NULL;
 #endif
 
 	gettimeofday(&tv, NULL);
diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index 76c73a91..8fb3d66c 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -12,16 +12,27 @@ libzbxsysinfo_a_SOURCES = \
 	common/http.c \
 	@ARCH@/@ARCH@.c
 
-EXTRA_SUBDIRS = \
-	aix aix/aix.c \
-	common \
-	freebsd freebsd/freebsd.c \
-	hpux hpux/hpux.c \
-	linux linux/linux.c \
-	netbsd netbsd/netbsd.c \
-	openbsd openbsd/openbsd.c \
-	osf osf/osf.c \
-	osx osx/osx.c \
-	solaris solaris/solaris.c \
-	unknown unknown/unknown.c \
+DIST_SUBDIRS = \
+	aix \
+	freebsd \
+	hpux \
+	linux \
+	netbsd \
+	openbsd \
+	osf \
+	osx \
+	solaris \
+	unknown
+
+EXTRA_DIST = \
+	aix/aix.c \
+	freebsd/freebsd.c \
+	hpux/hpux.c \
+	linux/linux.c \
+	netbsd/netbsd.c \
+	openbsd/openbsd.c \
+	osf/osf.c \
+	osx/osx.c \
+	solaris/solaris.c \
+	unknown/unknown.c \
 	win32
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index 80a4d4a9..87af71a2 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -1,17 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_LDFLAGS = $(LDAP_LFLAGS)
-
-LDADD = \
-	../libs/zbxsysinfo/libzbxsysinfo.a \
-	../libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
-	../libs/zbxlog/libzbxlog.a \
-	../libs/zbxsys/libzbxsys.a \
-	../libs/zbxnix/libzbxnix.a \
-	../libs/zbxnet/libzbxnet.a \
-	../libs/zbxconf/libzbxconf.a \
-	../libs/zbxcommon/libzbxcommon.a \
-	../libs/zbxcrypto/libzbxcrypto.a $(LDAP_LIBS)
+agents_ldadd = \
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
+	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
+	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxnet/libzbxnet.a \
+	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
+	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a
 
 bin_PROGRAMS = \
 	zabbix_agent \
@@ -21,6 +19,12 @@ zabbix_agent_SOURCES = \
 	zabbix_agent.c zabbix_agent.h \
 	zbxconf.c zbxconf.h
 
+zabbix_agent_LDADD = $(agents_ldadd)
+
+zabbix_agent_CPPFLAGS = $(LDAP_CPPFLAGS)
+
+zabbix_agent_LDFLAGS = $(LDAP_LDFLAGS)
+
 zabbix_agentd_SOURCES = \
 	active.c active.h \
 	stats.c stats.h \
@@ -33,4 +37,8 @@ zabbix_agentd_SOURCES = \
 	listener.c listener.h \
 	eventlog.c eventlog.h
 
-zabbix_agentd_CPPFLAGS = -DZABBIX_DAEMON
+zabbix_agentd_LDADD = $(agents_ldadd)
+
+zabbix_agentd_CPPFLAGS = -DZABBIX_DAEMON $(LDAP_CPPFLAGS)
+
+zabbix_agentd_LDFLAGS = $(LDAP_LDFLAGS)
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 01321679..9621628d 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -22,8 +22,6 @@ zabbix_server_SOURCES = \
 	functions.c functions.h \
 	server.c
 
-zabbix_server_CPPFLAGS = -DZABBIX_DAEMON $(DB_CPPFLAGS) $(SNMP_INCLUDE) $(LIBCURL_CPPFLAGS)
-
 zabbix_server_LDADD = \
 	alerter/libzbxalerter.a \
 	pinger/libzbxpinger.a \
@@ -34,18 +32,20 @@ zabbix_server_LDADD = \
 	nodewatcher/libzbxnodewatcher.a \
 	utils/libzbxutils.a \
 	httppoller/libzbxhttppoller.a \
-	../libs/zbxsysinfo/libzbxsysinfo.a \
-	../libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
-	../libs/zbxlog/libzbxlog.a \
-	../libs/zbxnix/libzbxnix.a \
-	../libs/zbxsys/libzbxsys.a \
-	../libs/zbxconf/libzbxconf.a \
-	../libs/zbxemail/libzbxemail.a \
-	../libs/zbxnet/libzbxnet.a \
-	../libs/zbxsms/libzbxsms.a \
-	../libs/zbxdbhigh/libzbxdbhigh.a \
-	../libs/zbxcommon/libzbxcommon.a \
-	../libs/zbxcrypto/libzbxcrypto.a \
-	../libs/zbxcomms/libzbxcomms.a
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
+	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
+	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
+	$(top_srcdir)/src/libs/zbxemail/libzbxemail.a \
+	$(top_srcdir)/src/libs/zbxnet/libzbxnet.a \
+	$(top_srcdir)/src/libs/zbxsms/libzbxsms.a \
+	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
+	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a
+
+zabbix_server_CPPFLAGS = -DZABBIX_DAEMON $(DB_CPPFLAGS) $(SNMP_CPPFLAGS) $(LDAP_CPPFLAGS) $(LIBCURL_CPPFLAGS)
 
-zabbix_server_LDFLAGS = $(DB_LDFLAGS) $(SNMP_LIBS) $(LDAP_LIBS) $(LIBCURL)
+zabbix_server_LDFLAGS = $(DB_LDFLAGS) $(SNMP_LDFLAGS) $(LDAP_LDFLAGS) $(LIBCURL_LDFLAGS)
diff --git a/src/zabbix_server/httppoller/Makefile.am b/src/zabbix_server/httppoller/Makefile.am
index 03d3b1f4..ef6b8432 100644
--- a/src/zabbix_server/httppoller/Makefile.am
+++ b/src/zabbix_server/httppoller/Makefile.am
@@ -7,4 +7,4 @@ libzbxhttppoller_a_SOURCES = \
 	httptest.c httptest.h \
 	httppoller.c httppoller.h
 
-libzbxhttppoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
+libzbxhttppoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_CPPFLAGS)
diff --git a/src/zabbix_server/poller/Makefile.am b/src/zabbix_server/poller/Makefile.am
index 3a0261cb..9148464d 100644
--- a/src/zabbix_server/poller/Makefile.am
+++ b/src/zabbix_server/poller/Makefile.am
@@ -10,4 +10,4 @@ libzbxpoller_a_SOURCES = \
 	checks_aggregate.c checks_aggregate.h \
 	poller.c poller.h
 
-libzbxpoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
+libzbxpoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_CPPFLAGS)