Browse Source

[3413] sqlite scripts removed.

Tomek Mrugalski 11 years ago
parent
commit
a4e148e849
4 changed files with 0 additions and 75 deletions
  1. 0 12
      configure.ac
  2. 0 1
      m4macros/Makefile.am
  3. 0 20
      m4macros/ax_python_sqlite3.m4
  4. 0 42
      m4macros/ax_sqlite3_for_bind10.m4

+ 0 - 12
configure.ac

@@ -1242,13 +1242,6 @@ if test "x$HAVE_PKG_CONFIG" = "xno" ; then
   AC_MSG_ERROR(Please install pkg-config)
   AC_MSG_ERROR(Please install pkg-config)
 fi
 fi
 
 
-AX_SQLITE3_FOR_BIND10
-if test "x$have_sqlite" = "xyes" ; then
-  enable_features="$enable_features SQLite3"
-
-  AX_PYTHON_SQLITE3
-fi
-
 #
 #
 # ASIO: we extensively use it as the C++ event management module.
 # ASIO: we extensively use it as the C++ event management module.
 #
 #
@@ -1567,11 +1560,6 @@ Log4cplus:
   LOG4CPLUS_INCLUDES: ${LOG4CPLUS_INCLUDES}
   LOG4CPLUS_INCLUDES: ${LOG4CPLUS_INCLUDES}
   LOG4CPLUS_LIBS:  ${LOG4CPLUS_LIBS}
   LOG4CPLUS_LIBS:  ${LOG4CPLUS_LIBS}
 
 
-SQLite:
-  SQLITE_VERSION:  ${SQLITE_VERSION}
-  SQLITE_CFLAGS:   ${SQLITE_CFLAGS}
-  SQLITE_LIBS:     ${SQLITE_LIBS}
-
 Kea config backend:
 Kea config backend:
   CONFIG_BACKEND: ${CONFIG_BACKEND}
   CONFIG_BACKEND: ${CONFIG_BACKEND}
 END
 END

+ 0 - 1
m4macros/Makefile.am

@@ -1,2 +1 @@
 EXTRA_DIST  = ax_boost_for_bind10.m4
 EXTRA_DIST  = ax_boost_for_bind10.m4
-EXTRA_DIST += ax_sqlite3_for_bind10.m4

+ 0 - 20
m4macros/ax_python_sqlite3.m4

@@ -1,20 +0,0 @@
-dnl @synopsis AX_PYTHON_SQLITE3
-dnl
-dnl Test for the Python sqlite3 module used by BIND10's datasource
-dnl
-
-AC_DEFUN([AX_PYTHON_SQLITE3], [
-
-# Check for the python sqlite3 module
-AC_MSG_CHECKING(for python sqlite3 module)
-if "$PYTHON" -c 'import sqlite3' 2>/dev/null ; then
-    AC_MSG_RESULT(ok)
-else
-    AC_MSG_RESULT(missing)
-
-    if test "x$want_dns" = "xyes" ; then
-        AC_MSG_ERROR([Missing sqlite3 python module that is required by DNS components.])
-    fi
-fi
-
-])dnl AX_PYTHON_SQLITE3

+ 0 - 42
m4macros/ax_sqlite3_for_bind10.m4

@@ -1,42 +0,0 @@
-dnl @synopsis AX_SQLITE3_FOR_BIND10
-dnl
-dnl Test for the sqlite3 library and program, intended to be used within
-dnl BIND 10, and to test BIND 10.
-dnl
-dnl We use pkg-config to look for the sqlite3 library, so the sqlite3
-dnl development package with the .pc file must be installed.
-dnl
-dnl This macro sets SQLITE_CFLAGS and SQLITE_LIBS. It also sets
-dnl SQLITE3_PROGRAM to the path of the sqlite3 program, if it is found
-dnl in PATH.
-
-AC_DEFUN([AX_SQLITE3_FOR_BIND10], [
-
-PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9,
-    [have_sqlite="yes"
-dnl Determine the SQLite version, used mainly for config.report.
-CPPFLAGS_SAVED="$CPPFLAGS"
-CPPFLAGS="${CPPFLAGS} $SQLITE_CFLAGS"
-AC_MSG_CHECKING([SQLite version])
-cat > conftest.c << EOF
-#include <sqlite3.h>
-AUTOCONF_SQLITE_VERSION=SQLITE_VERSION
-EOF
-
-SQLITE_VERSION=`$CPP $CPPFLAGS conftest.c | grep '^AUTOCONF_SQLITE_VERSION=' | $SED -e 's/^AUTOCONF_SQLITE_VERSION=//' -e 's/"//g' 2> /dev/null`
-if test -z "$SQLITE_VERSION"; then
-  SQLITE_VERSION="unknown"
-fi
-$RM -f conftest.c
-AC_MSG_RESULT([$SQLITE_VERSION])
-
-CPPFLAGS="$CPPFLAGS_SAVED"
-    ],have_sqlite="no (sqlite3 not detected)")
-
-# Check for sqlite3 program
-AC_PATH_PROG(SQLITE3_PROGRAM, sqlite3, no)
-AM_CONDITIONAL(HAVE_SQLITE3_PROGRAM, test "x$SQLITE3_PROGRAM" != "xno")
-
-# TODO: check for _sqlite3.py module
-
-])dnl AX_SQLITE3_FOR_BIND10