diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-09-05 18:54:58 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-09-05 18:54:58 +0000 |
| commit | 58829581f8287f1590889b0e59a78f9615ffa2af (patch) | |
| tree | 1390aec13ccb727ea844df43d5d21cdce12dfdbd | |
| parent | 5bc561a16a8515736d4ed59f5871dc78d1a75f75 (diff) | |
| download | postgresql-58829581f8287f1590889b0e59a78f9615ffa2af.tar.gz postgresql-58829581f8287f1590889b0e59a78f9615ffa2af.zip | |
Check for gcov and lcov only when coverage testing is enabled.
| -rwxr-xr-x | configure | 37 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 22 insertions, 23 deletions
diff --git a/configure b/configure index 6f87fba2680..b214acac897 100755 --- a/configure +++ b/configure @@ -2484,25 +2484,7 @@ if test "${enable_coverage+set}" = set; then enableval=$enable_coverage; case $enableval in yes) - : - ;; - no) - : - ;; - *) - { { echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5 -echo "$as_me: error: no argument expected for --enable-coverage option" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - -else - enable_coverage=no - -fi - - -for ac_prog in gcov + for ac_prog in gcov do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2643,6 +2625,23 @@ if test -z "$GENHTML"; then echo "$as_me: error: genhtml not found" >&2;} { (exit 1); exit 1; }; } fi + ;; + no) + : + ;; + *) + { { echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5 +echo "$as_me: error: no argument expected for --enable-coverage option" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + +else + enable_coverage=no + +fi + + # diff --git a/configure.in b/configure.in index 97c220c5c18..8e9abdcd3a2 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.566 2008/09/05 12:11:18 petere Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.567 2008/09/05 18:54:58 petere Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -207,8 +207,8 @@ AC_SUBST(enable_profiling) # --enable-coverage enables generation of code coverage metrics with gcov # PGAC_ARG_BOOL(enable, coverage, no, - [ --enable-coverage build with coverage testing instrumentation]) -AC_CHECK_PROGS(GCOV, gcov) + [ --enable-coverage build with coverage testing instrumentation], +[AC_CHECK_PROGS(GCOV, gcov) if test -z "$GCOV"; then AC_MSG_ERROR([gcov not found]) fi @@ -219,7 +219,7 @@ fi AC_CHECK_PROGS(GENHTML, genhtml) if test -z "$GENHTML"; then AC_MSG_ERROR([genhtml not found]) -fi +fi]) AC_SUBST(enable_coverage) # |