← Back to branch summary

~ubuntu-branches/ubuntu/precise/globus-core/precise

« back to all changes in this revision

Viewing changes to debian/patches/globus-core-openssl.patch

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2011-12-20 09:23:16 UTC
  • mfrom: (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20111220092316-il3t47k5p2v1wq6y
Tags: 8.5-1
* Update to Globus Toolkit 5.2.0
* Drop patches accepted upstream
* Drop the globus-gpt2pkg-config script (now part of grid-packaging-tools)
* Use dpkg's build flags

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/globus-core-openssl.patch
 
1
diff -ur globus_core-8.3.orig/aclocal/globus_openssl.m4 globus_core-8.3/aclocal/globus_openssl.m4
 
2
--- globus_core-8.3.orig/aclocal/globus_openssl.m4      2011-04-14 16:34:17.000000000 +0200
 
3
+++ globus_core-8.3/aclocal/globus_openssl.m4   2011-12-10 16:49:20.013168994 +0100
 
4
@@ -25,43 +25,24 @@
 
5
 if test "$OPENSSL_CFLAGS" = ""; then
 
6
     if pkg-config openssl --exists > /dev/null 2>&1 ; then
 
7
         OPENSSL_CFLAGS="`pkg-config openssl --cflags`"
 
8
+    elif test -r "${openssl}/include/openssl/ssl.h" ; then
 
9
+        OPENSSL_CFLAGS="-I ${openssl}/include"
 
10
     fi
 
11
 fi
 
12
 AC_MSG_RESULT([using '$OPENSSL_CFLAGS'])
 
13
 CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}"
 
14
 
 
15
-AC_MSG_CHECKING([OpenSSL INCLUDES])
 
16
-if test "$OPENSSL_INCLUDES" = ""; then
 
17
-    if pkg-config openssl --exists > /dev/null 2>&1 ; then
 
18
-        OPENSSL_INCLUDES="`pkg-config openssl --cflags-only-I`"
 
19
-    elif test -r "${openssl}/include/openssl/ssl.h" ; then
 
20
-        OPENSSL_INCLUDES="-I ${openssl}/include"
 
21
-    fi
 
22
-fi
 
23
-AC_MSG_RESULT([using '$OPENSSL_INCLUDES'])
 
24
-CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDES}"
 
25
 AC_TRY_COMPILE([#include <openssl/ssl.h>],
 
26
                [SSL_library_init();],,
 
27
                [AC_MSG_ERROR([Unable to compile with SSL])])
 
28
 
 
29
-AC_MSG_CHECKING([OpenSSL LDFLAGS])
 
30
-if test "$OPENSSL_LDFLAGS" = ""; then
 
31
-    if pkg-config openssl --exists > /dev/null 2>&1 ; then
 
32
-        OPENSSL_PKGCONF_DEPENDENCIES="openssl"
 
33
-        OPENSSL_LDFLAGS="`pkg-config openssl --libs`"
 
34
-    else
 
35
-        OPENSSL_LDFLAGS="-L${openssl}/lib"
 
36
-    fi
 
37
-fi
 
38
-AC_MSG_RESULT([using '$OPENSSL_LDFLAGS'])
 
39
-LDFLAGS="${LDFLAGS} ${OPENSSL_LDFLAGS}"
 
40
-
 
41
 AC_MSG_CHECKING([OpenSSL LIBS])
 
42
 if test "$OPENSSL_LIBS" = ""; then
 
43
     if pkg-config openssl --exists > /dev/null 2>&1 ; then
 
44
-        OPENSSL_LIBS="`pkg-config openssl --libs-only-l`"
 
45
+        OPENSSL_PKGCONF_DEPENDENCIES="openssl"
 
46
+        OPENSSL_LIBS="`pkg-config openssl --libs`"
 
47
     else
 
48
-        OPENSSL_LIBS="-lssl -lcrypto"
 
49
+        OPENSSL_LIBS="-L${openssl}/lib -lssl -lcrypto"
 
50
     fi
 
51
 fi
 
52
 AC_MSG_RESULT([using '$OPENSSL_LIBS'])
 
53
@@ -72,13 +53,12 @@
 
54
 [SSL_library_init();], , [AC_MSG_ERROR([Unable to link with SSL])])
 
55
 
 
56
 AC_SUBST(OPENSSL_CFLAGS)
 
57
-AC_SUBST(OPENSSL_INCLUDES)
 
58
-AC_SUBST(OPENSSL_LDFLAGS)
 
59
 AC_SUBST(OPENSSL_LIBS)
 
60
 
 
61
 if test "x$OPENSSL_PKGCONF_DEPENDENCIES" != "x"; then
 
62
     GPT_PKGCONFIG_DEPENDENCIES="$GPT_PKGCONFIG_DEPENDENCIES $OPENSSL_PKGCONF_DEPENDENCIES"
 
63
+else
 
64
+    GPT_EXTERNAL_INCLUDES="${GPT_EXTERNAL_INCLUDES} ${OPENSSL_CFLAGS}"
 
65
+    GPT_EXTERNAL_LIBS="${GPT_EXTERNAL_LIBS} ${OPENSSL_LIBS}"
 
66
 fi
 
67
-GPT_EXTERNAL_LIBS="${GPT_EXTERNAL_LIBS} ${OPENSSL_LDFLAGS} ${OPENSSL_LIBS}"
 
68
-GPT_EXTERNAL_INCLUDES="${GPT_EXTERNAL_INCLUDES} ${OPENSSL_CFLAGS} ${OPENSSL_INCLUDES}"
 
69
 ])