diff options
| author | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
|---|---|---|
| committer | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
| commit | 5b8253e0e1f1393a509fb9975ba8c1347af758ed (patch) | |
| tree | 1790470b1d07a0b4973ebce19192e896566ea60b /klm/util/have.hh | |
| parent | 2389a5a8a43dda87c355579838559515b0428421 (diff) | |
| parent | b203f8c5dc8cff1b9c9c2073832b248fcad0765a (diff) | |
fixed conflicts
Diffstat (limited to 'klm/util/have.hh')
| -rw-r--r-- | klm/util/have.hh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/klm/util/have.hh b/klm/util/have.hh index 1d76a7fc..6e18529d 100644 --- a/klm/util/have.hh +++ b/klm/util/have.hh @@ -2,22 +2,12 @@ #ifndef UTIL_HAVE__ #define UTIL_HAVE__ -#ifndef HAVE_ZLIB -#if !defined(_WIN32) && !defined(_WIN64) -#define HAVE_ZLIB -#endif +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #ifndef HAVE_ICU //#define HAVE_ICU #endif -#ifndef HAVE_BOOST -//#define HAVE_BOOST -#endif - -#ifndef HAVE_THREADS -//#define HAVE_THREADS -#endif - #endif // UTIL_HAVE__ |