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.in | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/config.h.in b/config.h.in index f865b7a..004ff4b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,8 +1,23 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <cairo/cairo.h> header file. */ +#undef HAVE_CAIRO_CAIRO_H + +/* 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. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `cairo' library (-lcairo). */ +#undef HAVE_LIBCAIRO + /* Define to 1 if you have the `confuse' library (-lconfuse). */ #undef HAVE_LIBCONFUSE -- Gitblit v1.9.3