diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1768532..948f633 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: run: autoreconf -i -f - name: Configure run: ./configure --disable-silent-rules --${{ matrix.glib }} --${{ matrix.iconv }} --with-unixodbc=/usr + --enable-experimental env: CC: ${{ matrix.compiler }} - name: Make @@ -57,6 +58,7 @@ jobs: run: autoreconf -i -f - name: Configure run: ./configure --disable-silent-rules --${{ matrix.glib }} --${{ matrix.iconv }} --with-unixodbc=/usr/local/opt + --enable-experimental env: CC: ${{ matrix.compiler }} YACC: /usr/local/opt/bison/bin/bison @@ -97,6 +99,7 @@ jobs: run: autoreconf -i -f - name: Configure run: ./configure --disable-silent-rules --${{ matrix.glib }} --with-iodbc=/usr/local/opt + --enable-experimental env: CC: ${{ matrix.compiler }} YACC: /usr/local/opt/bison/bin/bison diff --git a/configure.ac b/configure.ac index a43ba8c..2515c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,13 @@ if test "$enable_glib" = "yes"; then fi AM_CONDITIONAL(FAKE_GLIB, test "x$enable_glib" != "xyes") +# Check if building experimental utilities (mdb-import) +AC_ARG_ENABLE(experimental, + AS_HELP_STRING([--enable-experimental], [build experimental programs @<:@default=no@:>@]), + [enable_experimental=$enableval], [enable_experimental=no]) +AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test x$enable_experimental = xyes) +AC_SUBST(ENABLE_EXPERIMENTAL) + dnl Set up substitution variables if test "$ac_cv_header_xlocale_h" = "yes"; then HAVE_XLOCALE_H=1 @@ -329,4 +336,6 @@ if test x$enable_man = xyes; then summary=${bold_green}enabled; else summary=${b AC_MSG_NOTICE([ man pages : ${summary}${reset}]) if test "x$with_bash_completion_dir" != "xno"; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi AC_MSG_NOTICE([ bash-completion : ${summary}${reset}]) +if test "x$enable_experimental" = "xyes"; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi +AC_MSG_NOTICE([ experimental : ${summary}${reset}]) AC_MSG_NOTICE([]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 7db29cc..15bc693 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,19 +5,25 @@ PRODUCT = MDBTools dist_man_MANS = if ENABLE_MAN dist_man_MANS += mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-schema.1 \ - mdb-array.1 mdb-header.1 mdb-hexdump.1 mdb-parsecsv.1 mdb-prop.1 mdb-import.1 \ + mdb-array.1 mdb-header.1 mdb-hexdump.1 mdb-parsecsv.1 mdb-prop.1 \ mdb-count.1 mdb-json.1 mdb-queries.1 if SQL dist_man_MANS += mdb-sql.1 endif +if ENABLE_EXPERIMENTAL + dist_man_MANS += mdb-import.1 +endif endif CLEANFILES = ${dist_man_MANS} EXTRA_DIST = mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt \ - mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.txt mdb-import.txt \ + mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.txt \ mdb-count.txt mdb-json.txt mdb-queries.txt \ txt2man +if ENABLE_EXPERIMENTAL + EXTRA_DIST += mdb-import.txt +endif if SQL -EXTRA_DIST += mdb-sql.txt + EXTRA_DIST += mdb-sql.txt endif .txt.1: diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 5fba6ca..6473841 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = bash-completion 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_PROGRAMS = prtable prcat prdata prkkd prdump prole updrow prindex noinst_HEADERS = base64.h LIBS = $(GLIB_LIBS) @LIBS@ 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) +if ENABLE_EXPERIMENTAL + bin_PROGRAMS += mdb-import +endif +if SQL + bin_PROGRAMS += mdb-sql + mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE) endif diff --git a/src/util/bash-completion/Makefile.am b/src/util/bash-completion/Makefile.am index 526e2a6..ffac44d 100644 --- a/src/util/bash-completion/Makefile.am +++ b/src/util/bash-completion/Makefile.am @@ -1,6 +1,9 @@ if ENABLE_BASH_COMPLETION bashcompletiondir = $(BASH_COMPLETION_DIR) -dist_bashcompletion_DATA = mdb-count mdb-export mdb-hexdump mdb-import mdb-json mdb-parsecsv mdb-prop mdb-queries mdb-schema mdb-tables mdb-ver +dist_bashcompletion_DATA = mdb-count mdb-export mdb-hexdump mdb-json mdb-parsecsv mdb-prop mdb-queries mdb-schema mdb-tables mdb-ver +if ENABLE_EXPERIMENTAL + dist_bashcompletion_DATA += mdb-import +endif if SQL dist_bashcompletion_DATA += mdb-sql endif