diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-20 07:03:55 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-20 07:03:55 -0700 |
| commit | 26da3271f6e6a880c0418998d5a4e5e71081e1f7 (patch) | |
| tree | 3cd4ccf579f1e1bf8aba0704cdd660de8a110d3e /configure.ac | |
| parent | d4ae4c9f971b5795f1697f443b359d3155a16013 (diff) | |
| download | mediagoblin-26da3271f6e6a880c0418998d5a4e5e71081e1f7.tar.lz mediagoblin-26da3271f6e6a880c0418998d5a4e5e71081e1f7.tar.xz mediagoblin-26da3271f6e6a880c0418998d5a4e5e71081e1f7.zip | |
This patch checks for libs instead of programs in configure.ac for sqlite3 and postgesql.
Patch submitted by amirouche
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e56a55a5..95930639 100644 --- a/configure.ac +++ b/configure.ac @@ -144,13 +144,16 @@ 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 -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])]) +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_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 |