diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-03-07 22:05:13 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-03-07 22:05:13 +0000 |
| commit | 1ae71fc57a6c045031be2e067ed00b14eddfbc32 (patch) | |
| tree | 5bd4c67b3de6999eb92704b08cd1775a5896fec9 /configure.in | |
| parent | a48e86b16bcc342882f97950872957282859c216 (diff) | |
| download | pango-1ae71fc57a6c045031be2e067ed00b14eddfbc32.tar.gz | |
configure.in modules/basic/Makefile.am Make building with Uniscribe (using
2007-03-07 Tor Lillqvist <tml@novell.com>
* configure.in
* modules/basic/Makefile.am
* modules/basic/basic-win32.c: Make building with Uniscribe (using
the <usp10.h> header) mandatory. Mingw's w32api headers do include
usp10.h now so one doesn't need to copy it from the Platform SDK
any longer. At runtime using Uniscribe is still optional,
depending on whether usp10.dll is found or not. I think it
isn't necessarily present on Windows 2000 machines, for instance.
* modules/basic/basic-win32.c (lang_name): Instead of a hardcoded
case statement, use GetLocaleInfo() to get the language ISO639
code.
(charset_name): Remove, unused.
(itemize_shape_and_place, uniscribe_shape, basic_engine_shape):
Constify the PangoAnalysis parameter to match the prototype of
PangoEngineShapeClass::script_shape().
svn path=/trunk/; revision=2209
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/configure.in b/configure.in index 9c9f213f..adc27d07 100644 --- a/configure.in +++ b/configure.in @@ -560,34 +560,6 @@ AM_CONDITIONAL(DYNAMIC_TIBETAN_FC, echo $dynamic_modules | egrep '(^|,)tibetan-f # AC_CHECK_FUNCS(flockfile strtok_r) -# -# Check for the Uniscribe header usp10.h for Win32 -# - -AC_ARG_WITH(usp10, - [AC_HELP_STRING([--with-usp10=DIRECTORY], - [where to find the usp10.h header file for Win32 - (typically the Include directory in the - Platform SDK)])]) - -USP10_H=no -if test "${with_usp10+set}" = set && test "$with_usp10" != no; then - AC_MSG_CHECKING([for usp10.h]) - if test -f "$with_usp10"/usp10.h; then - USP10_H="$with_usp10"/usp10.h - elif test -f "$with_usp10"/include/usp10.h; then - USP10_H="$with_usp10"/include/usp10.h - fi - if test "x$USP10_H" != "xno" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_USP10_H, 1, [Have the usp10.h header file for Win32]) - else - AC_MSG_RESULT(no) - fi -fi -AC_SUBST(USP10_H) -AM_CONDITIONAL(HAVE_USP10_H, test "$USP10_H" != no) - dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** |