cleaning help and usage

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 5988b332b2def87c523d4b67915d12d675d906c6..27b2b40edfc2987522e2cf4f3d3c4b74ecc063a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,6 @@ AC_CONFIG_LIBOBJ_DIR(lib)
 AC_FUNC_GETLOADAVG([lib])
 
 ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
-dnl AM_WITH_REGEX
 
 PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'`
 AC_SUBST(PLUGIN_TEST)dnl
@@ -254,11 +253,12 @@ fi
 LIBS="$_SAVEDLIBS"
 
 dnl Check for mysql libraries
+dnl Default is to search path for mysql_config
 AC_ARG_WITH(mysql,
        ACX_HELP_STRING([--with-mysql=DIR],
                [Compiles mysql plugins. Expects DIR/bin/mysql_config]),
        with_mysql=$withval,
-       with_mysql=no)
+       with_mysql=yes)
 if test $with_mysql != "no" ; then
   if test -x $with_mysql/bin/mysql_config ; then
     MYSQLCONFIG="$with_mysql/bin/mysql_config"
@@ -445,8 +445,7 @@ if ! test x"$with_openssl" = x"no"; then
        unset FOUNDINCLUDE
        if test x"$with_openssl" != x"/usr" ; then
                CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
-               # Need both to find ssl libraries and to load at runtime
-               LDFLAGS="$LDFLAGS -L$with_openssl/lib -R$with_openssl/lib"
+               LDFLAGS="$LDFLAGS -L$with_openssl/lib"
        fi
 
        dnl check for openssl in $dir/include/openssl
@@ -533,7 +532,6 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(signal.h strings.h string.h syslog.h uio.h errno.h sys/types.h sys/time.h sys/socket.h sys/loadavg.h sys/un.h sys/poll.h)
 AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h stdlib.h)
-AC_CHECK_HEADERS(regex.h,FOUNDREGEX=yes,FOUNDREGEX=no)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -1617,8 +1615,7 @@ AC_ARG_WITH(apt-get_command,
                             with_apt_get_command=$withval,
                             with_apt_get_command=$PATH_TO_APTGET)
 AC_DEFINE_UNQUOTED(PATH_TO_APTGET,"$PATH_TO_APTGET",[Path to apt-get command, if present])
-# check_apt needs regex support
-if test -n "$PATH_TO_APTGET" && test "$FOUNDREGEX" = "yes"; then
+if test -n "$PATH_TO_APTGET" ; then
        EXTRAS="$EXTRAS check_apt"
 fi
 
@@ -1664,7 +1661,7 @@ AC_SUBST(EXTRA_NETOBJS)
 AC_SUBST(DEPLIBS)
 
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.13.1)
 
 dnl Check for Redhat spopen problem
 dnl Wierd problem where ECHILD is returned from a wait call in error