fix testing for db program
authorBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 13:16:37 +0000 (15:16 +0200)
committerBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 13:16:37 +0000 (15:16 +0200)
configure
configure.ac

index ae8528a24844d2d3db8e999a9b04cd98e67c4699..0baaf58ade5c3ab63ab3efa6cd7689c509dbd726 100755 (executable)
--- 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 :
index 874bf60a02dd5321186a69393e845edbce48e4ec..6b423151ed596aea5bf93a60ab075353ce3d1349 100644 (file)
@@ -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