Commit e51dc908 authored by Thomas Markwalder's avatar Thomas Markwalder

[#35,!36] Addressed more review comments

Minor cleanups:

    configure
    configure.ac
    doc/devel/atf.dox
parent 4984c44a
...@@ -734,6 +734,7 @@ infodir ...@@ -734,6 +734,7 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -846,6 +847,7 @@ datadir='${datarootdir}' ...@@ -846,6 +847,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1098,6 +1100,15 @@ do ...@@ -1098,6 +1100,15 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; 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) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1235,7 +1246,7 @@ fi ...@@ -1235,7 +1246,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir libdir localedir mandir runstatedir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1388,6 +1399,7 @@ Fine tuning of the installation directories: ...@@ -1388,6 +1399,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -5596,7 +5608,6 @@ if test "${with_atf+set}" = set; then : ...@@ -5596,7 +5608,6 @@ if test "${with_atf+set}" = set; then :
withval=$with_atf; atf_path="$withval" withval=$with_atf; atf_path="$withval"
fi fi
if test "$atf_path" != "no" ; then if test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path" DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config # Config path for pkg-config
......
...@@ -254,7 +254,6 @@ atf_path="no" ...@@ -254,7 +254,6 @@ atf_path="no"
AC_ARG_WITH([atf], AC_ARG_WITH([atf],
AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed]), AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed]),
[atf_path="$withval"]) [atf_path="$withval"])
if test "$atf_path" != "no" ; then if test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path" DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config # Config path for pkg-config
......
...@@ -56,7 +56,7 @@ Kyua may be found here: https://github.com/jmmv/kyua ...@@ -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 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 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 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 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 downloaded here: https://github.com/jmmv/atf/releases/tag/atf-0.19
...@@ -162,7 +162,7 @@ ATF, and lutok ...@@ -162,7 +162,7 @@ ATF, and lutok
$ apt-get install liblua5.1-0-dev $ apt-get install liblua5.1-0-dev
$ apt-get install libsqlite3-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 $ git clone https://github.com/jmmv/atf.git
$ cd atf $ cd atf
...@@ -172,7 +172,7 @@ $ make ...@@ -172,7 +172,7 @@ $ make
$ sudo make install $ sudo make install
$ cd .. $ 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 $ git clone https://github.com/jmmv/lutok.git
$ cd lutok $ cd lutok
...@@ -185,7 +185,7 @@ $ make ...@@ -185,7 +185,7 @@ $ make
$ sudo make install $ sudo make install
$ cd .. $ 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 $ git clone https://github.com/jmmv/kyua.git
$ cd kyua $ cd kyua
...@@ -244,13 +244,6 @@ $ ./configure --prefix=/opt/kyua ...@@ -244,13 +244,6 @@ $ ./configure --prefix=/opt/kyua
$ make $ make
$ sudo make install $ sudo make install
$ cd .. $ cd ..
# reconfigure atf with kyua
$ cd atf
$ PATH=$PATH:/opt/kyua/bin ./configure --prefix=/opt/atf
$ make
$ sudo make install
$ cd ..
@endverbatim @endverbatim
To build ISC DHCP with Kyua and run all the unit tests is the same: To build ISC DHCP with Kyua and run all the unit tests is the same:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment