diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2008-08-21 21:52:05 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2008-08-21 21:52:05 +0000 |
| commit | 9f16b542b8f47ed5ed82342b30cc90dfef802431 (patch) | |
| tree | 721f303bc088dda17cc7eaad4408395f1260a85b | |
| parent | be8df51de13a6e67ca0c929c348526c66f604cba (diff) | |
| download | monitoring-plugins-9f16b542b8f47ed5ed82342b30cc90dfef802431.tar.gz | |
Only include extra-opts tests if libtap is enabled
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2044 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | configure.in | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/configure.in b/configure.in index afde8374..bed4bd90 100644 --- a/configure.in +++ b/configure.in @@ -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 |