Skip to content

Commit

Permalink
Revert "[13] workaround for MacOS X+homebrew: add specific pkg-config…
Browse files Browse the repository at this point in the history
… path for sqlite3."

This reverts commit d575ac3.
  • Loading branch information
cstrotm committed May 15, 2014
1 parent c098fef commit c708599
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
2 changes: 0 additions & 2 deletions configure.ac
Expand Up @@ -1294,8 +1294,6 @@ if test "x$have_sqlite" = "xyes" ; then
enable_features="$enable_features SQLite3"

AX_PYTHON_SQLITE3
else
AC_MSG_ERROR([Currently SQLite3 is mandatory to build Bundy. If it's installed under some uncommon path, it may help to set PKG_CONFIG_PATH so it includes the directory that contains sqlite3.pc])
fi

#
Expand Down
13 changes: 0 additions & 13 deletions m4macros/ax_sqlite3_for_bundy.m4
Expand Up @@ -12,17 +12,6 @@ dnl in PATH.

AC_DEFUN([AX_SQLITE3_FOR_BUNDY], [
# A special workaround for MacOS X + Homebrew: some latest versions of the OS
# have its own sqlite3 without its developer tools (header files and library),
# so Homebrew installs its own sqlite3 under an uncommon path that pkg-config
# do not search by default. System specific hack like this is bad, but we
# don't want to force users to struggle for purism.
SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
if test -d /usr/local/opt/sqlite/lib/pkgconfig; then
PKG_CONFIG_PATH=/usr/local/opt/sqlite/lib/pkgconfig:${SAVED_PKG_CONFIG_PATH}
export PKG_CONFIG_PATH
fi
PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9,
[have_sqlite="yes"
dnl Determine the SQLite version, used mainly for config.report.
Expand Down Expand Up @@ -50,6 +39,4 @@ AM_CONDITIONAL(HAVE_SQLITE3_PROGRAM, test "x$SQLITE3_PROGRAM" != "xno")
# TODO: check for _sqlite3.py module
PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
])dnl AX_SQLITE3_FOR_BUNDY

0 comments on commit c708599

Please sign in to comment.