Start fixing Solaris build failures.

Jeremy.

diff --git a/source4/heimdal/kuser/kuser_locl.h b/source4/heimdal/kuser/kuser_locl.h
index 21e977697575f3d04121c38f0f8e117e2dea1f8e..eed9e00af6bf9e05f437b9f73202c59d73c713b0 100644 (file)
--- a/source4/heimdal/kuser/kuser_locl.h
+++ b/source4/heimdal/kuser/kuser_locl.h
@@ -88,7 +88,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-#ifdef LIBINTL
+#ifdef HAVE_LIBINTL_H

 #include <libintl.h>
 #define N_(x,y) gettext(x)
 #define NP_(x,y) (x)
 #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 1a490392a92b4e0a5f6a96e9ceb2e25c78f854f9..ced722f2d9c05f4a58dabe5ba8cf7d1a06b1ba8a 100644 (file)
--- 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"
 
 
 #define HEIMDAL_TEXTDOMAIN "heimdal_krb5"
 

-#ifdef LIBINTL
+#ifdef HAVE_LIBINTL_H

 #include <libintl.h>
 #define N_(x,y) dgettext(HEIMDAL_TEXTDOMAIN, x)
 #else
 #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 b2f64a6825b27e807c7622cf6379e04ad424f17f..50a3c8addaddb2678160655395f8b11e5f7c5c38 100644 (file)
--- 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                           \
        ttyname.h                               \
        netinet/in.h                            \
        netinet/in6.h                           \

-       netinet6/in6.h
+       netinet6/in6.h                          \
+       libintl.h

 ])
 
 AC_CHECK_FUNCS([                               \
 ])
 
 AC_CHECK_FUNCS([                               \