diff options
| author | Michele Calgaro <[email protected]> | 2024-10-17 17:11:53 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-10-29 21:58:43 +0900 |
| commit | 40fbabf0fe3486a8e91f3caf2fbb40e341ba69aa (patch) | |
| tree | 858bd532d394f08fe82b35ba2895a44501e16370 /src/configure.in.in | |
| parent | 54c9cce803be42c31e10d5865656cf8d38eb2ef6 (diff) | |
| download | krecipes-40fbabf0fe3486a8e91f3caf2fbb40e341ba69aa.tar.gz krecipes-40fbabf0fe3486a8e91f3caf2fbb40e341ba69aa.zip | |
Remove check for obsolete sqlite support. Check only for aqlite3
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit d572a3f536f3cb283303c161095c5e83d4dc27da)
Diffstat (limited to 'src/configure.in.in')
| -rw-r--r-- | src/configure.in.in | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/configure.in.in b/src/configure.in.in index 530b8f1..7c5ffe9 100644 --- a/src/configure.in.in +++ b/src/configure.in.in @@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE(krecipes, 0.8) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN -AC_ARG_WITH(sqlite, AC_HELP_STRING([--without-sqlite], [Don't compile SQLite backend support]), , with_sqlite=yes) +AC_ARG_WITH(sqlite3, AC_HELP_STRING([--without-sqlite3], [Don't compile SQLite3 backend support]), , with_sqlite3=yes) AC_ARG_WITH(mysql, AC_HELP_STRING([--without-mysql], [Don't compile MySQL backend support]), , with_mysql=yes) AC_ARG_WITH(postgresql, AC_HELP_STRING([--without-postgresql], [Don't compile PostgreSQL backend support]), , with_postgresql=yes) @@ -35,27 +35,12 @@ fi dnl ------ Check for the SQLite headers ----- -AC_DEFUN([AC_HAVE_SQLITE], -[ - AC_DEFINE(HAVE_SQLITE, 1, [have SQLite]) - have_sqlite=true - SQLITE_LIB="-lsqlite" - AC_SUBST(SQLITE_LIB) -]) - -AC_DEFUN([AC_NO_SQLITE], -[ - AC_DEFINE(HAVE_SQLITE, 0, [have SQLite]) - have_sqlite=false -]) - AC_DEFUN([AC_HAVE_SQLITE3], [ AC_DEFINE(HAVE_SQLITE3, 1, [have SQLite3]) have_sqlite3=true - AC_NO_SQLITE - SQLITE_LIB="-lsqlite3" - AC_SUBST(SQLITE_LIB) + SQLITE_LIB3="-lsqlite3" + AC_SUBST(SQLITE_LIB3) ]) AC_DEFUN([AC_NO_SQLITE3], @@ -64,32 +49,23 @@ AC_DEFUN([AC_NO_SQLITE3], have_sqlite3=false ]) -if test "x$with_sqlite" != "xno"; then +if test "x$with_sqlite3" != "xno"; then KDE_CHECK_HEADER(sqlite3.h, AC_HAVE_SQLITE3, AC_NO_SQLITE3 ) - - if test "x$have_sqlite3" = "xfalse"; then - KDE_CHECK_HEADER(sqlite.h, - AC_HAVE_SQLITE, - AC_NO_SQLITE - ) - fi - else - AC_NO_SQLITE AC_NO_SQLITE3 fi dnl ----------- Should I link or should I not link? --------- AM_CONDITIONAL(link_lib_MYSQL, test x$have_mysql = xtrue) AM_CONDITIONAL(link_lib_POSTGRESQL, test x$have_postgresql = xtrue) -AM_CONDITIONAL(link_lib_SQLITE, test x$have_sqlite = xtrue || test x$have_sqlite3 = xtrue) +AM_CONDITIONAL(link_lib_SQLITE, test x$have_sqlite3 = xtrue) dnl ----------- Should Krecipes be built at all? ------------ if test "x$have_mysql" = "xfalse" && test "x$have_postgresql" = "xfalse"; then - if test "x$have_sqlite" = "xfalse" && test "x$have_sqlite3" = "xfalse"; then + if test "x$have_sqlite3" = "xfalse"; then DO_NOT_COMPILE="$DO_NOT_COMPILE krecipes" will_not_build_krecipes=true fi |