rpms/kannel/F-11 gateway-1.4.3-ssldetect.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 gateway-1.4.1-ssl64bit.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/kannel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6288

Modified Files:
	.cvsignore sources 
Added Files:
	gateway-1.4.3-ssldetect.patch 
Removed Files:
	gateway-1.4.1-ssl64bit.patch 
Log Message:
Backport files from devel for the 1.4.1 to 1.4.3 update.


gateway-1.4.3-ssldetect.patch:
 configure |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

--- NEW FILE gateway-1.4.3-ssldetect.patch ---
diff -up gateway-1.4.3/configure~ gateway-1.4.3/configure
--- gateway-1.4.3/configure~	2008-08-06 17:22:43.000000000 +0300
+++ gateway-1.4.3/configure	2009-06-25 21:10:01.000000000 +0300
@@ -10957,28 +10957,8 @@ fi
 
 
 if test "$ssl" = "yes" ; then
-    if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/lib64 /usr/local/ssl/lib /usr/local/openssl/lib; do
-      if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
-        ssllib="$loc"
-      fi
-    done
-    for loc in /usr/include/ssl /usr/include/openssl /usr/local/ssl/include \
-               /usr/local/openssl/include; do
-      if test -d "$loc"; then
-        sslinc="$loc"
-      fi
-    done
-  fi
-  { $as_echo "$as_me:$LINENO: result: trying $ssllib $sslinc" >&5
-$as_echo "trying $ssllib $sslinc" >&6; }
-fi
-
-
-
-if test "x$ssllib" != "x" && test "x$sslinc" != "x"; then
-  CFLAGS="$CFLAGS -I$sslinc"
-  LIBS="$LIBS -L$ssllib"
+  CFLAGS="$CFLAGS ${sslinc:+-I$sslinc}${sslinc:-`pkg-config openssl --cflags`}"
+  LIBS="$LIBS ${ssllib:+-L$ssllib}${ssllib:-`pkg-config openssl --libs`}"
 
   # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
+++ .cvsignore	7 Dec 2009 22:28:03 -0000	1.5
@@ -1 +1 @@
-gateway-1.4.1.tar.bz2
+gateway-1.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Oct 2006 15:25:40 -0000	1.4
+++ sources	7 Dec 2009 22:28:03 -0000	1.5
@@ -1 +1 @@
-ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2
+c52febb1a58884778bc5f2aa9f10b642  gateway-1.4.3.tar.bz2


--- gateway-1.4.1-ssl64bit.patch DELETED ---