From f16f93be3fd8d6e09074bbf8a3f38ac10dad23d4 Mon Sep 17 00:00:00 2001
From: Brandon Invergo <brandon@invergo.net>
Date: Sun, 19 May 2013 15:16:37 +0200
Subject: [PATCH] fix testing for db program

---
 configure    | 5 +++--
 configure.ac | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index ae8528a2..0baaf58a 100755
--- a/configure
+++ b/configure
@@ -2436,10 +2436,11 @@ $as_echo "no" >&6; }
 fi
 
 
-if [ "x$SQLITE" = "x" &&  "x$POSTGRES" = "x" ]; then
-   as_fn_error $? "SQLite or PostgreSQL is required" "$LINENO" 5
+if test "x$SQLITE" = x -a "x$POSTGRES" = "x"; then :
+  as_fn_error $? "SQLite or PostgreSQL is required" "$LINENO" 5
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python prefix" >&5
 $as_echo_n "checking for Python prefix... " >&6; }
 if ${pc_cv_python_prefix+:} false; then :
diff --git a/configure.ac b/configure.ac
index 874bf60a..6b423151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,9 +143,9 @@ AC_PROG_INSTALL
 # Check for a supported database program
 AC_PATH_PROG([SQLITE], [sqlite3])
 AC_PATH_PROG([POSTGRES], [postgres])
-if [[ "x$SQLITE" = "x" &&  "x$POSTGRES" = "x" ]]; then
-   AC_MSG_ERROR([SQLite or PostgreSQL is required])
-fi
+AS_IF([test "x$SQLITE" = x -a "x$POSTGRES" = "x"],
+   [AC_MSG_ERROR([SQLite or PostgreSQL is required])])
+
 
 dnl--PC_PYTHON_SITE_PACKAGE_DIR---------------------------------------
 dnl This uses PYTHON_SITE_DIR to construct a directory for this