[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 config.h.in  |   10 ----------
 configure.ac |   14 +++++++++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 5e7e52ddf2b0c4fbc9d933d24336100368d39a5c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 10 17:44:22 2012 -0500

    [uniscribe] Enable Uniscribe backend only if it has ScriptShapeOpenType()
    
    Bug 55494 - ScriptItemizeOpenType doesn't exists under Windows XP

diff --git a/config.h.in b/config.h.in
index f465cc0..0973c93 100644
--- a/config.h.in
+++ b/config.h.in
@@ -114,12 +114,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the <usp10.h> header file. */
-#undef HAVE_USP10_H
-
-/* Define to 1 if you have the <windows.h> header file. */
-#undef HAVE_WINDOWS_H
-
 /* Define to 1 if you have the `_setmode' function. */
 #undef HAVE__SETMODE
 
diff --git a/configure.ac b/configure.ac
index 49accd7..963af2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,19 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
 
 dnl ===========================================================================
 
-AC_CHECK_HEADERS(usp10.h windows.h, have_uniscribe=true, have_uniscribe=false)
+AC_MSG_CHECKING([for ScriptShapeOpenType in usp10])
+saved_LIBS=$LIBS
+LIBS="$LIBS -lusp10 -lgdi32"
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+	[[
+	 #define _WIN32_WINNT 0x0600
+	 #include <windows.h>
+	 #include <usp10.h>
+	 ]],
+	ScriptShapeOpenType)],
+	[have_uniscribe=true; AC_MSG_RESULT(yes)],
+	[have_uniscribe=false;AC_MSG_RESULT(no)])
+LIBS=$saved_LIBS
 if $have_uniscribe; then
 	UNISCRIBE_CFLAGS=
 	UNISCRIBE_LIBS="-lusp10 -lgdi32"
commit d41c0c955b8ad9b52191ca47e1f3b1bfe606deb1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 10 16:41:20 2012 -0500

    Update config template

diff --git a/config.h.in b/config.h.in
index 923970c..f465cc0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,9 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h>
-   header file. */
-#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
-
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT