Fixed static agent build problems on Solaris 10
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 4 Jan 2007 00:45:39 +0000 (00:45 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 4 Jan 2007 00:45:39 +0000 (00:45 +0000)
ChangeLog
configure.ac
src/agent/core/Makefile.am
tools/create_ssa_list.sh

index 033c7ff..3fcaec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@
          function
        - Added server history in login dialog
        - Added option "hide empty values" in last DCI values view
-- Fixed issues: #135, #140, #145
+- Fixed issues: #123, #135, #140, #145
 
 
 *
index caef0e2..32d5c1d 100644 (file)
@@ -1,10 +1,10 @@
-# $Id: configure.ac,v 1.229 2006-12-29 19:54:52 alk Exp $
+# $Id: configure.ac,v 1.230 2007-01-04 00:45:38 victor Exp $
 #
 # NetXMS - Network Management System
 # Configure script
 #
 
-AC_INIT([NetXMS], [0.2.15-rc2], [NetXMS Team <bugs@netxms.org>])
+AC_INIT([NetXMS], [0.2.15-rc4], [NetXMS Team <bugs@netxms.org>])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -44,7 +44,6 @@ BUILD_NXHTTPD="no"
 BUILD_STATIC_AGENT="no"
 NEED_ZLIB="no"
 MODULES=""
-ALL_STATIC_FLAG=""
 STATIC_SUBAGENT_LIST=""
 SUBAGENT_DIRS=""
 SUBAGENT_LIBS=""
@@ -177,7 +176,6 @@ AC_ARG_ENABLE(iconv,
 [AS_HELP_STRING(--disable-iconv,do not use iconv() for text conversions)],
 [
        DISABLE_ICONV="yes"
-       CPPFLAGS="$CPPFLAGS -D__DISABLE_ICONV"
 ])
 
 AC_ARG_ENABLE(encryption,
@@ -217,7 +215,7 @@ if test $? = 0; then
        STATIC_BUILD="yes"
        BUILD_STATIC_AGENT="yes"
        MODULES="$MODULES agent"
-       ALL_STATIC_FLAG="-all-static"
+       DISABLE_ICONV="yes"
        CPPFLAGS="$CPPFLAGS -D_STATIC_AGENT"
 
        case "$PLATFORM" in
@@ -264,6 +262,7 @@ if test $? = 0; then
        fi
        STATIC_BUILD="yes"
        BUILD_STATIC_AGENT="yes"
+       DISABLE_ICONV="yes"
        USE_PTH="yes"
        MODULES="$MODULES agent"
        CPPFLAGS="$CPPFLAGS -D_STATIC_AGENT -D_IPSO -D_USE_GNU_PTH -I/usr/local/include"
@@ -967,7 +966,6 @@ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DDATADIR=\\\"\${pkgdatadir}\\\" -DLIBDIR=\\\
 # Substitute variables
 #--------------------------------------------------------------------
 
-AC_SUBST(ALL_STATIC_FLAG)
 AC_SUBST(DB_DRIVERS)
 AC_SUBST(MODULES)
 AC_SUBST(SUBAGENT_DIRS)
index 2cc5798..a32c633 100644 (file)
@@ -11,7 +11,7 @@ INCLUDES=-I@top_srcdir@/include
 
 bin_PROGRAMS = nxagentd
 nxagentd_SOURCES = messages.c actions.cpp comm.cpp config.cpp exec.cpp getparam.cpp log.cpp lpp.cpp nxagentd.cpp session.cpp static_subagents.cpp subagent.cpp sysinfo.cpp tools.cpp trap.cpp upgrade.cpp
-nxagentd_LDADD = @ALL_STATIC_FLAG@ ../../libnetxms/libnetxms.la @SUBAGENT_LIBS@
+nxagentd_LDADD = ../../libnetxms/libnetxms.la @SUBAGENT_LIBS@
 AM_CPPFLAGS = $(all_includes) -DPREFIX=\"@prefix@\"
 CLEANFILES = messages.c messages.h static_subagents.cpp
 
index 491a9f0..82042ca 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TIMESTAMP=`date`
-LIST=`echo $1 | tr a-z A-Z`
+LIST=`echo $1 | tr "[a-z]" "[A-Z]"`
 
 echo "/* static_subagents.cpp  Generated at $TIMESTAMP */"
 cat << EOT