public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-plugins/wmbiff/files: wmbiff-0.4.27-gnutls.patch
@ 2010-06-20 12:48 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2010-06-20 12:48 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/06/20 12:48:56

  Added:                wmbiff-0.4.27-gnutls.patch
  Log:
  Use pkg-config instead of libgnutls-config wrt #268502 by Arfrever Frehtes Taifersar Arahesis.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch?rev=1.1&content-type=text/plain

Index: wmbiff-0.4.27-gnutls.patch
===================================================================
http://bugs.gentoo.org/268502

--- configure.ac
+++ configure.ac
@@ -77,13 +77,14 @@
 
 GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
 if test "$gnutls" = "ok"; then
- AM_PATH_LIBGNUTLS(1.0.4, [LIBS="$LIBS $LIBGNUTLS_LIBS"
-                          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-                         CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
-                         GNUTLS_COMMON_O="gnutls-common.o"
-                         GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS."
-                         AC_CHECK_HEADERS(gnutls/gnutls.h) ],
-                         [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ])
+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.4],
+  [LIBS="$LIBS $LIBGNUTLS_LIBS"
+  CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
+  GNUTLS_COMMON_O="gnutls-common.o"
+  GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS."
+  AC_CHECK_HEADERS(gnutls/gnutls.h) ],
+  [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ])
 else
  AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled)
 fi






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-06-20 12:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-20 12:48 [gentoo-commits] gentoo-x86 commit in x11-plugins/wmbiff/files: wmbiff-0.4.27-gnutls.patch Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox