From c5273a6d8f63f37b502054e97209770e9553c599 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Wed, 22 Mar 2006 17:32:11 +0000 Subject: [PATCH] Reinstated --with-mysql option git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1347 f882894a-f735-0410-b71e-b25c423dba1c --- REQUIREMENTS | 2 +- configure.in | 42 +++++++++++++++++++++++++++--------------- 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: Lib: libmysql, libmysqlclient Redhat Powertools Source: mysql-3.20.32a-3.i386.rpm, mysql-devel-3.20.32a-3.i386.rpm (these seem to be broken, however) RPMS from www.mysql.org work better - Must have mysql_config in PATH + Must have mysql_config in PATH or specified with --with-mysql=DIR for DIR/bin/mysql_config check_pqsql: - 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) AC_PREFIX_DEFAULT(/usr/local/nagios) +dnl Deprecated configure options + dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL AC_SUBST(INSTALL) @@ -254,22 +256,31 @@ fi LIBS="$_SAVEDLIBS" dnl Check for mysql libraries -AC_PATH_PROG(MYSQLCONFIG, mysql_config) -if test -z "$MYSQLCONFIG"; then - AC_MSG_WARN([Skipping mysql plugin]) - AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) -else - EXTRAS="$EXTRAS check_mysql check_mysql_query" - MYSQLINCLUDE=`$MYSQLCONFIG --include` - if test $? != 0 ; then - # mysql_config for 3.x does not support --include - MYSQLINCLUDE="" +AC_ARG_WITH(mysql, + ACX_HELP_STRING([--with-mysql=DIR], + [Compiles mysql plugins. Expects DIR/bin/mysql_config]), + with_mysql=$withval, + with_mysql=no) +if test $with_mysql != "no" ; then + if test -x $with_mysql/bin/mysql_config ; then + MYSQLCONFIG="$with_mysql/bin/mysql_config" + else + AC_PATH_PROG(MYSQLCONFIG, mysql_config) + fi + if test -z "$MYSQLCONFIG"; then + with_mysql="not found" + AC_MSG_WARN([Skipping mysql plugin]) + AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) + else + with_mysql=$MYSQLCONFIG + EXTRAS="$EXTRAS check_mysql check_mysql_query" + MYSQLINCLUDE=`$MYSQLCONFIG --include` + MYSQLLIBS=`$MYSQLCONFIG --libs` + MYSQLCFLAGS=`$MYSQLCONFIG --cflags` + AC_SUBST(MYSQLINCLUDE) + AC_SUBST(MYSQLLIBS) + AC_SUBST(MYSQLCFLAGS) fi - MYSQLLIBS=`$MYSQLCONFIG --libs` - MYSQLCFLAGS=`$MYSQLCONFIG --cflags` - AC_SUBST(MYSQLINCLUDE) - AC_SUBST(MYSQLLIBS) - AC_SUBST(MYSQLCFLAGS) fi AC_CHECK_HEADERS(unistd.h) @@ -1730,6 +1741,7 @@ dnl ACX_FEATURE([with],[ps-varlist]) ACX_FEATURE([with],[lwres]) ACX_FEATURE([with],[ipv6]) +ACX_FEATURE([with],[mysql]) ACX_FEATURE([with],[openssl]) ACX_FEATURE([with],[gnutls]) ACX_FEATURE([enable],[emulate-getaddrinfo]) -- 2.30.2