diff --git a/configure.ac b/configure.ac
index 420021f628ab81d61a4e898fe1acdc6c3d173f2a..5f778027b601b44d25473a1bae31d88c24db816a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
- [sh@tokkee.org],
+ [sysdb@sysdb.io],
[sysdb],
[sysdb],
- [http://git.tokkee.org/?p=sysdb.git])
-PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <sh@tokkee.org>"
+ [http://sysdb.io/])
+PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <tokkee@sysdb.io>"
AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
[Define to the name of the maintainer of this package.])
AC_CONFIG_SRCDIR([src/sysdb.c])
AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
[Define to the name of the maintainer of this package.])
AC_CONFIG_SRCDIR([src/sysdb.c])
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AM_PROG_AR
+m4_ifdef([AM_PROG_AR],[AM_PROG_AR],[])
AM_PROG_CC_C_O
AM_PROG_LEX
AM_PROG_CC_C_O
AM_PROG_LEX
dnl Testing.
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
dnl Testing.
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
- [build_testing="yes"], [build_testing="no"])
+ [unit_tests="yes"], [unit_tests="no"])
AC_CHECK_HEADERS(libgen.h)
AC_CHECK_HEADERS(libgen.h)
have_xmlto="no"
build_documentation="no (missing xmlto)"
fi
have_xmlto="no"
build_documentation="no (missing xmlto)"
fi
+AC_SUBST([XMLTO])
-have_xsltproc="yes"
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-if test "x$XSLTPROC" = "x"; then
- have_xsltproc="no"
- build_documentation="no (missing xsltproc)"
+have_asciidoc="yes"
+AC_PATH_PROG([ASCIIDOC], [asciidoc])
+if test "x$ASCIIDOC" = "x"; then
+ have_asciidoc="no"
+ build_documentation="no (missing asciidoc)"
fi
fi
+AC_SUBST([ASCIIDOC])
-have_a2x="yes"
-AC_PATH_PROG([A2X], [a2x])
-if test "x$A2X" = "x"; then
- have_a2x="no"
- build_documentation="no (missing a2x)"
+AC_ARG_VAR([ADOCFLAGS], [AsciiDoc flags])
+
+integration_tests="yes"
+AC_PATH_PROG([VALGRIND], [valgrind])
+if test "x$VALGRIND" = "x"; then
+ integration_tests="no (missing valgrind)"
fi
fi
-AC_SUBST([A2X])
+AM_CONDITIONAL([INTEGRATION_TESTING], test "x$integration_tests" = "xyes")
dnl Plugin checks.
puppet_storeconfigs_default=$with_libdbi
dnl Plugin checks.
puppet_storeconfigs_default=$with_libdbi
[plugin logging to syslog])
AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes")
[plugin logging to syslog])
AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes")
-AM_CONDITIONAL([BUILD_TESTING], test "x$build_testing" = "xyes")
+AM_CONDITIONAL([UNIT_TESTING], test "x$unit_tests" = "xyes")
AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile
src/liboconfig/Makefile t/Makefile])
AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile
src/liboconfig/Makefile t/Makefile])
AC_MSG_RESULT([ build date: $BUILD_DATE])
AC_MSG_RESULT()
AC_MSG_RESULT([ Tools:])
AC_MSG_RESULT([ build date: $BUILD_DATE])
AC_MSG_RESULT()
AC_MSG_RESULT([ Tools:])
-AC_MSG_RESULT([ AsciiDoc (a2x): . . . . . . $have_a2x])
-AC_MSG_RESULT([ xmlto / xsltproc: . . . . . $have_xmlto / $have_xsltproc])
+AC_MSG_RESULT([ AsciiDoc: . . . . . . . . . $have_asciidoc])
+AC_MSG_RESULT([ xmlto: . . . . . . . . . . $have_xmlto])
AC_MSG_RESULT()
AC_MSG_RESULT([ Features:])
AC_MSG_RESULT([ documentation: . . . . . . $build_documentation])
AC_MSG_RESULT()
AC_MSG_RESULT([ Features:])
AC_MSG_RESULT([ documentation: . . . . . . $build_documentation])
-AC_MSG_RESULT([ unit testing: . . . . . . . $build_testing])
+AC_MSG_RESULT([ unit testing: . . . . . . . $unit_tests])
AC_MSG_RESULT([ stdio mocking: . . . . . $have_fopencookie])
AC_MSG_RESULT([ coverage testing: . . . . . $enable_gcov])
AC_MSG_RESULT([ stdio mocking: . . . . . $have_fopencookie])
AC_MSG_RESULT([ coverage testing: . . . . . $enable_gcov])
+AC_MSG_RESULT([ integration testing: . . . $integration_tests])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
AC_MSG_RESULT([ libdbi: . . . . . . . . . . $with_libdbi])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
AC_MSG_RESULT([ libdbi: . . . . . . . . . . $with_libdbi])