- fixed coniguration scripts for mysql/net-snmp/curl (Eugene)

 - fixed SMS sender (Eugene)
 - timeout for sending emails and SMS was increased to 40 seconds (Eugene)


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

3 files changed, 51 insertions, 24 deletions

diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4
index 27214ad2..48a8c6d7 100644
--- a/m4/ax_lib_mysql.m4
+++ b/m4/ax_lib_mysql.m4
@@ -84,16 +84,24 @@ dnl            AC_MSG_CHECKING([for MySQL libraries])
 
             MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
 
+            _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
+ 
+            for i in $_full_libmysql_libs; do
+                case $i in
+                -lmysqlclient)
+             ;;
+                   -L*)
+                        MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
+                ;;
+                esac
+            done
+
             if test "x$enable_static" = "xyes"; then
-               _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
  
                for i in $_full_libmysql_libs; do
                    case $i in
-           	   -lmysqlclient)
-           	;;
-                      -L*)
-                           MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
-                   ;;
+           	      -lmysqlclient)
+           	    ;;
                       -l*)
                            _lib_name="`echo "$i" | cut -b3-`"
                            MYSQL_LIBS="${MYSQL_LIBS} ${i}"
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index 4daa1f50..f1840223 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -125,20 +125,36 @@ AC_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL library @<:@default=yes@:>
 			esac
 		done
 
-		if test "x$enable_static" != "xyes"; then
-			_full_libcurl_libs="-lcurl"
+		if test "x$enable_static" = "xyes"; then
+			for i in $_full_libcurl_libs; do
+				case $i in
+					-llibcurl)
+				;;
+					-l*)
+						_lib_name=`echo "$i" | cut -b3-`
+						AC_CHECK_LIB($_lib_name , main, , AC_MSG_ERROR([Not found $_lib_name library]))
+						LIBCURL_LIBS="$LIBCURL_LIBS $i"
+
+				;;
+				esac
+			done
 		fi
 
-		for i in $_full_libcurl_libs; do
-			case $i in
-				-l*)
-					_lib_name=`echo "$i" | cut -b3-`
-					AC_CHECK_LIB($_lib_name , main, , AC_MSG_ERROR([Not found $_lib_name library]))
-					LIBCURL_LIBS="$LIBCURL_LIBS $i"
-
-			;;
-			esac
-		done
+		_save_curl_libs="${LIBS}"
+		_save_curl_ldflags="${LDFLAGS}"
+		_save_curl_cflags="${CFLAGS}"
+		LIBS="${LIBS} ${LIBCURL_LIBS}"
+		LDFLAGS="${LDFLAGS} ${LIBCURL_LDFLAGS}"
+		CFLAGS="${CFLAGS} ${LIBCURL_CFLAGS}"
+
+		AC_CHECK_LIB(libcurl, main, , AC_MSG_ERROR([Not found libcurl library]))
+
+		LIBS="${_save_curl_libs}"
+		LDFLAGS="${_save_curl_ldflags}"
+		CFLAGS="${_save_curl_cflags}"
+		unset _save_curl_libs
+		unset _save_curl_ldflags
+		unset _save_curl_cflags
 
               # This is so silly, but Apple actually has a bug in their
 	      # curl-config script.  Fixed in Tiger, but there are still
diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4
index 14131fa7..338c9e6d 100644
--- a/m4/netsnmp.m4
+++ b/m4/netsnmp.m4
@@ -53,10 +53,6 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@],
 
 dnl		AC_MSG_CHECKING([for NET-SNMP libraries])
 
-		_libnetsnmp_libdir="`$_libnetsnmp_config --libdir`"
-
-		SNMP_LDFLAGS="${SNMP_LDFLAGS} ${_libnetsnmp_libdir}"
-
 		_full_libnetsnmp_cflags="`$_libnetsnmp_config --cflags`"
 		for i in $_full_libnetsnmp_cflags; do
 			case $i in
@@ -67,9 +63,16 @@ dnl		AC_MSG_CHECKING([for NET-SNMP libraries])
 			esac
 		done
 
-		if test "x$enable_static" = "xyes"; then
-			_full_libnetsnmp_libs="`$_libnetsnmp_config --libs` -lcrypto"
+		_full_libnetsnmp_libs="`$_libnetsnmp_config --libs` -lcrypto"
+		for i in $_full_libnetsnmp_libs; do
+			case $i in
+				-L*)
+					SNMP_LDFLAGS="${SNMP_LDFLAGS} ${_libnetsnmp_libdir}"
+			;;
+			esac
+		done
 
+		if test "x$enable_static" = "xyes"; then
 			for i in $_full_libnetsnmp_libs; do
 				case $i in
 					-lnetsnmp)