[PATCH] some fixes for waf issues
Christian Ambach
ambi at samba.org
Wed Feb 19 15:02:08 MST 2014
Hi Andrew,
> I'm sorry about this. I went away to look and see if I could find a
> cleaner way to do this, and never got back to you or came to a
> conclusion.
>
> This is certainly better than what we have here. I think this doesn't
> happen on modern systems because on modern systems such libraries would
> declare their own internal dependencies internally, so would not
> normally be our concern.
>
> Reviewed and pushed.
Thanks. Unfortunately, one of the HP-UX machines in the buildfarm is
still unhappy.
The attached patch should fix that, can you please have a look at it?
Cheers,
Christian
-------------- next part --------------
From 9444124f69f8dd9e5c6ddecf4b7b9caad6e3bc26 Mon Sep 17 00:00:00 2001
From: Christian Ambach <ambi at samba.org>
Date: Wed, 19 Feb 2014 22:17:01 +0100
Subject: [PATCH] heimdal_build: only enable libintl functions if everything
was found
do not rely on intl.h being available but also on the functions being usable
This should fix the build on HP-UX
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9911
Signed-off-by: Christian Ambach <ambi at samba.org>
---
source4/heimdal_build/config.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index bd5a1b8..2d113ae 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -41,7 +41,8 @@
#endif
/*Workaround for heimdal define vs samba define*/
-#ifdef HAVE_LIBINTL_H
+#if defined(HAVE_LIBINTL_H) && defined(HAVE_BINDTEXTDOMAIN) &&\
+ defined(HAVE_TEXTDOMAIN)
#define LIBINTL
#endif
--
1.8.1.2
More information about the samba-technical
mailing list