Revision: 2044
http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2044&view=rev
Author: tonvoon
Date: 2008-08-21 21:52:05 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Only include extra-opts tests if libtap is enabled
Modified Paths:
--------------
nagiosplug/trunk/configure.in
Modified: nagiosplug/trunk/configure.in
===================================================================
--- nagiosplug/trunk/configure.in 2008-08-21 15:21:11 UTC (rev 2043)
+++ nagiosplug/trunk/configure.in 2008-08-21 21:52:05 UTC (rev 2044)
@@ -154,6 +154,22 @@
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 @@
[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 @@
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.