- fixed support of 'curl' library (Eugene)

 - added suport of 'automake' v1.6 (Eugene)
 - fixed oracle support (Eugene)
 - added support of MySQL v3.23 (Eugene)
 - fixed 'gen.pl' for UTF8 (Eugene)
 - more minor fixes

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

2 files changed, 22 insertions, 18 deletions

diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index 2043a848..a53a07e7 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -61,10 +61,13 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
 AC_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL library @<:@default=yes@:>@, look for the curl library in DIR])],
         [
         if test "$withval" = "no"; then
+            want_curl="no"
             _libcurl_with="no"
         elif test "$withval" = "yes"; then
+            want_curl="yes"
             _libcurl_with="yes"
         else
+            want_curl="yes"
             _libcurl_with=$withval
         fi
         ],
@@ -203,6 +206,7 @@ x=CURLOPT_VERBOSE;
              [Define to 1 if you have a functional curl library.])
            AC_SUBST(LIBCURL_CPPFLAGS)
            AC_SUBST(LIBCURL_LDFLAGS)
+           found_curl="yes"
 
            for _libcurl_feature in $_libcurl_features ; do
 	      AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
diff --git a/m4/sqlora8.m4 b/m4/sqlora8.m4
index 17896edb..a3e7dc44 100644
--- a/m4/sqlora8.m4
+++ b/m4/sqlora8.m4
@@ -52,46 +52,46 @@ AC_HELP_STRING([--with-oracle@<:@=ARG@:>@],
   fi
 
   if test "x$_libsqlora8_with" != x"no"; then
-	AC_MSG_CHECKING(for Oracle support)
+	AC_MSG_CHECKING([for Oracle support])
 
 	if test "$_libsqlora8_with" = "yes"; then
 		if test -f /usr/include/sqlora.h; then
-			SQLORA8_INCDIR=/usr/include
+			SQLORA8_INCDIR=/usr
 			SQLORA8_LIBDIR=/usr/lib
 		elif test -f /usr/lib/libsqlora8/include/sqlora.h; then
-			SQLORA8_INCDIR=/usr/lib/libsqlora8/include
+			SQLORA8_INCDIR=/usr/lib/libsqlora8
 			SQLORA8_LIBDIR=/usr/lib
 		elif test -f $SQLORA8_HOME/lib/sqlora8/include/sqlora.h; then
-			SQLORA8_INCDIR=$SQLORA8_HOME/lib/sqlora8/include
+			SQLORA8_INCDIR=$SQLORA8_HOME/lib/sqlora8
 			SQLORA8_LIBDIR=$SQLORA8_HOME/lib
 		elif test -f $SQLORA8_HOME/include/sqlora.h; then
-			SQLORA8_INCDIR=${SQLORA8_HOME}/include
+			SQLORA8_INCDIR=${SQLORA8_HOME}
 			SQLORA8_LIBDIR=${SQLORA8_HOME}/lib
 		else
-			found_libsqlora8="no"
-			AC_MSG_RESULT(no)
+			found_sqlora8="no"
+			AC_MSG_RESULT([no])
 		fi
 	else
 		if test -f $_libsqlora8_with/include/sqlora.h; then
-			SQLORA8_INCDIR=$_libsqlora8_with/include
+			SQLORA8_INCDIR=$_libsqlora8_with
 			SQLORA8_LIBDIR=$_libsqlora8_with/lib
-		elif test -f $withval/lib/libsqlora8/include/sqlora.h; then
-			SQLORA8_INCDIR=$_libsqlora8_with/lib/libsqlora8/include
+		elif test -f $_libsqlora8_with/lib/libsqlora8/include/sqlora.h; then
+			SQLORA8_INCDIR=$_libsqlora8_with/lib/libsqlora8
 			SQLORA8_LIBDIR=$_libsqlora8_with/lib
-		elif test -f $withval/libsqlora8/include/sqlora.h; then
-			SQLORA8_INCDIR=$_libsqlora8_with/libsqlora8/include
+		elif test -f $_libsqlora8_with/libsqlora8/include/sqlora.h; then
+			SQLORA8_INCDIR=$_libsqlora8_with/libsqlora8
 			SQLORA8_LIBDIR=$_libsqlora8_with
 		else
-			found_libsqlora8="no"
-			AC_MSG_RESULT(no)
+			found_sqlora8="no"
+			AC_MSG_RESULT([no])
 		fi
 	fi
 
-	if test "x$found_libsqlora8" != "xno" ; then
-		$found_libsqlora8="yes"
-		AC_MSG_RESULT(yes)
+	if test "x$found_sqlora8" != "xno" ; then
+		found_sqlora8="yes"
+		AC_MSG_RESULT([yes])
 
-		SQLORA8_CPPFLAGS="-I$SQLORA8_INCDIR"
+		SQLORA8_CPPFLAGS="-I$SQLORA8_INCDIR/include -I$SQLORA8_INCDIR/lib/libsqlora8/include"
 		SQLORA8_LDFLAGS="-L$SQLORA8_LIBDIR -lsqlora8"
 
 		AC_DEFINE(HAVE_SQLORA8,1,[Define to 1 if SQLORA8 library should be enabled.])