heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oops, this accidently slipped in there

Browse Source 
Revert "This patch checks for libs instead of programs in configure.ac for sqlite3 and postgesql."

This reverts commit 26da3271f6e6a880c0418998d5a4e5e71081e1f7.
This commit is contained in:
Rodney Ewing 2013-08-20 07:52:12 -07:00
parent 9041552676
commit c62d174437
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -144,17 +144,14 @@ dnl----
dnl dnl
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
AC_PROG_INSTALL 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 # Check for a supported database program
PKG_CHECK_EXISTS([sqlite3], HAVE_SQLITE3="yes") AC_PATH_PROG([SQLITE], [sqlite3])
PKG_CHECK_EXISTS([pq], HAVE_PQ="yes") AC_PATH_PROG([POSTGRES], [postgres])
AS_IF([test "x$SQLITE" = x -a "x$POSTGRES" = "x"],
AS_IF([test "x$HAVE_SQLITE3" = "x" -a "x$HAVE_PQ" = "x"],
[AC_MSG_ERROR([SQLite or PostgreSQL is required])]) [AC_MSG_ERROR([SQLite or PostgreSQL is required])])
dnl--PC_PYTHON_SITE_PACKAGE_DIR--------------------------------------- dnl--PC_PYTHON_SITE_PACKAGE_DIR---------------------------------------
dnl This uses PYTHON_SITE_DIR to construct a directory for this dnl This uses PYTHON_SITE_DIR to construct a directory for this
dnl project (ie $PYTHON_SITE_DIR/project_name) and stores it in dnl project (ie $PYTHON_SITE_DIR/project_name) and stores it in