summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REQUIREMENTS2
-rw-r--r--configure.in42
2 files changed, 28 insertions, 16 deletions
diff --git a/REQUIREMENTS b/REQUIREMENTS
index fbd213b..bcc6433 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -39,7 +39,7 @@ check_mysql, check_mysql_query:
39 Lib: libmysql, libmysqlclient 39 Lib: libmysql, libmysqlclient
40 Redhat Powertools Source: mysql-3.20.32a-3.i386.rpm, mysql-devel-3.20.32a-3.i386.rpm (these seem to be broken, however) 40 Redhat Powertools Source: mysql-3.20.32a-3.i386.rpm, mysql-devel-3.20.32a-3.i386.rpm (these seem to be broken, however)
41 RPMS from www.mysql.org work better 41 RPMS from www.mysql.org work better
42 Must have mysql_config in PATH 42 Must have mysql_config in PATH or specified with --with-mysql=DIR for DIR/bin/mysql_config
43 43
44check_pqsql: 44check_pqsql:
45 - Requires the PostgreSQL libraries available from 45 - Requires the PostgreSQL libraries available from
diff --git a/configure.in b/configure.in
index 40a323c..b1efa09 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,8 @@ AC_SUBST(RELEASE)
12 12
13AC_PREFIX_DEFAULT(/usr/local/nagios) 13AC_PREFIX_DEFAULT(/usr/local/nagios)
14 14
15dnl Deprecated configure options
16
15dnl Figure out how to invoke "install" and what install options to use. 17dnl Figure out how to invoke "install" and what install options to use.
16AC_PROG_INSTALL 18AC_PROG_INSTALL
17AC_SUBST(INSTALL) 19AC_SUBST(INSTALL)
@@ -254,22 +256,31 @@ fi
254LIBS="$_SAVEDLIBS" 256LIBS="$_SAVEDLIBS"
255 257
256dnl Check for mysql libraries 258dnl Check for mysql libraries
257AC_PATH_PROG(MYSQLCONFIG, mysql_config) 259AC_ARG_WITH(mysql,
258if test -z "$MYSQLCONFIG"; then 260 ACX_HELP_STRING([--with-mysql=DIR],
259 AC_MSG_WARN([Skipping mysql plugin]) 261 [Compiles mysql plugins. Expects DIR/bin/mysql_config]),
260 AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) 262 with_mysql=$withval,
261else 263 with_mysql=no)
262 EXTRAS="$EXTRAS check_mysql check_mysql_query" 264if test $with_mysql != "no" ; then
263 MYSQLINCLUDE=`$MYSQLCONFIG --include` 265 if test -x $with_mysql/bin/mysql_config ; then
264 if test $? != 0 ; then 266 MYSQLCONFIG="$with_mysql/bin/mysql_config"
265 # mysql_config for 3.x does not support --include 267 else
266 MYSQLINCLUDE="" 268 AC_PATH_PROG(MYSQLCONFIG, mysql_config)
269 fi
270 if test -z "$MYSQLCONFIG"; then
271 with_mysql="not found"
272 AC_MSG_WARN([Skipping mysql plugin])
273 AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
274 else
275 with_mysql=$MYSQLCONFIG
276 EXTRAS="$EXTRAS check_mysql check_mysql_query"
277 MYSQLINCLUDE=`$MYSQLCONFIG --include`
278 MYSQLLIBS=`$MYSQLCONFIG --libs`
279 MYSQLCFLAGS=`$MYSQLCONFIG --cflags`
280 AC_SUBST(MYSQLINCLUDE)
281 AC_SUBST(MYSQLLIBS)
282 AC_SUBST(MYSQLCFLAGS)
267 fi 283 fi
268 MYSQLLIBS=`$MYSQLCONFIG --libs`
269 MYSQLCFLAGS=`$MYSQLCONFIG --cflags`
270 AC_SUBST(MYSQLINCLUDE)
271 AC_SUBST(MYSQLLIBS)
272 AC_SUBST(MYSQLCFLAGS)
273fi 284fi
274 285
275AC_CHECK_HEADERS(unistd.h) 286AC_CHECK_HEADERS(unistd.h)
@@ -1730,6 +1741,7 @@ dnl ACX_FEATURE([with],[ps-varlist])
1730 1741
1731ACX_FEATURE([with],[lwres]) 1742ACX_FEATURE([with],[lwres])
1732ACX_FEATURE([with],[ipv6]) 1743ACX_FEATURE([with],[ipv6])
1744ACX_FEATURE([with],[mysql])
1733ACX_FEATURE([with],[openssl]) 1745ACX_FEATURE([with],[openssl])
1734ACX_FEATURE([with],[gnutls]) 1746ACX_FEATURE([with],[gnutls])
1735ACX_FEATURE([enable],[emulate-getaddrinfo]) 1747ACX_FEATURE([enable],[emulate-getaddrinfo])