[4.1] f137686 Make miniobj work downstream

[Dridi Boukelmoune]

commit f13768615549759b4db6cd792e83a1fc30ea0ee2
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Sat Mar 11 13:50:34 2017 +0100

    Make miniobj work downstream
    
    Conflicts:
    	configure.ac
    	varnish.m4

diff --git a/configure.ac b/configure.ac
index 5c61a61..03412cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,6 +244,7 @@ AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[
 ])
 
 # Checks for library functions.
+_VARNISH_CHECK_EXPLICIT_BZERO
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 AC_FUNC_VPRINTF
diff --git a/include/miniobj.h b/include/miniobj.h
index 75093ce..3e4829e 100644
--- a/include/miniobj.h
+++ b/include/miniobj.h
@@ -5,7 +5,7 @@
  *
  */
 
-#if HAVE_EXPLICIT_BZERO
+#ifdef HAVE_EXPLICIT_BZERO
 #  define ZERO_OBJ(to, sz)	explicit_bzero(to, sz)
 #else
 #  define ZERO_OBJ(to, sz)	(void)memset(to, 0, sz)
diff --git a/varnish.m4 b/varnish.m4
index 75ac9a3..acdd58f 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -31,6 +31,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# _VARNISH_CHECK_EXPLICIT_BZERO()
+# -------------------------------
+AC_DEFUN([_VARNISH_CHECK_EXPLICIT_BZERO], [
+	AC_CHECK_FUNCS([explicit_bzero])
+])
+
 # _VARNISH_PKG_CONFIG
 # --------------------
 AC_DEFUN([_VARNISH_PKG_CONFIG], [
@@ -53,6 +59,7 @@ AC_DEFUN([_VARNISH_PKG_CONFIG], [
 AC_DEFUN([_VARNISH_CHECK_DEVEL], [
 
 	AC_REQUIRE([_VARNISH_PKG_CONFIG])
+	AC_REQUIRE([_VARNISH_CHECK_EXPLICIT_BZERO])
 
 	[_orig_cppflags=$CPPFLAGS]
 	[CPPFLAGS=$VARNISHAPI_CFLAGS]
@@ -254,6 +261,7 @@ AC_DEFUN([VARNISH_VMODS], [
 #
 AC_DEFUN([VARNISH_PREREQ], [
 	AC_REQUIRE([_VARNISH_PKG_CONFIG])
+	AC_REQUIRE([_VARNISH_CHECK_EXPLICIT_BZERO])
 	AC_MSG_CHECKING([for Varnish])
 	AC_MSG_RESULT([$VARNISH_VERSION])