diff options
author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 15:16:37 +0200 |
---|---|---|
committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 15:16:37 +0200 |
commit | f16f93be3fd8d6e09074bbf8a3f38ac10dad23d4 (patch) | |
tree | 3e6641996b36b691944dca00427e0234b418d4d3 | |
parent | 0a2eecf8817330219bb9de08f5c98d0278d3a7ea (diff) | |
download | mediagoblin-f16f93be3fd8d6e09074bbf8a3f38ac10dad23d4.tar.lz mediagoblin-f16f93be3fd8d6e09074bbf8a3f38ac10dad23d4.tar.xz mediagoblin-f16f93be3fd8d6e09074bbf8a3f38ac10dad23d4.zip |
fix testing for db program
-rwxr-xr-x | configure | 5 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -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 |