diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-05 16:53:20 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-05 16:53:20 +1000 |
commit | 005d4560ed000be8a667f876967348a99a7a8897 (patch) | |
tree | 289d816a02c57f3a153beb39513c36866a19c5e3 /contrib/redhat | |
parent | 44d5b60336e2233813083e254a9ca751b7f3c172 (diff) |
- (djm) Add support for building gtk2 password requestor from Redhat beta
Diffstat (limited to 'contrib/redhat')
-rw-r--r-- | contrib/redhat/openssh.spec | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index e4bef55a0..14be171f8 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -20,6 +20,9 @@ | |||
20 | # Do we want smartcard support (1=yes 0=no) | 20 | # Do we want smartcard support (1=yes 0=no) |
21 | %define scard 0 | 21 | %define scard 0 |
22 | 22 | ||
23 | # Use GTK2 instead of GNOME in gnome-ssh-askpass | ||
24 | %define gtk2 0 | ||
25 | |||
23 | # Is this build for RHL 6.x? | 26 | # Is this build for RHL 6.x? |
24 | %define build6x 0 | 27 | %define build6x 0 |
25 | 28 | ||
@@ -220,6 +223,28 @@ make | |||
220 | popd | 223 | popd |
221 | %endif | 224 | %endif |
222 | 225 | ||
226 | # Define a variable to toggle gnome1/gtk2 building. This is necessary | ||
227 | # because RPM doesn't handle nested %if statements. | ||
228 | %if %{gtk2} | ||
229 | gtk2=yes | ||
230 | %else | ||
231 | gtk2=no | ||
232 | %endif | ||
233 | |||
234 | %if ! %{no_gnome_askpass} | ||
235 | pushd contrib | ||
236 | if [ $gtk2 = yes ] ; then | ||
237 | gcc $RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0` \ | ||
238 | gnome-ssh-askpass2.c -o gnome-ssh-askpass \ | ||
239 | `pkg-config --libs gtk+-2.0` | ||
240 | else | ||
241 | gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ | ||
242 | gnome-ssh-askpass1.c -o gnome-ssh-askpass \ | ||
243 | `gnome-config --libs gnome gnomeui` | ||
244 | fi | ||
245 | popd | ||
246 | %endif | ||
247 | |||
223 | %if ! %{no_gnome_askpass} | 248 | %if ! %{no_gnome_askpass} |
224 | pushd contrib | 249 | pushd contrib |
225 | gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ | 250 | gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ |