New upstream version 1.7~git20161112+dfsg

6 files changed, 49 insertions, 17 deletions

diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index a9ea71edd..ba18933c8 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -101,7 +101,7 @@ install-build-headers:: $(include_HEADERS) $(dist_include_HEADERS) $(nodist_incl
 		if cmp -s  $$file $(buildinclude)/$$f 2> /dev/null ; then \
 		: ; else \
 			echo " $(CP) $$file $(buildinclude)/$$f"; \
-			$(CP) $$file $(buildinclude)/$$f; \
+			$(CP) $$file $(buildinclude)/$$f || true; \
 		fi ; \
 	done ; \
 	foo='$(nobase_include_HEADERS)'; \
@@ -253,7 +253,11 @@ uninstall-hook: uninstall-cat-mans
 .et.c:
 	$(COMPILE_ET) $<
 
+if NO_AFS
+LIB_kafs =
+else
 LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+endif
 
 if KRB5
 LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
diff --git a/cf/db.m4 b/cf/db.m4
index 9209df5c2..49ffd81ef 100644
--- a/cf/db.m4
+++ b/cf/db.m4
@@ -59,7 +59,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
 
 dnl db_create is used by db3 and db4 and db5
 
-  AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db5 db4 db3 db, [
+  AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-5 db5 db4 db3 db, [
   #include <stdio.h>
   #ifdef HAVE_DBHEADER
   #include <$dbheader/db.h>
diff --git a/cf/dispatch.m4 b/cf/dispatch.m4
index 68b39fd48..76c5f47ee 100644
--- a/cf/dispatch.m4
+++ b/cf/dispatch.m4
@@ -1,20 +1,23 @@
 
 AC_DEFUN([rk_LIBDISPATCH],[
 
-AC_CHECK_HEADERS([dispatch/dispatch.h])
+AC_CHECK_PROGS(GCD_MIG, mig, no)
 
-AC_FIND_FUNC_NO_LIBS(dispatch_async_f, dispatch,
-[#ifdef HAVE_DISPATCH_DISPATCH_H
-#include <dispatch/dispatch.h>
-#endif],[0,0,0])
+if test "$GCD_MIG" != no; then
+  AC_CHECK_HEADERS([dispatch/dispatch.h])
+  AC_FIND_FUNC_NO_LIBS(dispatch_async_f, dispatch,
+  [#ifdef HAVE_DISPATCH_DISPATCH_H
+  #include <dispatch/dispatch.h>
+  #endif],[0,0,0])
 
-if test "$ac_cv_func_dispatch_async_f" = yes ; then
-    AC_DEFINE([HAVE_GCD], 1, [Define if os support gcd.])
-    libdispatch=yes
-else
-    libdispatch=no
-fi
+  if test "$ac_cv_func_dispatch_async_f" = yes -a "$GCD_MIG" != no; then
+      AC_DEFINE([HAVE_GCD], 1, [Define if os support gcd.])
+      libdispatch=yes
+  else
+      libdispatch=no
+  fi
 
-AM_CONDITIONAL(have_gcd, test "$libdispatch" = yes)
+fi
+AM_CONDITIONAL(have_gcd, test "$libdispatch" = yes -a "$GCD_MIG" != no)
 
-])
\ No newline at end of file
+])
diff --git a/cf/krb-prog-perl.m4 b/cf/krb-prog-perl.m4
new file mode 100644
index 000000000..b359111fc
--- /dev/null
+++ b/cf/krb-prog-perl.m4
@@ -0,0 +1,21 @@
+dnl
+dnl perl and some of its module are required to build some headers
+dnl
+
+AC_DEFUN([AC_KRB_PROG_PERL],
+[AC_CHECK_PROGS(PERL, perl, perl)
+if test "$PERL" = ""; then
+  AC_MSG_ERROR([perl not found - Cannot build Heimdal without perl])
+fi
+])
+
+AC_DEFUN([AC_KRB_PERL_MOD],
+[
+AC_MSG_CHECKING([for Perl5 module $1])
+if ! $PERL -M$1 -e 'exit(0);' >/dev/null 2>&1; then
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([perl module $1 not found - Cannot build Heimdal without perl module $1])
+else
+  AC_MSG_RESULT([yes])
+fi
+])
diff --git a/cf/pthreads.m4 b/cf/pthreads.m4
index cdcab3a2c..be5317b8e 100644
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -30,7 +30,9 @@ case "$host" in
 	dnl heim_threads.h knows this
 	PTHREAD_LIBADD="-lpthread"
 	;;
-*-*-freebsd[[56789]]*)
+*-*-freebsd[[1234]])
+    ;;
+*-*-freebsd*)
 	native_pthread_support=yes
 	PTHREAD_LIBADD="-pthread"
 	;;
@@ -90,6 +92,8 @@ else
   PTHREAD_LIBADD=""
 fi
 
+AM_CONDITIONAL(ENABLE_PTHREAD_SUPPORT, test "$enable_pthread_support" != no)
+
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LDADD="$LDADD $PTHREAD_LDADD"
 LIBADD="$LIBADD $PTHREAD_LIBADD"
diff --git a/cf/test-package.m4 b/cf/test-package.m4
index 8e694bbcb..afada2fd0 100644
--- a/cf/test-package.m4
+++ b/cf/test-package.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-dnl rk_TEST_PACKAGE(package,headers,libraries,extra libs,
+dnl rk_TEST_PACKAGE(package,program,libraries,extra libs,
 dnl			default locations, conditional, config-program, headers)
 
 AC_DEFUN([rk_TEST_PACKAGE],[