diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 25 insertions, 11 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 11259 . +# From configure.in Revision: 11312 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -1713,15 +1713,16 @@ if test "${with_mysql+set}" = set; then withval=$with_mysql; if test "$withval" = "no" ; then want_mysql="no" - elif test "$withval" = "yes" ; then - want_mysql="yes" else want_mysql="yes" - MYSQL_CONFIG_HOME="$withval" + require_mysql="yes" + if test "$withval" != "yes" ; then + MYSQL_CONFIG_HOME="$withval" + fi fi else - want_mysql="yes" + want_mysql="yes" require_mysql="no" fi @@ -1736,15 +1737,16 @@ if test "${with_pcre+set}" = set; then withval=$with_pcre; if test "$withval" = "no" ; then want_pcre="no" - elif test "$withval" = "yes" ; then - want_pcre="yes" else want_pcre="yes" - PCRE_HOME="$withval" + require_pcre="yes" + if test "$withval" != "yes" ; then + PCRE_HOME="$withval" + fi fi else - want_pcre="yes" + want_pcre="yes" require_pcre="no" fi @@ -3861,8 +3863,14 @@ echo "$as_me: error: $MYSQL_CONFIG_HOME reported that MySQL was compiled in 64bi else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: disabling MySQL (optional)" >&5 + if test "$require_mysql" = "yes" ; then + { { echo "$as_me:$LINENO: error: MySQL not found (requested)" >&5 +echo "$as_me: error: MySQL not found (requested)" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: disabling MySQL (optional)" >&5 echo "$as_me: disabling MySQL (optional)" >&6;} + fi fi fi @@ -4034,8 +4042,14 @@ echo "${ECHO_T}yes" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: disabling PCRE (optional)" >&5 + if test "$require_pcre" = "yes" ; then + { { echo "$as_me:$LINENO: error: PCRE not found (requested)" >&5 +echo "$as_me: error: PCRE not found (requested)" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: disabling PCRE (optional)" >&5 echo "$as_me: disabling PCRE (optional)" >&6;} + fi fi fi |