@@ -1,47 +1,53 @@

 dnl Check for PCRE

-dnl determine the home of pcre

 PCRE_HOME=""

+dnl handle the --with-pcre flag

 AC_ARG_WITH([pcre],

 [AS_HELP_STRING([--with-pcre@<:@=DIR@:>@], [path to directory containing libpcre library

                 @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

-  AC_MSG_CHECKING([for libpcre installation])

-  case "$withval" in

-  no)

-    AC_MSG_RESULT([no])

-    ;;

-  yes)

-    PCRE_HOME=/usr/local

-    if test ! -x "$PCRE_HOME/bin/pcre-config"; then

-      PCRE_HOME=/usr

-      if test ! -x "$PCRE_HOME/bin/pcre-config"; then

-        PCRE_HOME=""

-        AC_MSG_ERROR([cannot locate libpcre at /usr/local or /usr])

-      fi

-    fi

-    ;;

-  "")

-    AC_MSG_ERROR([cannot assign blank value to --with-pcre])

-    ;;

-  *)

-    PCRE_HOME="$withval"

+  PCRE_HOME=$withval

+],

+[

+dnl default ON if present

+  PCRE_HOME="yes"

+])

+

+dnl detemine if specified (or default) is valid

+AC_MSG_CHECKING([for libpcre installation])

+case "$PCRE_HOME" in

+no)

+  PCRE_HOME=""

+  AC_MSG_RESULT([no])

+  ;;

+yes)

+  PCRE_HOME=/usr/local

+  if test ! -x "$PCRE_HOME/bin/pcre-config"; then

+    PCRE_HOME=/usr

     if test ! -x "$PCRE_HOME/bin/pcre-config"; then

       PCRE_HOME=""

-      AC_MSG_ERROR([cannot locate libpcre at $withval])

+      AC_MSG_RESULT([no])

+      AC_MSG_NOTICE([cannot locate libpcre at /usr/local or /usr])

     fi

-    ;;

-  esac

-

-  if test "x$PCRE_HOME" != "x"; then

-    AC_MSG_RESULT([using $PCRE_HOME])

-  else

+  fi

+  ;;

+"")

+  AC_MSG_RESULT([])

+  AC_MSG_ERROR([cannot assign blank value to --with-pcre])

+  ;;

+*)

+  PCRE_HOME="$withval"

+  if test ! -x "$PCRE_HOME/bin/pcre-config"; then

+    PCRE_HOME=""

     AC_MSG_RESULT([not found])

+    AC_MSG_ERROR([cannot locate libpcre at $withval])

   fi

-],[

-dnl --with-pcre not specified

-  PCRE_HOME=""

-])

+  ;;

+esac

+

+if test "x$PCRE_HOME" != "x"; then

+  AC_MSG_RESULT([using $PCRE_HOME])

+fi

 dnl if pcre has a home, then check if it is valid and get flags

 found_pcre="no"

@@ -52,7 +58,7 @@ if test "x$PCRE_HOME" != "x"; then

   AC_MSG_CHECKING([pcre-config version])

   PCRECONF_VERSION="`$PCRE_HOME/bin/pcre-config --version`"

   if test "x%PCRECONF_VERSION" != "x"; then

-    AC_MSG_RESULT([$PCRECONF_VERSION"])

+    AC_MSG_RESULT([$PCRECONF_VERSION])

     found_pcre="yes"

     PCRE_CPPFLAGS="`$PCRE_HOME/bin/pcre-config --cflags`"

     PCRE_LIBS="`$PCRE_HOME/bin/pcre-config --libs`"