From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 10 Sep 2018 08:22:13 +0000 (+0200)
Subject: Revert "lib/replace: force to unset defines if check has failed"
X-Git-Tag: tdb-1.3.17~1667
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=200ddf8e731af3d30d844ad0f8e5e73d46aba52c;p=thirdparty%2Fsamba.git

Revert "lib/replace: force to unset defines if check has failed"

This reverts commit 8ec7eb0c0129518557d1f446191860a62ef3ff79.

There was already a better fix under discusion.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/replace/wscript b/lib/replace/wscript
index cbb6fd5be0b..3d47c375044 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -616,7 +616,6 @@ def configure(conf):
                        define='HAVE_WORKING_STRPTIME',
                        execute=True,
                        addmain=False,
-                       always=True,
                        msg='Checking for working strptime')
 
     conf.CHECK_C_PROTOTYPE('gettimeofday',
@@ -647,7 +646,7 @@ def configure(conf):
     # OpenBSD (and I've heard HPUX) doesn't sync between mmap and write.
     # FIXME: Anything other than a 0 or 1 exit code should abort configure!
     conf.CHECK_CODE('#include "test/incoherent_mmap.c"',
-                    addmain=False, add_headers=False, execute=True, always=True,
+                    addmain=False, add_headers=False, execute=True,
                     define='HAVE_INCOHERENT_MMAP',
                     msg="Checking for HAVE_INCOHERENT_MMAP")