[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-250-gcdca75d

[Stefan Metzmacher]

The branch, master has been updated
       via  cdca75dee67ebfee62b44273d7d5ae5f123c477b (commit)
       via  73dbbe0d5406d1852f85a17b506a4b943ad1926f (commit)
       via  94cb0835ca690cc7eb115693e672ea9a662fc671 (commit)
      from  1f2b5ea97c7957f4f49fdea67960e7c08888e505 (commit)

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


- Log -----------------------------------------------------------------
commit cdca75dee67ebfee62b44273d7d5ae5f123c477b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 17:34:49 2009 +0100

    heimdal: don't include <sys/cdefs.h> without knowing it's there
    
    metze

commit 73dbbe0d5406d1852f85a17b506a4b943ad1926f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 17:34:00 2009 +0100

    heimdal: don't include <ifaddrs.h> without knowing it's there
    
    metze

commit 94cb0835ca690cc7eb115693e672ea9a662fc671
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 17:03:10 2009 +0100

    s4:build: kill DEFAULT_HEADERS variable
    
    metze

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

Summary of changes:
 lib/util/config.mk                   |    1 +
 source4/Makefile                     |    7 +++----
 source4/heimdal/lib/krb5/get_addrs.c |    2 ++
 source4/heimdal/lib/roken/vis.hin    |    2 ++
 source4/heimdal_build/vis.h          |   11 +++++++++++
 5 files changed, 19 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 22f22b5..02f476b 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -30,6 +30,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
 		params.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
+				 dlinklist.h
 				 attr.h \
 				 byteorder.h \
 				 data_blob.h \
diff --git a/source4/Makefile b/source4/Makefile
index 7d4540a..b342d67 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -145,12 +145,11 @@ endif
 clean::
 	@find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
 
-DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
-		  $(srcdir)/version.h
+PUBLIC_HEADES += $(srcdir)/version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
-headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+headers:: $(PUBLIC_HEADERS)
 manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
@@ -233,7 +232,7 @@ installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs
 	#@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader:: headers installdirs
-	@srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+	@srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS)
 
 installdat:: installdirs
 	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)
diff --git a/source4/heimdal/lib/krb5/get_addrs.c b/source4/heimdal/lib/krb5/get_addrs.c
index fb45d08..ce16785 100644
--- a/source4/heimdal/lib/krb5/get_addrs.c
+++ b/source4/heimdal/lib/krb5/get_addrs.c
@@ -43,7 +43,9 @@ struct mbuf;
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_IFADDR_H
 #include <ifaddrs.h>
+#endif
 
 static krb5_error_code
 gethostname_fallback (krb5_context context, krb5_addresses *res)
diff --git a/source4/heimdal/lib/roken/vis.hin b/source4/heimdal/lib/roken/vis.hin
index 6427452..06a250c 100644
--- a/source4/heimdal/lib/roken/vis.hin
+++ b/source4/heimdal/lib/roken/vis.hin
@@ -80,7 +80,9 @@
  */
 #define	UNVIS_END	1	/* no more characters */
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#endif
 
 __BEGIN_DECLS
 char * ROKEN_LIB_FUNCTION
diff --git a/source4/heimdal_build/vis.h b/source4/heimdal_build/vis.h
index 13b39aa..4389993 100644
--- a/source4/heimdal_build/vis.h
+++ b/source4/heimdal_build/vis.h
@@ -1,4 +1,15 @@
 #ifndef _HEIMDAL_BUILD_VIS_H
 #define _HEIMDAL_BUILD_VIS_H
+
+#include "system/locale.h"
+
+#ifndef __BEGIN_DECLS
+#define __BEGIN_DECLS
+#endif
+
+#ifndef __END_DECLS
+#define __END_DECLS
+#endif
+
 #include "heimdal/lib/roken/vis.hin"
 #endif


-- 
Samba Shared Repository