summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-12-02 10:34:10 -0500
committerThomas Markwalder <tmark@isc.org>2019-12-02 10:34:10 -0500
commite51dc9083f8614f35aad421dbd48ddc2b25cf841 (patch)
treec80523f37e203276316608ffddeff2624d191a75
parent4984c44a5c8a6c79711059271ac7d646ee45089d (diff)
downloadisc-dhcp-e51dc9083f8614f35aad421dbd48ddc2b25cf841.tar.gz
[#35,!36] Addressed more review comments
Minor cleanups: configure configure.ac doc/devel/atf.dox
-rwxr-xr-xconfigure15
-rw-r--r--configure.ac1
-rw-r--r--doc/devel/atf.dox15
3 files changed, 17 insertions, 14 deletions
diff --git a/configure b/configure
index a17d3afe..51894cad 100755
--- a/configure
+++ b/configure
@@ -734,6 +734,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -846,6 +847,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1098,6 +1100,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1235,7 +1246,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1388,6 +1399,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -5596,7 +5608,6 @@ if test "${with_atf+set}" = set; then :
withval=$with_atf; atf_path="$withval"
fi
-
if test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config
diff --git a/configure.ac b/configure.ac
index eb083d49..7ec27800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,7 +254,6 @@ atf_path="no"
AC_ARG_WITH([atf],
AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed]),
[atf_path="$withval"])
-
if test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config
diff --git a/doc/devel/atf.dox b/doc/devel/atf.dox
index 08b4e817..21a9edf9 100644
--- a/doc/devel/atf.dox
+++ b/doc/devel/atf.dox
@@ -56,7 +56,7 @@ Kyua may be found here: https://github.com/jmmv/kyua
This section describes how to install and use pre-Kyua ATF release to run
ISC DHCP unit tests. The most recent release of ATF that can be used without
also needing Kyua, is ATF version 0.19. While this version is still available
-and using it is least software to install to to run ISC DHCP unit tests, there
+and using it is least software to install to run ISC DHCP unit tests, there
may come a point in time when this version is no longer available. It may be
downloaded here: https://github.com/jmmv/atf/releases/tag/atf-0.19
@@ -162,7 +162,7 @@ ATF, and lutok
$ apt-get install liblua5.1-0-dev
$ apt-get install libsqlite3-dev
-# Fetch, build, and install the lastest version of ATF
+# Fetch, build, and install the latest version of ATF
$ git clone https://github.com/jmmv/atf.git
$ cd atf
@@ -172,7 +172,7 @@ $ make
$ sudo make install
$ cd ..
-# Fetch, build, and install the lastest version lutok
+# Fetch, build, and install the latest version lutok
$ git clone https://github.com/jmmv/lutok.git
$ cd lutok
@@ -185,7 +185,7 @@ $ make
$ sudo make install
$ cd ..
-# Finally, we fetch, build and install the lastest kyua
+# Finally, we fetch, build and install the latest kyua
$ git clone https://github.com/jmmv/kyua.git
$ cd kyua
@@ -244,13 +244,6 @@ $ ./configure --prefix=/opt/kyua
$ make
$ sudo make install
$ cd ..
-
-# reconfigure atf with kyua
-$ cd atf
-$ PATH=$PATH:/opt/kyua/bin ./configure --prefix=/opt/atf
-$ make
-$ sudo make install
-$ cd ..
@endverbatim
To build ISC DHCP with Kyua and run all the unit tests is the same: