summaryrefslogtreecommitdiff
path: root/klm/util/have.hh
diff options
context:
space:
mode:
authorMichael Denkowski <michael.j.denkowski@gmail.com>2012-12-22 16:01:23 -0500
committerMichael Denkowski <michael.j.denkowski@gmail.com>2012-12-22 16:01:23 -0500
commit778a4cec55f82bcc66b3f52de7cc871e8daaeb92 (patch)
tree2a5bccaa85965855104c4e8ac3738b2e1c77f164 /klm/util/have.hh
parent57fff9eea5ba0e71fb958fdb4f32d17f2fe31108 (diff)
parentd21491daa5e50b4456c7c5f9c2e51d25afd2a757 (diff)
Merge branch 'master' of git://github.com/redpony/cdec
Diffstat (limited to 'klm/util/have.hh')
-rw-r--r--klm/util/have.hh12
1 files changed, 3 insertions, 9 deletions
diff --git a/klm/util/have.hh b/klm/util/have.hh
index b8181e99..85b838e4 100644
--- a/klm/util/have.hh
+++ b/klm/util/have.hh
@@ -2,22 +2,16 @@
#ifndef UTIL_HAVE__
#define UTIL_HAVE__
-#ifndef HAVE_ZLIB
-#if !defined(_WIN32) && !defined(_WIN64)
-#define HAVE_ZLIB
-#endif
-#endif
-
#ifndef HAVE_ICU
//#define HAVE_ICU
#endif
#ifndef HAVE_BOOST
-#define HAVE_BOOST
+//#define HAVE_BOOST
#endif
-#ifndef HAVE_THREADS
-//#define HAVE_THREADS
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#endif // UTIL_HAVE__