[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1137-g365925e

[Jeremy Allison]

The branch, master has been updated
       via  365925eea308673f15e03d81b69f04b8908468e7 (commit)
      from  023164f77e36694f4dc7435119f28f42ea0fb0ec (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 365925eea308673f15e03d81b69f04b8908468e7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 24 11:37:57 2009 -0800

    Start fixing Solaris build failures.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal/kuser/kuser_locl.h   |    2 +-
 source4/heimdal/lib/krb5/krb5_locl.h |    2 +-
 source4/heimdal_build/internal.m4    |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/kuser/kuser_locl.h b/source4/heimdal/kuser/kuser_locl.h
index 21e9776..eed9e00 100644
--- a/source4/heimdal/kuser/kuser_locl.h
+++ b/source4/heimdal/kuser/kuser_locl.h
@@ -88,7 +88,7 @@
 #include <locale.h>
 #endif
 
-#ifdef LIBINTL
+#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #define N_(x,y) gettext(x)
 #define NP_(x,y) (x)
diff --git a/source4/heimdal/lib/krb5/krb5_locl.h b/source4/heimdal/lib/krb5/krb5_locl.h
index 1a49039..ced722f 100644
--- a/source4/heimdal/lib/krb5/krb5_locl.h
+++ b/source4/heimdal/lib/krb5/krb5_locl.h
@@ -118,7 +118,7 @@ struct sockaddr_dl;
 
 #define HEIMDAL_TEXTDOMAIN "heimdal_krb5"
 
-#ifdef LIBINTL
+#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #define N_(x,y) dgettext(HEIMDAL_TEXTDOMAIN, x)
 #else
diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index b2f64a6..50a3c8a 100644
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -69,7 +69,8 @@ AC_CHECK_HEADERS([				\
 	ttyname.h				\
 	netinet/in.h				\
 	netinet/in6.h				\
-	netinet6/in6.h
+	netinet6/in6.h				\
+	libintl.h
 ])
 
 AC_CHECK_FUNCS([				\


-- 
Samba Shared Repository