From: Francis Dupont Date: Fri, 21 Jun 2019 13:41:19 +0000 (+0200) Subject: [667-remove-obsolete-compatcheck-dir] Removed compatcheck more than obsolete directory X-Git-Tag: Kea-1.6.0-beta2~132 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cb113a52f0cf56fbdb5cb0e87464135234c2ac1;p=thirdparty%2Fkea.git [667-remove-obsolete-compatcheck-dir] Removed compatcheck more than obsolete directory --- diff --git a/Makefile.am b/Makefile.am index 4c55349658..636c4f3a5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} # We now build doc after src/, because docgen, a tool to generate API # documentation requires libkea-exceptions and libkea-cc. -SUBDIRS = compatcheck tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@ +SUBDIRS = tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@ USE_LCOV=@USE_LCOV@ LCOV=@LCOV@ diff --git a/compatcheck/.gitignore b/compatcheck/.gitignore deleted file mode 100644 index 180a3ec61e..0000000000 --- a/compatcheck/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/sqlite3-difftbl-check.py diff --git a/compatcheck/Makefile.am b/compatcheck/Makefile.am deleted file mode 100644 index 6cc4036161..0000000000 --- a/compatcheck/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# We're going to abuse install-data-local for a pre-install check. This may -# not be the cleanest way to do this type of job, but that's the least ugly -# one we've found. -# -# Note also that if any test needs to examine some file that has possibly -# been installed before (e.g., older DB or configuration file), it should be -# referenced with the prefix of DESTDIR. Otherwise -# 'make DESTDIR=/somewhere install' may not work. -install-data-local: - if test -e $(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3; then \ - $(SHELL) $(top_builddir)/src/bin/dbutil/run_dbutil.sh --check \ - $(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3 || \ - (echo "\nSQLite3 DB file schema version is old. " \ - "Please run: " \ - "$(abs_top_builddir)/src/bin/dbutil/run_dbutil.sh --upgrade " \ - "$(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3"; exit 1) \ - fi diff --git a/compatcheck/README b/compatcheck/README deleted file mode 100644 index 3c07c37869..0000000000 --- a/compatcheck/README +++ /dev/null @@ -1,5 +0,0 @@ -This directory is a collection of compatibility checker programs. -They will be run before any other installation attempts on 'make install' -to see if the installation causes any substantial compatibility problems -with existing configurations. If any checker program finds an issue, -'make install' will stop at that point. diff --git a/configure.ac b/configure.ac index 53049ec42a..ee089fc915 100644 --- a/configure.ac +++ b/configure.ac @@ -1542,7 +1542,6 @@ if (echo ${runstatedir} | grep -q localstatedir); then fi AC_CONFIG_FILES([Makefile - compatcheck/Makefile doc/Makefile doc/guide/Makefile doc/version.ent diff --git a/doc/guide/hooks-radius.xml b/doc/guide/hooks-radius.xml index e5390959f4..5aa8091945 100644 --- a/doc/guide/hooks-radius.xml +++ b/doc/guide/hooks-radius.xml @@ -179,7 +179,6 @@ total 952 -rw-r--r-- 1 thomson staff 645 Apr 25 17:38 INSTALL -rw-r--r-- 1 thomson staff 5015 Apr 25 17:38 Makefile.am -rw-r--r-- 1 thomson staff 587 Apr 25 17:38 README -drwxr-xr-x 5 thomson staff 170 Apr 26 19:04 compatcheck -rw-r--r-- 1 thomson staff 62323 Apr 25 17:38 configure.ac drwxr-xr-x 12 thomson staff 408 Apr 26 19:04 doc drwxr-xr-x 7 thomson staff 238 Apr 25 17:38 examples