diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /contrib/findssl.sh | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'contrib/findssl.sh')
-rw-r--r-- | contrib/findssl.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/findssl.sh b/contrib/findssl.sh index 0c08d4a18..716abced5 100644 --- a/contrib/findssl.sh +++ b/contrib/findssl.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $ | ||
4 | # | ||
3 | # findssl.sh | 5 | # findssl.sh |
4 | # Search for all instances of OpenSSL headers and libraries | 6 | # Search for all instances of OpenSSL headers and libraries |
5 | # and print their versions. | 7 | # and print their versions. |
@@ -9,10 +11,11 @@ | |||
9 | # Written by Darren Tucker (dtucker at zip dot com dot au) | 11 | # Written by Darren Tucker (dtucker at zip dot com dot au) |
10 | # This file is placed in the public domain. | 12 | # This file is placed in the public domain. |
11 | # | 13 | # |
12 | # $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $ | 14 | # Release history: |
13 | # 2002-07-27: Initial release. | 15 | # 2002-07-27: Initial release. |
14 | # 2002-08-04: Added public domain notice. | 16 | # 2002-08-04: Added public domain notice. |
15 | # 2003-06-24: Incorporated readme, set library paths. First cvs version. | 17 | # 2003-06-24: Incorporated readme, set library paths. First cvs version. |
18 | # 2004-12-13: Add traps to cleanup temp files, from Amarendra Godbole. | ||
16 | # | 19 | # |
17 | # "OpenSSL headers do not match your library" are usually caused by | 20 | # "OpenSSL headers do not match your library" are usually caused by |
18 | # OpenSSH's configure picking up an older version of OpenSSL headers | 21 | # OpenSSH's configure picking up an older version of OpenSSL headers |
@@ -64,6 +67,11 @@ CC=gcc | |||
64 | STATIC=-static | 67 | STATIC=-static |
65 | 68 | ||
66 | # | 69 | # |
70 | # Cleanup on interrupt | ||
71 | # | ||
72 | trap 'rm -f conftest.c' INT HUP TERM | ||
73 | |||
74 | # | ||
67 | # Set up conftest C source | 75 | # Set up conftest C source |
68 | # | 76 | # |
69 | rm -f findssl.log | 77 | rm -f findssl.log |