Skip to content

Commit d1430fe

Browse files
committed
README: Distinguish source tarball vs git deps
autoconf/automake/libtool are only needed if building from git, as the dist tarball is not depending on autotools. The reference to GNU Autotools has been moved under "Building from Git", since this detail is interesting only for those who clone the project.
1 parent b788c23 commit d1430fe

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

README

+13-14
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,25 @@ brew install pam-u2f
5252
[[building]]
5353
== Building from a source tarball
5454

55-
This project uses 'autoconf', 'automake', 'pkg-config' and 'libtool'
56-
to achieve portability and ease of use.
55+
This project depends on https://developers.yubico.com/libfido2[`libfido2`]
56+
(>= 1.3.0).
57+
Versions of this project up to 1.0.8 used `libu2f-host` and
58+
`libu2f-server`.
5759

58-
In addition, https://developers.yubico.com/libfido2['libfido2'] (>=
59-
1.3.0) is needed. Versions of this project up to 1.0.8 used
60-
`libu2f-host` and `libu2f-server`. On Ubuntu, the necessary dependencies can be
61-
installed using
60+
On Ubuntu, the dependencies needed to build the source tarball can be installed
61+
using:
6262

6363
[source, console]
6464
----
6565
sudo apt install --no-install-recommends \
66-
autoconf \
67-
automake \
6866
libfido2-dev \
6967
libpam-dev \
7068
libssl-dev \
71-
libtool \
7269
pkg-config \
7370
;
7471
----
7572

76-
If you downloaded a tarball, build it as follows.
73+
The project can be build as follows:
7774

7875
[source, console]
7976
----
@@ -104,9 +101,11 @@ This will create a directory 'pam-u2f'. Enter the directory:
104101
cd pam-u2f
105102
----
106103

107-
`autoconf`, `automake`, `libtool`, and `libpam` must be installed.
108-
`AsciiDoc` and `xsltproc` are used to generate the manpages. On Ubuntu,
109-
the necessary dependencies can be installed using
104+
This project uses `autoconf`, `automake`, `pkg-config` and `libtool`
105+
to achieve portability and ease of use.
106+
`AsciiDoc` and `xsltproc` are used to generate the manpages.
107+
108+
On Ubuntu, the dependencies needed to build from Git can be installed using:
110109

111110
[source, console]
112111
----
@@ -125,7 +124,7 @@ sudo apt install --no-install-recommends
125124
;
126125
----
127126

128-
On Fedora, the necessary dependencies can be installed using
127+
On Fedora, the necessary dependencies can be installed using:
129128

130129
[source, console]
131130
----

0 commit comments

Comments
 (0)