SF.net SVN: gar:[22812] csw/mgar/pkg/zabbix/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 22812
          http://sourceforge.net/p/gar/code/22812
Author:   dmichelsen
Date:     2014-01-09 16:08:01 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
zabbix/trunk: Reenable mysql and net-snmp

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 15:37:40 UTC (rev 22811)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 16:08:01 UTC (rev 22812)
@@ -32,7 +32,7 @@
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp25
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2
@@ -47,7 +47,7 @@
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2
@@ -74,9 +74,16 @@
 CONFIGURE_ARGS += --with-ssh2=$(prefix)
 CONFIGURE_ARGS += --with-ldap
 
-CONFIGURE_ARGS += --without-mysql
-CONFIGURE_ARGS += --with-sqlite3
+# We need the latest Solaris 10 for the mysql bindings
+LINKER_MAP_RELEASE =
+CONFIGURE_ARGS += --with-mysql
 
+# CONFIGURE_ARGS += --with-sqlite3
+# CONFIGURE_ARGS += --with-postgresql
+CONFIGURE_ARGS += --with-libcurl=$(bindir)/curl-config
+
+CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config
+
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
 PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.