upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-02-20 08:20:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Only include extra-opts tests if libtap is enabled

Browse source 
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2044 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Ton Voon 2008-08-21 21:52:05 +00:00
parent be8df51de1
commit 9f16b542b8
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
configure.in
View file

@ -154,6 +154,22 @@ AC_CHECK_HEADERS(math.h)
AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
AC_SUBST(MATHLIBS)
dnl Add libtap for tests
AC_ARG_ENABLE(libtap,
AC_HELP_STRING([--enable-libtap],
[Enables configuring of libtap in external/tap/. Run "make tap" to compile (default: no)]),
[enable_libtap=$enableval],
[enable_libtap=no])
dnl Have to define TAP_DIR so that Makefile can pull it as an extra dist
TAP_DIR=external/tap-1.01
AC_SUBST(TAP_DIR)
if test "$enable_libtap" = yes; then
dnl Have to have AC_CONFIG_SUBDIRS as a literal
AC_CONFIG_SUBDIRS([external/tap-1.01])
EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
AC_SUBST(EXTRA_TEST)
fi
dnl INI Parsing
AC_ARG_ENABLE(extra-opts,
AC_HELP_STRING([--enable-extra-opts],
@ -162,9 +178,11 @@ AC_ARG_ENABLE(extra-opts,
[enable_extra_opts=no])
AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
if test "$enable_extra_opts" = "yes" ; then
EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
AC_SUBST(EXTRA_TEST)
AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
if test "$enable_libtap" = yes; then
EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
AC_SUBST(EXTRA_TEST)
fi
fi
dnl Check for PostgreSQL libraries
@ -1589,21 +1607,6 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c
AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?)
fi
AC_ARG_ENABLE(libtap,
AC_HELP_STRING([--enable-libtap],
[Enables configuring of libtap in external/tap/. Run "make tap" to compile (default: no)]),
[enable_libtap=$enableval],
[enable_libtap=no])
dnl Have to define TAP_DIR so that Makefile can pull it as an extra dist
TAP_DIR=external/tap-1.01
AC_SUBST(TAP_DIR)
if test "$enable_libtap" = yes; then
dnl Have to have AC_CONFIG_SUBDIRS as a literal
AC_CONFIG_SUBDIRS([external/tap-1.01])
EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
AC_SUBST(EXTRA_TEST)
fi
AC_OUTPUT(
Makefile
lib/Makefile