lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build if yacc is missing

Browse Source
This commit is contained in:
Nirgal Vourgère
2013-06-28 20:07:44 +02:00
parent 8f0f167ab2
commit 7a1637982c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -53,13 +53,15 @@ AC_MSG_RESULT( no - SQL engine disable);
sql=false sql=false
fi fi
if test "x$YACC" = "x"; then if ! which $YACC > /dev/null; then
sql=false sql=false
fi fi
if test "x$sql" = "xtrue"; then if test "x$sql" = "xtrue"; then
CFLAGS="$CFLAGS -DSQL" CFLAGS="$CFLAGS -DSQL"
OPTDIRS="$OPTDIRS sql" OPTDIRS="$OPTDIRS sql"
else
AC_MSG_WARN([Yacc is not available: SQL disabled.])
fi fi
AM_CONDITIONAL(SQL, test x$sql = xtrue) AM_CONDITIONAL(SQL, test x$sql = xtrue)

4
src/gmdb2/file.c
View File

@@ -217,7 +217,9 @@ gmdb_file_open(gchar *file_path)
gmdb_file_shuffle_recent(file_path); gmdb_file_shuffle_recent(file_path);
gmdb_file_add_recent(file_path); gmdb_file_add_recent(file_path);
#ifdef SQL
sql->mdb = mdb; sql->mdb = mdb;
#endif
mdb_read_catalog(mdb, MDB_ANY); mdb_read_catalog(mdb, MDB_ANY);
for (i = 0; i < MAX_ICONVIEWS; ++i) { for (i = 0; i < MAX_ICONVIEWS; ++i) {
@@ -271,5 +273,7 @@ gmdb_file_close_cb(GtkWidget *button, gpointer data)
{ {
gmdb_reset_widgets (gmdbwidgets); gmdb_reset_widgets (gmdbwidgets);
gmdb_debug_close_all(); gmdb_debug_close_all();
#if SQL
gmdb_sql_close_all(); gmdb_sql_close_all();
#endif
} }

2
src/gmdb2/sql.c
View File

@@ -741,7 +741,7 @@ GtkTreeIter *iter2;
void void
gmdb_sql_new_cb (GtkWidget *w, gpointer data) { gmdb_sql_new_cb (GtkWidget *w, gpointer data) {
GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w), GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
_("SQL support was not built.\nRun configure with the --enable-sql option.")); _("SQL support was not built.\nRun configure with the --enable-sql option."));
gtk_dialog_run (GTK_DIALOG (dlg)); gtk_dialog_run (GTK_DIALOG (dlg));