diff --git a/configure.in b/configure.in
index 57e438c5821d7fd49e1af22d5b08727494e9cc4b..c047b12d7fe3d020954ef40953d47b054776e2fa 100644 (file)
--- a/configure.in
+++ b/configure.in
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.13)
+AC_INIT(nagios-plugins,1.4.14)
AC_CONFIG_SRCDIR(NPTest.pm)
AC_CONFIG_FILES(gl/Makefile)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_SRCDIR(NPTest.pm)
AC_CONFIG_FILES(gl/Makefile)
AC_CONFIG_AUX_DIR(build-aux)
AC_SUBST(REV_TIMESTAMP)
dnl Check if version file is present
AC_SUBST(REV_TIMESTAMP)
dnl Check if version file is present
-AM_CONDITIONAL([RELEASE_PRESENT], [test -f release])
+AM_CONDITIONAL([RELEASE_PRESENT], [test -f $srcdir/release])
+
+# Also read in the version from it
+if test -f $srcdir/release; then
+ NP_RELEASE="$(<release)"
+else
+ NP_RELEASE="$PACKAGE_VERSION"
+fi
+AC_SUBST(NP_RELEASE)
dnl Checks for programs.
AC_PATH_PROG(PYTHON,python)
dnl Checks for programs.
AC_PATH_PROG(PYTHON,python)
if test "$enable_extra_opts" = "yes" ; then
AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
if test "$enable_libtap" = "yes"; then
if test "$enable_extra_opts" = "yes" ; then
AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
if test "$enable_libtap" = "yes"; then
- EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2 test_opts3"
+ EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3"
AC_SUBST(EXTRA_TEST)
fi
fi
AC_SUBST(EXTRA_TEST)
fi
fi
fi
fi
-if test -f plugins/check_nt.c ; then
- EXTRAS="$EXTRAS check_nt"
-elif test -f ../plugins/check_nt.c ; then
+if test -f $srcdir/plugins/check_nt.c ; then
EXTRAS="$EXTRAS check_nt"
fi
EXTRAS="$EXTRAS check_nt"
fi