Update preconfigured config.h(.win32.in)

-Update for Visual C++ 2010 regarding stdint.h (it is shipped with VS 2010
 by default)
-Allow option to not use FontConfig

diff --git a/config.h.win32.in b/config.h.win32.in
index 1864ad0..211d96c 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -9,7 +9,9 @@
 /* #undef HAVE_CAIRO_ATSUI */
 
 /* Whether Cairo can use FreeType for fonts */
+#ifndef PANGO_VISUALC_NO_FC
 #define HAVE_CAIRO_FREETYPE 1
+#endif
 
 /* Whether Cairo has PDF support */
 #define HAVE_CAIRO_PDF 1
@@ -37,7 +39,9 @@
 /* #undef HAVE_FLOCKFILE */
 
 /* Have FreeType 2 library */
+#ifndef PANGO_VISUALC_NO_FC
 #define HAVE_FREETYPE 1
+#endif
 
 /* Define to 1 if you have the `getpagesize' function. */
 /* #undef HAVE_GETPAGESIZE */
@@ -55,7 +59,9 @@
 /* #undef HAVE_NDIR_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
+#if (_MSC_VER >= 1600)
+#define HAVE_STDINT_H 1
+#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -148,4 +154,4 @@
 #define VERSION "@PANGO_VERSION@"
 
 /* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
+#define X_DISPLAY_MISSING 1