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

Merge pull request #276 from mdbtools/no-sql

Browse Source 
Don't build/install mdb-sql if SQL is not supported
This commit is contained in:
Evan Miller
2021-08-04 14:12:20 -04:00
committed by GitHub
parent 12643bd95b 8692586205
commit 1b147b8d29
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/Makefile.am
View File

@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = bash-completion
bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop mdb-count mdb-queries mdb-json
bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-ver mdb-prop mdb-count mdb-queries mdb-json
noinst_PROGRAMS = mdb-import prtable prcat prdata prkkd prdump prole updrow prindex
noinst_HEADERS = base64.h
LIBS = $(GLIB_LIBS) @LIBS@
@@ -8,5 +8,6 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -Wsign-compare
LDADD = ../libmdb/libmdb.la
if SQL
bin_PROGRAMS += mdb-sql
mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE)
endif

10
src/util/mdb-sql.c
View File

@@ -51,8 +51,6 @@ extern void clear_history ();
void dump_results(FILE *out, MdbSQL *sql, char *delimiter);
void dump_results_pp(FILE *out, MdbSQL *sql);
#if SQL
int headers = 1;
int footers = 1;
int pretty_print = 1;
@@ -516,11 +514,3 @@ main(int argc, char **argv)
return 0;
}
#else
int main(int argc, char **argv)
{
fprintf(stderr,"You must configure using --enable-sql to get SQL support\n");
return -1;
}
#endif