| @@ -1,53 +1,59 @@ | | | @@ -1,53 +1,59 @@ |
1 | $NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $ | | 1 | $NetBSD: patch-aa,v 1.20 2012/08/01 12:27:12 drochner Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2012-05-22 21:46:41.000000000 +0000 | | 3 | --- configure.orig 2012-07-27 18:25:28.000000000 +0000 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -15698,7 +15698,7 @@ squeeze() { | | 5 | @@ -15707,7 +15707,7 @@ squeeze() { |
6 | | | 6 | |
7 | | | 7 | |
8 | # | | 8 | # |
9 | - if test "$compiler_id" != "unknown"; then | | 9 | - if test "$compiler_id" != "unknown"; then |
10 | + if false; then | | 10 | + if false; then |
11 | # | | 11 | # |
12 | if test "$compiler_id" = "GNU_C" || | | 12 | if test "$compiler_id" = "GNU_C" || |
13 | test "$compiler_id" = "CLANG"; then | | 13 | test "$compiler_id" = "CLANG"; then |
14 | @@ -20377,15 +20377,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | | 14 | @@ -20390,15 +20390,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd |
15 | LIBS="$LIBS $gss_libs" | | 15 | LIBS="$LIBS $gss_libs" |
16 | elif test "$GSSAPI_ROOT" != "yes"; then | | 16 | elif test "$GSSAPI_ROOT" != "yes"; then |
17 | LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" | | 17 | LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" |
18 | - LIBS="$LIBS -lgssapi" | | 18 | - LIBS="$LIBS -lgssapi" |
19 | + LIBS="$LIBS -lgssapi -lkrb5" | | 19 | + LIBS="$LIBS -lgssapi -lkrb5" |
20 | else | | 20 | else |
21 | - LIBS="$LIBS -lgssapi" | | 21 | - LIBS="$LIBS -lgssapi" |
22 | + LIBS="$LIBS -lgssapi -lkrb5" | | 22 | + LIBS="$LIBS -lgssapi -lkrb5" |
23 | fi | | 23 | fi |
24 | ;; | | 24 | ;; |
25 | esac | | 25 | esac |
26 | else | | 26 | else |
27 | LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" | | 27 | LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" |
28 | - LIBS="$LIBS -lgssapi" | | 28 | - LIBS="$LIBS -lgssapi" |
29 | + LIBS="$LIBS -lgssapi -lkrb5" | | 29 | + LIBS="$LIBS -lgssapi -lkrb5" |
30 | fi | | 30 | fi |
31 | else | | 31 | else |
32 | CPPFLAGS="$save_CPPFLAGS" | | 32 | CPPFLAGS="$save_CPPFLAGS" |
33 | @@ -23598,15 +23598,15 @@ $as_echo "$as_me: WARNING: You need an l | | 33 | @@ -24033,19 +24033,19 @@ $as_echo "$as_me: WARNING: You need an l |
34 | $as_echo "yes" >&6; } | | 34 | $as_echo "yes" >&6; } |
35 | if test "x$OPENSSL_ENABLED" = "x1"; then | | 35 | if test "x$OPENSSL_ENABLED" = "x1"; then |
36 | versioned_symbols_flavour="OPENSSL_" | | 36 | versioned_symbols_flavour="OPENSSL_" |
37 | - elif test "x$GNUTLS_ENABLED" == "x1"; then | | 37 | - elif test "x$GNUTLS_ENABLED" == "x1"; then |
38 | + elif test "x$GNUTLS_ENABLED" = "x1"; then | | 38 | + elif test "x$GNUTLS_ENABLED" = "x1"; then |
39 | versioned_symbols_flavour="GNUTLS_" | | 39 | versioned_symbols_flavour="GNUTLS_" |
40 | - elif test "x$NSS_ENABLED" == "x1"; then | | 40 | - elif test "x$NSS_ENABLED" == "x1"; then |
41 | + elif test "x$NSS_ENABLED" = "x1"; then | | 41 | + elif test "x$NSS_ENABLED" = "x1"; then |
42 | versioned_symbols_flavour="NSS_" | | 42 | versioned_symbols_flavour="NSS_" |
43 | - elif test "x$POLARSSL_ENABLED" == "x1"; then | | 43 | - elif test "x$POLARSSL_ENABLED" == "x1"; then |
44 | + elif test "x$POLARSSL_ENABLED" = "x1"; then | | 44 | + elif test "x$POLARSSL_ENABLED" = "x1"; then |
45 | versioned_symbols_flavour="POLARSSL_" | | 45 | versioned_symbols_flavour="POLARSSL_" |
46 | - elif test "x$CYASSL_ENABLED" == "x1"; then | | 46 | - elif test "x$CYASSL_ENABLED" == "x1"; then |
47 | + elif test "x$CYASSL_ENABLED" = "x1"; then | | 47 | + elif test "x$CYASSL_ENABLED" = "x1"; then |
48 | versioned_symbols_flavour="CYASSL_" | | 48 | versioned_symbols_flavour="CYASSL_" |
49 | - elif test "x$AXTLS_ENABLED" == "x1"; then | | 49 | - elif test "x$AXTLS_ENABLED" == "x1"; then |
50 | + elif test "x$AXTLS_ENABLED" = "x1"; then | | 50 | + elif test "x$AXTLS_ENABLED" = "x1"; then |
51 | versioned_symbols_flavour="AXTLS_" | | 51 | versioned_symbols_flavour="AXTLS_" |
| | | 52 | - elif test "x$WINSSL_ENABLED" == "x1"; then |
| | | 53 | + elif test "x$WINSSL_ENABLED" = "x1"; then |
| | | 54 | versioned_symbols_flavour="WINSSL_" |
| | | 55 | - elif test "x$DARWINSSL_ENABLED" == "x1"; then |
| | | 56 | + elif test "x$DARWINSSL_ENABLED" = "x1"; then |
| | | 57 | versioned_symbols_flavour="DARWINSSL_" |
52 | else | | 58 | else |
53 | versioned_symbols_flavour="" | | 59 | versioned_symbols_flavour="" |