Date: Monday, March 27, 2006 @ 11:52:38
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: Makefile.am (1.10 -> 1.11) configure.ac (1.7 -> 1.8)
test/Makefile.am (1.7 -> 1.8)
The following options are disabled by default:
- disable-gcov
- disable-doxygen
- disable-cppunit
Fix for LMS-1
------------------+
Makefile.am | 12 +++++++++---
configure.ac | 40 ++++++++++++++++++++++++----------------
test/Makefile.am | 2 +-
3 files changed, 34 insertions(+), 20 deletions(-)
Index: libmysequoia/Makefile.am
diff -u libmysequoia/Makefile.am:1.10 libmysequoia/Makefile.am:1.11
--- libmysequoia/Makefile.am:1.10 Fri Mar 10 11:28:11 2006
+++ libmysequoia/Makefile.am Mon Mar 27 11:52:38 2006
@@ -44,6 +44,7 @@
DOC_OUT_PDF = $(DOC_DIR)/latex
DOXYGEN = @DOXYGEN@
+if DOXYGEN_ENABLED
doc: $(DOC_HTML)
make -C $(DOC_OUT_PDF)
@echo ""
@@ -53,8 +54,13 @@
$(DOC_HTML): $(DOXYFILE)
$(DOXYGEN) $(DOXYFILE)
+else
+.PHONY: doc
+doc:
+ @echo "You must enable at configure time: ./configure --enable-doxygen"
+endif
-if GCOV
+if GCOV_ENABLED
lcov: check
rm -rf $(LCOV_TMP)
$(mkinstalldirs) $(LCOV_TMP)
@@ -74,8 +80,8 @@
@echo "Type \"firefox $(LCOV_HTML)/index.html\" to see the results."
@echo ""
else
-lcov: check
- @echo ""
+.PHONY: lcov
+lcov:
@echo "You must enable at configure time: ./configure --enable-gcov"
endif
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.7 libmysequoia/configure.ac:1.8
--- libmysequoia/configure.ac:1.7 Wed Mar 15 19:06:23 2006
+++ libmysequoia/configure.ac Mon Mar 27 11:52:38 2006
@@ -23,12 +23,10 @@
# Check for cppunit
AC_ARG_ENABLE(cppunit, AC_HELP_STRING([--enable-cppunit], [enable test
excution with cppunit]))
-enable_tests=yes
+enable_tests=no
-if test "x$enable_cppunit" = xno;
+if test "x$enable_cppunit" = xyes;
then
- enable_tests=no
-else
AC_CHECK_PROG(CPPUNIT_CONFIG, cppunit-config, yes, no)
if test "x$CPPUNIT_CONFIG" = "xyes"
then
@@ -40,20 +38,18 @@
AC_MSG_ERROR([You need to install the CppUnit testing package])
fi
- AC_CHECK_HEADER([cppunit/TestFixture.h],, enable_tests=no)
+ AC_CHECK_HEADER([cppunit/TestFixture.h], enable_tests=yes,
enable_tests=no)
fi
-AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)
+AM_CONDITIONAL(TESTS_ENABLED, test x$enable_tests = xyes)
# Check for lcov
AC_ARG_ENABLE(gcov, AC_HELP_STRING([--enable-gcov], [turn on code coverage
analysis tools]))
-enable_code_coverage=yes
+enable_code_coverage=no
-if test "x$enable_gcov" = "xno";
+if test "x$enable_gcov" = "xyes";
then
- enable_code_coverage=no
-else
AC_PATH_PROG(LCOV, lcov, no)
if test "x$LCOV" = "xno"; then
AC_MSG_ERROR([You need to install the lcov package])
@@ -64,11 +60,13 @@
AC_MSG_ERROR([You need to install the lcov package])
fi
- GCOV_CFLAGS="-fprofile-arcs -ftest-coverage"
- GCOV_LDADD="-lgcov"
+ GCOV_CFLAGS="-fprofile-arcs -ftest-coverage"
+ GCOV_LDADD="-lgcov"
+
+ enable_code_coverage=yes
fi
-AM_CONDITIONAL(GCOV, test x$enable_code_coverage = xyes)
+AM_CONDITIONAL(GCOV_ENABLED, test x$enable_code_coverage = xyes)
AC_SUBST(LCOV)
AC_SUBST(GENHTML)
@@ -76,10 +74,20 @@
AC_SUBST(GCOV_LDADD)
# Check for doxygen
-AC_PATH_PROG(DOXYGEN, doxygen, no)
-if test "x$DOXYGEN" = "xno"; then
- AC_MSG_ERROR([You need to install the doxygen package])
+AC_ARG_ENABLE(doxygen, AC_HELP_STRING([--enable-doxygen], [turn on generating
documentation]))
+
+enable_doxygen_support=no
+
+if test "x$enable_doxygen" = "xyes";
+then
+ AC_PATH_PROG(DOXYGEN, doxygen, no)
+ if test "x$DOXYGEN" = "xno"; then
+ AC_MSG_ERROR([You need to install the doxygen package])
+ fi
+ enable_doxygen_support=yes
fi
+AM_CONDITIONAL(DOXYGEN_ENABLED, test x$enable_doxygen_support = xyes)
+
AC_SUBST(DOXYGEN)
# Check for Carob headers and library
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.7 libmysequoia/test/Makefile.am:1.8
--- libmysequoia/test/Makefile.am:1.7 Mon Feb 13 13:26:25 2006
+++ libmysequoia/test/Makefile.am Mon Mar 27 11:52:38 2006
@@ -20,7 +20,7 @@
# Makefile for LibMySequoia and tests
#
-if TESTS
+if TESTS_ENABLED
check_PROGRAMS = runTests
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
