diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rwxr-xr-x | do | 2 | ||||
| -rw-r--r-- | m4/ldap.m4 | 4 | ||||
| -rw-r--r-- | src/zabbix_agent/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_get/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_sender/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_server/Makefile.am | 2 |
8 files changed, 36 insertions, 10 deletions
@@ -13,6 +13,8 @@ Changes for 1.5: Changes for 1.4.2: + - more informative report for confiuration script (Eugene) + - changed installation directory to '$sbin' (Eudene) - fixed "Reset" button for Web screens (Eugene) - fixed graph items limitation for IE6 (Eugene) - added availability of using spaces for trigger expressions (Eugene) diff --git a/configure.in b/configure.in index 322e3ba9..fe391718 100644 --- a/configure.in +++ b/configure.in @@ -62,11 +62,11 @@ dnl Why I had -lsnmp before ??? dnl AC_CHECK_LIB(snmp, main, LIBS="-lsnmp $LIBS") dnl Required for AIX when -lsnmp is used dnl AC_CHECK_LIB(isode, main) -AC_CHECK_LIB(socket, main) +AC_SEARCH_LIBS(socket, socket) #Solaris SNMP requires this -AC_CHECK_LIB(kstat, main) -AC_CHECK_LIB(nsl, main) -AC_CHECK_LIB(resolv, main) +AC_SEARCH_LIBS(kstat_open, kstat) +AC_SEARCH_LIBS(gethostbyname, nsl) +AC_SEARCH_LIBS(res_init, resolv) AC_CHECK_LIB(m, main) AC_CHECK_LIB(kvm, main) dnl AC_CHECK_LIB(pthread, main) @@ -516,6 +516,9 @@ AM_CONDITIONAL(AGENT, test x$agent = xyes) have_db="no" have_odbc="no" +have_web_monitoring="no" +have_jabber="no" +have_snmp="no" if test "$server" = "yes"; then @@ -623,6 +626,8 @@ if test "$server" = "yes"; then if test "x$want_jabber" = "xyes"; then if test "x$found_jabber" != "xyes"; then AC_MSG_ERROR([Not found Jabber library]) + else + have_jabber="yes" fi fi CFLAGS="${CFLAGS} ${JABBER_CPPFLAGS}" @@ -635,6 +640,10 @@ if test "$server" = "yes"; then AC_MSG_ERROR([Not found Curl library]) fi fi + if test "x$found_curl" = "xyes"; then + have_web_monitoring="cURL" + fi + CFLAGS="${CFLAGS} ${LIBCURL_CPPFLAGS}" SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LIBCURL_LDFLAGS}" SERVER_LIBS="${SERVER_LIBS} ${LIBCURL_LIBS}" @@ -688,6 +697,8 @@ if test "$server" = "yes"; then if test "x$want_netsnmp" = "xyes"; then if test "x$found_netsnmp" != "xyes"; then AC_MSG_ERROR([Invalid NET-SNMP directory - unable to find net-snmp-config]) + else + have_snmp="net-snmp" fi fi CFLAGS="${CFLAGS} ${SNMP_CFLAGS}" @@ -699,6 +710,8 @@ if test "$server" = "yes"; then if test "x$want_snmp" = "xyes"; then if test "x$found_snmp" != "xyes"; then AC_MSG_ERROR([Invalid UCD-SNMP directory - unable to find ucd-snmp-config.h]) + else + have_snmp="ucd-snmp" fi if test "x$found_netsnmp" = "xyes"; then @@ -716,11 +729,12 @@ fi AM_CONDITIONAL(JABBER, test "x$found_jabber" = "xno") AM_CONDITIONAL(WITH_ODBC, test "x$have_odbc" != "xno") +found_ldap="no" dnl Check for libLDAP [by default - skip] LIBLDAP_CHECK_CONFIG([no]) if test "x$want_ldap" = "xyes"; then if test "x$found_ldap" != "xyes"; then - AC_MSG_ERROR([Invalid LDAP directory - unable to find ldap.h]) + AC_MSG_ERROR([Invalid LDAP directory - unable to find ldap.h "${found_ldap}"]) fi fi CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" @@ -878,6 +892,9 @@ if test "x$server" != "xno"; then echo " With database: ${have_db} Enable DB monitor via: ${have_odbc} + WEB Monitoring via: ${have_web_monitoring} + Native Jabber: ${have_jabber} + SNMP: ${have_snmp} Linker flags: ${LDFLAGS} ${SERVER_LDFLAGS} Libraries: ${LIBS} ${SERVER_LIBS}" @@ -893,6 +910,9 @@ echo " Linker flags: ${LDFLAGS} fi +echo " + LDAP support: ${found_ldap}" + echo echo "***********************************************************" echo "* Now run '${am_make} install' *" @@ -23,7 +23,7 @@ cleanwarnings="no" docat="yes" help="no" noparam=0 -def="--enable-agent --enable-server --with-mysql --prefix=`pwd` --with-curl --with-ldap" +def="--enable-agent --enable-server --with-mysql --prefix=`pwd` --with-libcurl --with-ldap" for cmd do @@ -41,12 +41,15 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> if test -f /usr/local/openldap/include/ldap.h; then LDAP_INCDIR=/usr/local/openldap/include/ LDAP_LIBDIR=/usr/local/openldap/lib/ + found_ldap="yes" elif test -f /usr/include/ldap.h; then LDAP_INCDIR=/usr/include LDAP_LIBDIR=/usr/lib + found_ldap="yes" elif test -f /usr/local/include/ldap.h; then LDAP_INCDIR=/usr/local/include LDAP_LIBDIR=/usr/local/lib + found_ldap="yes" else found_ldap="no" AC_MSG_RESULT(no) @@ -55,6 +58,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> if test -f $_libldap_with/include/ldap.h; then LDAP_INCDIR=$_libldap_with/include LDAP_LIBDIR=$_libldap_with/lib + found_ldap="yes" else found_ldap="no" AC_MSG_RESULT(no) diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am index 2ff26961..34cd0b90 100644 --- a/src/zabbix_agent/Makefile.am +++ b/src/zabbix_agent/Makefile.am @@ -13,7 +13,7 @@ agents_ldadd = \ $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a -bin_PROGRAMS = \ +sbin_PROGRAMS = \ zabbix_agent \ zabbix_agentd diff --git a/src/zabbix_get/Makefile.am b/src/zabbix_get/Makefile.am index 999b7e0e..855fa27d 100644 --- a/src/zabbix_get/Makefile.am +++ b/src/zabbix_get/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = zabbix_get +sbin_PROGRAMS = zabbix_get zabbix_get_SOURCES = zabbix_get.c diff --git a/src/zabbix_sender/Makefile.am b/src/zabbix_sender/Makefile.am index 89e1b407..63f65bf0 100644 --- a/src/zabbix_sender/Makefile.am +++ b/src/zabbix_sender/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = zabbix_sender +sbin_PROGRAMS = zabbix_sender zabbix_sender_SOURCES = zabbix_sender.c diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am index fa43d1e3..4b621b1a 100644 --- a/src/zabbix_server/Makefile.am +++ b/src/zabbix_server/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = \ utils \ watchdog -bin_PROGRAMS = zabbix_server +sbin_PROGRAMS = zabbix_server zabbix_server_SOURCES = \ evalfunc.c evalfunc.h \ |