From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 config.h |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/config.h b/config.h
index 9a07c00..9be187d 100644
--- a/config.h
+++ b/config.h
@@ -1,12 +1,33 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if you have the <cairo/cairo.h> header file. */
+#define HAVE_CAIRO_CAIRO_H 1
+
+/* Define to 1 if you have the <cairo/cairo-png.h> header file. */
+/* #undef HAVE_CAIRO_CAIRO_PNG_H */
+
+/* Define to 1 if you have the <cairo.h> header file. */
+/* #undef HAVE_CAIRO_H */
+
+/* Define to 1 if you have the <cairo-png.h> header file. */
+/* #undef HAVE_CAIRO_PNG_H */
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `cairo' library (-lcairo). */
+#define HAVE_LIBCAIRO 1
+
 /* Define to 1 if you have the `confuse' library (-lconfuse). */
 #define HAVE_LIBCONFUSE 1
 
+/* Define to 1 if you have the `gsl' library (-lgsl). */
+#define HAVE_LIBGSL 1
+
+/* Define to 1 if you have the `gslcblas' library (-lgslcblas). */
+#define HAVE_LIBGSLCBLAS 1
+
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 

--
Gitblit v1.9.3