summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2008-08-21 21:52:05 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2008-08-21 21:52:05 (GMT)
commit9f16b542b8f47ed5ed82342b30cc90dfef802431 (patch)
tree721f303bc088dda17cc7eaad4408395f1260a85b
parentbe8df51de13a6e67ca0c929c348526c66f604cba (diff)
downloadmonitoring-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.in37
1 files changed, 20 insertions, 17 deletions
diff --git a/configure.in b/configure.in
index afde837..bed4bd9 100644
--- a/configure.in
+++ b/configure.in
@@ -154,6 +154,22 @@ AC_CHECK_HEADERS(math.h)
154AC_CHECK_LIB(m,floor,MATHLIBS="-lm") 154AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
155AC_SUBST(MATHLIBS) 155AC_SUBST(MATHLIBS)
156 156
157dnl Add libtap for tests
158AC_ARG_ENABLE(libtap,
159 AC_HELP_STRING([--enable-libtap],
160 [Enables configuring of libtap in external/tap/. Run "make tap" to compile (default: no)]),
161 [enable_libtap=$enableval],
162 [enable_libtap=no])
163dnl Have to define TAP_DIR so that Makefile can pull it as an extra dist
164TAP_DIR=external/tap-1.01
165AC_SUBST(TAP_DIR)
166if test "$enable_libtap" = yes; then
167 dnl Have to have AC_CONFIG_SUBDIRS as a literal
168 AC_CONFIG_SUBDIRS([external/tap-1.01])
169 EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
170 AC_SUBST(EXTRA_TEST)
171fi
172
157dnl INI Parsing 173dnl INI Parsing
158AC_ARG_ENABLE(extra-opts, 174AC_ARG_ENABLE(extra-opts,
159 AC_HELP_STRING([--enable-extra-opts], 175 AC_HELP_STRING([--enable-extra-opts],
@@ -162,9 +178,11 @@ AC_ARG_ENABLE(extra-opts,
162 [enable_extra_opts=no]) 178 [enable_extra_opts=no])
163AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"]) 179AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
164if test "$enable_extra_opts" = "yes" ; then 180if test "$enable_extra_opts" = "yes" ; then
165 EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
166 AC_SUBST(EXTRA_TEST)
167 AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.]) 181 AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
182 if test "$enable_libtap" = yes; then
183 EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
184 AC_SUBST(EXTRA_TEST)
185 fi
168fi 186fi
169 187
170dnl Check for PostgreSQL libraries 188dnl 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
1589 AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?) 1607 AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?)
1590fi 1608fi
1591 1609
1592AC_ARG_ENABLE(libtap,
1593 AC_HELP_STRING([--enable-libtap],
1594 [Enables configuring of libtap in external/tap/. Run "make tap" to compile (default: no)]),
1595 [enable_libtap=$enableval],
1596 [enable_libtap=no])
1597dnl Have to define TAP_DIR so that Makefile can pull it as an extra dist
1598TAP_DIR=external/tap-1.01
1599AC_SUBST(TAP_DIR)
1600if test "$enable_libtap" = yes; then
1601 dnl Have to have AC_CONFIG_SUBDIRS as a literal
1602 AC_CONFIG_SUBDIRS([external/tap-1.01])
1603 EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
1604 AC_SUBST(EXTRA_TEST)
1605fi
1606
1607AC_OUTPUT( 1610AC_OUTPUT(
1608 Makefile 1611 Makefile
1609 lib/Makefile 1612 lib/Makefile