From d572a3f536f3cb283303c161095c5e83d4dc27da Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 17 Oct 2024 17:11:53 +0900 Subject: [PATCH] Remove check for obsolete sqlite support. Check only for aqlite3 Signed-off-by: Michele Calgaro --- config.h.in | 3 --- configure.in | 40 ++++++---------------------- src/Makefile.am | 2 +- src/backends/SQLite/literecipedb.cpp | 18 +++---------- src/backends/SQLite/literecipedb.h | 2 -- src/backends/recipedb.cpp | 10 +++---- src/configure.in.bot | 4 +-- src/configure.in.in | 36 +++++-------------------- src/dialogs/dbimportdialog.cpp | 2 +- src/pref.cpp | 2 -- src/setupwizard.cpp | 4 +-- 11 files changed, 29 insertions(+), 94 deletions(-) diff --git a/config.h.in b/config.h.in index f68e80a..bd4eef4 100644 --- a/config.h.in +++ b/config.h.in @@ -54,9 +54,6 @@ /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF -/* have SQLite */ -#undef HAVE_SQLITE - /* have SQLite3 */ #undef HAVE_SQLITE3 diff --git a/configure.in b/configure.in index be883de..b0429b1 100644 --- a/configure.in +++ b/configure.in @@ -87,7 +87,7 @@ dnl PACKAGE set before 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) @@ -115,27 +115,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], @@ -144,32 +129,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 @@ -227,7 +203,7 @@ fi echo "- -" -if test "x$have_sqlite" = "xtrue" || test "x$have_sqlite3" = "xtrue"; then +if test "x$have_sqlite3" = "xtrue"; then echo "- SQLite Found..................... YES -" else echo "- SQLite Found..................... NO -" @@ -247,7 +223,7 @@ echo "You can get SQLite from: http://www.hwaci.com/sw/sqlite/" echo "Or MySQL from: http://www.mysql.com" else if test "x$have_mysql" = "xtrue"; then - if test "x$have_sqlite" = "xtrue" || test "x$have_sqlite3" = "xtrue"; then + if test "x$have_sqlite3" = "xtrue"; then echo "- -" echo "- Fine, you can build Krecipes now -" echo "------------------------------------------------" diff --git a/src/Makefile.am b/src/Makefile.am index fdb8aa4..81e1ea4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LI # Check for optional libs if link_lib_SQLITE -qsqlite_libadds = backends/SQLite/libkrecsqlite.la $(SQLITE_LIB) +qsqlite_libadds = backends/SQLite/libkrecsqlite.la $(SQLITE_LIB3) endif if link_lib_MYSQL diff --git a/src/backends/SQLite/literecipedb.cpp b/src/backends/SQLite/literecipedb.cpp index 9531791..fa5577a 100644 --- a/src/backends/SQLite/literecipedb.cpp +++ b/src/backends/SQLite/literecipedb.cpp @@ -27,8 +27,6 @@ #if HAVE_SQLITE3 #include -#elif HAVE_SQLITE -#include #endif //keep these two around for porting old databases @@ -63,9 +61,7 @@ int LiteRecipeDB::lastInsertID() TQStringList LiteRecipeDB::backupCommand() const { - #if HAVE_SQLITE - TQString binary = "sqlite"; - #elif HAVE_SQLITE3 + #if HAVE_SQLITE3 TQString binary = "sqlite3"; #endif @@ -80,9 +76,7 @@ TQStringList LiteRecipeDB::backupCommand() const TQStringList LiteRecipeDB::restoreCommand() const { - #if HAVE_SQLITE - TQString binary = "sqlite"; - #elif HAVE_SQLITE3 + #if HAVE_SQLITE3 TQString binary = "sqlite3"; #endif @@ -1014,15 +1008,11 @@ TQString escape( const TQString &s ) if ( !s_escaped.isEmpty() ) { //###: sqlite_mprintf() seems to fill an empty string with garbage // Escape using SQLite's function -#if HAVE_SQLITE - char * escaped = sqlite_mprintf( "%q", s.latin1() ); // Escape the string(allocates memory) -#elif HAVE_SQLITE3 +#if HAVE_SQLITE3 char * escaped = sqlite3_mprintf( "%q", s.latin1() ); // Escape the string(allocates memory) #endif s_escaped = escaped; -#if HAVE_SQLITE - sqlite_freemem( escaped ); // free allocated memory -#elif HAVE_SQLITE3 +#if HAVE_SQLITE3 sqlite3_free( escaped ); // free allocated memory #endif } diff --git a/src/backends/SQLite/literecipedb.h b/src/backends/SQLite/literecipedb.h index f108599..f7b116d 100644 --- a/src/backends/SQLite/literecipedb.h +++ b/src/backends/SQLite/literecipedb.h @@ -23,8 +23,6 @@ #ifdef HAVE_SQLITE3 #define SQLITE_DRIVER "TQSQLITE3" -#elif HAVE_SQLITE -#define SQLITE_DRIVER "TQSQLITE" #endif class LiteRecipeDB : public TQSqlRecipeDB diff --git a/src/backends/recipedb.cpp b/src/backends/recipedb.cpp index fbc0ff4..ab540b7 100644 --- a/src/backends/recipedb.cpp +++ b/src/backends/recipedb.cpp @@ -46,7 +46,7 @@ #include "MySQL/mysqlrecipedb.h" #endif -#if HAVE_SQLITE || HAVE_SQLITE3 +#if HAVE_SQLITE3 #include "SQLite/literecipedb.h" #endif @@ -119,18 +119,18 @@ RecipeDB* RecipeDB::createDatabase( const TQString &dbType, const TQString &host if ( 0 ) ; //we need some condition here -#if HAVE_SQLITE || HAVE_SQLITE3 +#if HAVE_SQLITE3 else if ( dbType == "SQLite" ) { database = new LiteRecipeDB( file ); } -#endif //HAVE_SQLITE || HAVE_SQLITE3 - #if HAVE_MYSQL +#endif // HAVE_SQLITE3 +#if HAVE_MYSQL else if ( dbType == "MySQL" ) { database = new MySQLRecipeDB( host, user, pass, dbname, port ); } #endif //HAVE_MYSQL - #if HAVE_POSTGRESQL +#if HAVE_POSTGRESQL else if ( dbType == "PostgreSQL" ) { database = new PSqlRecipeDB( host, user, pass, dbname, port ); } diff --git a/src/configure.in.bot b/src/configure.in.bot index 6116164..c01eef7 100644 --- a/src/configure.in.bot +++ b/src/configure.in.bot @@ -19,7 +19,7 @@ fi echo "- -" -if test "x$have_sqlite" = "xtrue" || test "x$have_sqlite3" = "xtrue"; then +if test "x$have_sqlite3" = "xtrue"; then echo "- SQLite Found..................... YES -" else echo "- SQLite Found..................... NO -" @@ -39,7 +39,7 @@ echo "You can get SQLite from: http://www.hwaci.com/sw/sqlite/" echo "Or MySQL from: http://www.mysql.com" else if test "x$have_mysql" = "xtrue"; then - if test "x$have_sqlite" = "xtrue" || test "x$have_sqlite3" = "xtrue"; then + if test "x$have_sqlite3" = "xtrue"; then echo "- -" echo "- Fine, you can build Krecipes now -" echo "------------------------------------------------" 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 diff --git a/src/dialogs/dbimportdialog.cpp b/src/dialogs/dbimportdialog.cpp index 7d5d68b..db8e276 100644 --- a/src/dialogs/dbimportdialog.cpp +++ b/src/dialogs/dbimportdialog.cpp @@ -127,7 +127,7 @@ DBImportDialog::DBImportDialog( TQWidget *parent, const char *name ) psqlRadioButton->setEnabled( false ); #endif -#if (!(HAVE_SQLITE || HAVE_SQLITE3)) +#if (!HAVE_SQLITE3) liteRadioButton->setEnabled( false ); #if (HAVE_MYSQL) diff --git a/src/pref.cpp b/src/pref.cpp index c2575cf..9d8f9f2 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -364,8 +364,6 @@ SQLiteServerPrefs::SQLiteServerPrefs( TQWidget *parent ) : TQWidget( parent ) TQString sqliteBinary; #if HAVE_SQLITE3 sqliteBinary = "sqlite3"; - #elif HAVE_SQLITE - sqliteBinary = "sqlite"; #endif // Backup options diff --git a/src/setupwizard.cpp b/src/setupwizard.cpp index 73921ca..157d15b 100644 --- a/src/setupwizard.cpp +++ b/src/setupwizard.cpp @@ -62,7 +62,7 @@ SetupWizard::SetupWizard( TQWidget *parent, const char *name, bool modal, WFlags setFinishEnabled( savePage, true ); // Enable finish button setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); - #if (!(HAVE_SQLITE || HAVE_SQLITE3)) + #if (!HAVE_SQLITE3) #if (HAVE_MYSQL) showPages( MySQL ); #else @@ -793,7 +793,7 @@ DBTypeSetupPage::DBTypeSetupPage( TQWidget *parent ) : TQWidget( parent ) psqlCheckBox->setEnabled( false ); #endif -#if (!(HAVE_SQLITE || HAVE_SQLITE3)) +#if (!HAVE_SQLITE3) liteCheckBox->setEnabled( false ); #if (HAVE_MYSQL)