diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-10 10:38:02 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-10 10:38:02 +0000 |
| commit | e5d6b0175f95edd25972cbc3fad0e3cd5cc2fdb6 (patch) | |
| tree | c965fcc00e987a6ca28352690d4c0b51b5bb74c0 | |
| parent | 353ab2a2d5919afa631706646f0aa9f56d68d821 (diff) | |
Fix of m4 scripts.
git-svn-id: svn://svn.zabbix.com/trunk@3678 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | configure.in | 3 | ||||
| -rwxr-xr-x | go | 2 | ||||
| -rw-r--r-- | m4/ax_lib_sqlite3.m4 | 6 | ||||
| -rw-r--r-- | m4/libcurl.m4 | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 7c95c3fc..308d6dc8 100644 --- a/configure.in +++ b/configure.in @@ -488,6 +488,8 @@ AC_ARG_ENABLE(agent, esac], [agent=no]) AM_CONDITIONAL(AGENT, test x$agent = xyes) + + have_db="no" @@ -744,6 +746,7 @@ dnl AC_CHECK_LIB(crypto, main, SNMP_LFLAGS="-lcrypto $SNMP_LFLAGS") AC_SUBST(SNMP_LFLAGS) AC_SUBST(SNMP_INCLUDE) + LIBCURL_CHECK_CONFIG([yes], [7.15.1], [],[]) @@ -31,7 +31,7 @@ cd create/schema ./gen.pl c >../../include/dbsync.h cd - #export CFLAGS="-Wall -pedantic" -#./configure --enable-agent --enable-server --with-sqlite3 --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null +#./configure --enable-agent --enable-server --with-libcurl --with-sqlite3 --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null #./configure --enable-agent --enable-server --with-libcurl --with-pgsql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null ./configure --enable-agent --enable-server --with-libcurl --with-mysql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null #./configure --enable-agent --enable-server --with-oracle=/home/zabbix/sqlora8 --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null diff --git a/m4/ax_lib_sqlite3.m4 b/m4/ax_lib_sqlite3.m4 index 13c0a4f9..2ead5893 100644 --- a/m4/ax_lib_sqlite3.m4 +++ b/m4/ax_lib_sqlite3.m4 @@ -101,7 +101,7 @@ AC_DEFUN([AX_LIB_SQLITE3], saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags" - AC_LANG_PUSH(C++) +dnl AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]], @@ -123,11 +123,11 @@ AC_DEFUN([AX_LIB_SQLITE3], AC_MSG_RESULT([no]) ] ) - AC_LANG_POP([C++]) +dnl AC_LANG_POP([C++]) CPPFLAGS="$saved_CPPFLAGS" - if test "$success" = "yes"; then + if test "$found_sqlite3" = "yes"; then SQLITE3_CFLAGS="$ac_sqlite3_cppflags" SQLITE3_LDFLAGS="$ac_sqlite3_ldflags" diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 45f2a877..42c87129 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -60,7 +60,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], [ If you want to use cURL library: AC_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL library @<:@default=no@:>@, look for the curl library in DIR])], - [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[no],[$1])]) + [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) if test "$_libcurl_with" != "no" ; then |