diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-20 07:52:12 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-20 07:52:12 -0700 |
| commit | c62d174437445565b55b220396e7571a323a159c (patch) | |
| tree | 5697343156601d0b7c787cd1d953e654fd353f9c /configure.ac | |
| parent | 9041552676d8fc7e8026a55daf0e262ec048771e (diff) | |
| download | mediagoblin-c62d174437445565b55b220396e7571a323a159c.tar.lz mediagoblin-c62d174437445565b55b220396e7571a323a159c.tar.xz mediagoblin-c62d174437445565b55b220396e7571a323a159c.zip | |
Oops, this accidently slipped in there
Revert "This patch checks for libs instead of programs in configure.ac for sqlite3 and postgesql."
This reverts commit 26da3271f6e6a880c0418998d5a4e5e71081e1f7.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 95930639..e56a55a5 100644 --- a/configure.ac +++ b/configure.ac @@ -144,17 +144,14 @@ dnl---- dnl AC_PROG_MKDIR_P AC_PROG_INSTALL -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) -AS_IF([test "x$HAVE_PKG_CONFIG" = "x"], - [AC_MSG_ERROR([you need pkg-config])]) # Check for a supported database program -PKG_CHECK_EXISTS([sqlite3], HAVE_SQLITE3="yes") -PKG_CHECK_EXISTS([pq], HAVE_PQ="yes") - -AS_IF([test "x$HAVE_SQLITE3" = "x" -a "x$HAVE_PQ" = "x"], +AC_PATH_PROG([SQLITE], [sqlite3]) +AC_PATH_PROG([POSTGRES], [postgres]) +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 dnl project (ie $PYTHON_SITE_DIR/project_name) and stores it in |