diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
| commit | d5d73d514946ea4a7f5691f46c4d6b9c2776f59d (patch) | |
| tree | 68654da6eedf2c05681a5f8df1553fd88d179271 /configure.ac | |
| parent | 0555d96193b6d9c39c26a04941c6087e4465adf0 (diff) | |
Some fixes inspired by Fedora 15:
* compilation fixes for GCC 4.6.x
+ ptrdiff_t is now in std::
* fix some make rules that are ok in Make 3.81 but broke in Make 3.82
* look for cxxtestgen.py as well as cxxtestgen.pl, and look for cxxtest headers in /usr/include
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ff150844f..f6f2f5a04 100644 --- a/configure.ac +++ b/configure.ac @@ -629,17 +629,24 @@ fi CXXTESTGEN= AC_PATH_PROG(CXXTESTGEN, cxxtestgen.pl, [], [$CXXTEST:$PATH]) if test -z "$CXXTESTGEN"; then - AC_MSG_NOTICE([unit tests disabled, cxxtestgen.pl not found.]) + AC_PATH_PROG(CXXTESTGEN, cxxtestgen.py, [], [$CXXTEST:$PATH]) +fi +if test -z "$CXXTESTGEN"; then + AC_MSG_NOTICE([unit tests disabled, neither cxxtestgen.pl nor cxxtestgen.py found.]) elif test -z "$CXXTEST"; then CXXTEST=`dirname "$CXXTESTGEN"` AC_MSG_CHECKING([for location of CxxTest headers]) if test -e "$CXXTEST/cxxtest/TestRunner.h"; then AC_MSG_RESULT([$CXXTEST]) else - AC_MSG_RESULT([not found]) - AC_MSG_WARN([unit tests disabled, CxxTest headers not found.]) - CXXTESTGEN= - CXXTEST= + if test -e "/usr/include/cxxtest/TestRunner.h"; then + AC_MSG_RESULT([/usr/include]) + else + AC_MSG_RESULT([not found]) + AC_MSG_WARN([unit tests disabled, CxxTest headers not found.]) + CXXTESTGEN= + CXXTEST= + fi fi fi |