[gentoo-commits] gentoo-x86 commit in net-libs/liboauth/files: liboauth-0.8.8-pkgconfig.patch liboauth-0.8.8-asneeded.patch liboauth-0.8.8-tests.patch

[Diego Petteno (flameeyes)]

flameeyes    10/08/27 19:57:12

  Added:                liboauth-0.8.8-pkgconfig.patch
                        liboauth-0.8.8-asneeded.patch
                        liboauth-0.8.8-tests.patch
  Log:
  Import to main tree.
  
  (Portage version: 2.2_rc69/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch?rev=1.1&content-type=text/plain

Index: liboauth-0.8.8-pkgconfig.patch
===================================================================
Index: liboauth-0.8.8/configure.ac
===================================================================
--- liboauth-0.8.8.orig/configure.ac
+++ liboauth-0.8.8/configure.ac
@@ -78,9 +78,9 @@ if test "${enable_curl}" != "no"; then
 fi
 
 dnl ** check for libcurl
-if test "${enable_libcurl}" != "no"; then
+AS_IF([test "${enable_libcurl}" != "no"], [
   PKG_CHECK_MODULES(CURL, libcurl, [ AC_DEFINE(HAVE_CURL, 1) HAVE_CURL=1 PC_REQ="$PC_REQ libcurl" PC_LIB="$PC_LIB -lcurl" report_curl="libcurl" ])
-fi
+])
 
 report_curltimeout="-"
 if test -n "${with_curltimeout}"; then
@@ -99,12 +99,12 @@ AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 
 dnl ** crypto/hash lib (OpenSSL or NSS)
-if test "${enable_nss}" == "yes"; then
+AS_IF([test "${enable_nss}" == "yes"], [
   PKG_CHECK_MODULES(NSS, nss, [ AC_DEFINE(USE_NSS, 1) USE_NSS=1 PC_REQ="$PC_REQ nss" ])
   HASH_LIBS=${NSS_LIBS}
   HASH_CFLAGS=${NSS_CFLAGS}
   report_hash="NSS"
-else
+], [
   AC_CHECK_HEADERS(openssl/hmac.h)
   if test -z "${HASH_LIBS}"; then
   HASH_LIBS="-lcrypto"
@@ -129,7 +129,7 @@ else
    
   see http://people.gnome.org/~markmc/openssl-and-the-gpl.html
   ])
-fi
+])
 
 AC_SUBST(HASH_LIBS)
 AC_SUBST(HASH_CFLAGS)



1.1                  net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch?rev=1.1&content-type=text/plain

Index: liboauth-0.8.8-asneeded.patch
===================================================================
Index: liboauth-0.8.8/configure.ac
===================================================================
--- liboauth-0.8.8.orig/configure.ac
+++ liboauth-0.8.8/configure.ac
@@ -113,8 +113,8 @@ AS_IF([test "${enable_nss}" == "yes"], [
   HASH_CFLAGS=""
   fi
   report_hash="OpenSSL"
-  PC_LIB="$PC_LIB -lssl"
-  PC_REQ="$PC_REQ libssl"
+  PC_LIB="$PC_LIB -lcrypto"
+  PC_REQ="$PC_REQ libcrypto"
   AC_MSG_NOTICE([
 
   NOTE: OpenSSL is not compatible with GPL applications.
Index: liboauth-0.8.8/src/Makefile.am
===================================================================
--- liboauth-0.8.8.orig/src/Makefile.am
+++ liboauth-0.8.8/src/Makefile.am
@@ -4,4 +4,5 @@ include_HEADERS = oauth.h
 
 liboauth_la_SOURCES=oauth.c config.h hash.c xmalloc.c xmalloc.h oauth_http.c
 liboauth_la_LDFLAGS=@LIBOAUTH_LDFLAGS@ -version-info @VERSION_INFO@
+liboauth_la_LIBADD=@HASH_LIBS@ @CURL_LIBS@
 liboauth_la_CFLAGS=@LIBOAUTH_CFLAGS@ @HASH_CFLAGS@ @CURL_CFLAGS@
Index: liboauth-0.8.8/tests/Makefile.am
===================================================================
--- liboauth-0.8.8.orig/tests/Makefile.am
+++ liboauth-0.8.8/tests/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS= -I m4
 OAUTHDIR =../src
 INCLUDES = -I$(srcdir)/$(OAUTHDIR)
 MYCFLAGS = @LIBOAUTH_CFLAGS@ @HASH_CFLAGS@ @CURL_CFLAGS@ 
-MYLDADD  = $(OAUTHDIR)/liboauth.la @HASH_LIBS@ @CURL_LIBS@
+MYLDADD  = $(OAUTHDIR)/liboauth.la
 
 tcwiki_SOURCES = selftest_wiki.c commontest.c commontest.h
 tcwiki_LDADD = $(MYLDADD)



1.1                  net-libs/liboauth/files/liboauth-0.8.8-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/liboauth/files/liboauth-0.8.8-tests.patch?rev=1.1&content-type=text/plain

Index: liboauth-0.8.8-tests.patch
===================================================================
Index: liboauth-0.8.8/tests/Makefile.am
===================================================================
--- liboauth-0.8.8.orig/tests/Makefile.am
+++ liboauth-0.8.8/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = oauthexample oauthdatapost tcwiki tceran tcother oauthtest oauthtest2 oauthsign oauthbodyhash
+check_PROGRAMS = oauthexample oauthdatapost tcwiki tceran tcother oauthtest oauthtest2 oauthsign oauthbodyhash
 ACLOCAL_AMFLAGS= -I m4
 
 OAUTHDIR =../src