public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson (robbat2)" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/yaz/files: yaz-4.2.30-icu-automagic.patch
Date: Sun, 22 Apr 2012 21:07:10 +0000 (UTC)	[thread overview]
Message-ID: <20120422210710.CEABA2004C@flycatcher.gentoo.org> (raw)

robbat2     12/04/22 21:07:10

  Added:                yaz-4.2.30-icu-automagic.patch
  Log:
  Version bumps. v4 is pmasked for slotting.
  
  (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch?rev=1.1&content-type=text/plain

Index: yaz-4.2.30-icu-automagic.patch
===================================================================
diff -Nuar yaz-4.2.30.orig/configure.ac yaz-4.2.30/configure.ac
--- yaz-4.2.30.orig/configure.ac	2012-03-23 10:20:20.000000000 +0000
+++ yaz-4.2.30/configure.ac	2012-04-22 20:56:41.118691087 +0000
@@ -372,14 +372,13 @@
 
 dnl
 dnl 
-AC_CHECK_ICU([3.4],[
-	if test "$xml_enabled" = "true"; then
-	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
-	else
-	    ICU_CPPFLAGS=""
-	    AC_MSG_WARN([ICU support disabled because XML support is unavailable])
-	fi
-])
+AC_ARG_ENABLE(icu, [  --enable-icu            enable ICU support],[enable_icu=$enableval],[enable_icu=no])
+if test "$enable_icu" = "yes"; then
+    AC_CHECK_ICU([3.4],[
+       ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"],[
+       AC_MSG_ERROR([For ICU support please install libicu34-dev or similar])
+    ])
+fi
 dnl ------ versioning
 dnl
 WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`






                 reply	other threads:[~2012-04-22 21:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120422210710.CEABA2004C@flycatcher.gentoo.org \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox