cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

must use PKG_PROG_PKG_CONFIG before PKG_CHECK_MODULES; fixes configure for Unicode wxX11 build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-10-19 15:12:46 +00:00
parent 8946d7fd68
commit 479c790cb7
2 changed files with 541 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1233
configure vendored
View File

File diff suppressed because it is too large Load Diff

76
configure.in
View File

@ -3206,6 +3206,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
fi fi
if test "$wxUSE_DFB" = 1; then if test "$wxUSE_DFB" = 1; then
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(DIRECTFB, PKG_CHECK_MODULES(DIRECTFB,
[directfb >= 0.9.22], [directfb >= 0.9.22],
[ [
@ -3282,42 +3284,44 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
fi fi
if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
PKG_CHECK_MODULES(PANGOX, pangox, PKG_PROG_PKG_CONFIG()
[
CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS" PKG_CHECK_MODULES(PANGOX, pangox,
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS" [
], CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
[ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode]) ],
] [
) AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
PKG_CHECK_MODULES(PANGOFT2, pangoft2, ]
[ )
CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS" PKG_CHECK_MODULES(PANGOFT2, pangoft2,
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" [
], CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
[ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support]) ],
wxUSE_PRINTING_ARCHITECTURE="no" [
] AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
) wxUSE_PRINTING_ARCHITECTURE="no"
PKG_CHECK_MODULES(PANGOXFT, pangoxft, ]
[ )
AC_DEFINE(HAVE_PANGO_XFT) PKG_CHECK_MODULES(PANGOXFT, pangoxft,
CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS" [
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" AC_DEFINE(HAVE_PANGO_XFT)
], CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
[ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support]) ],
] [
) AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
save_CXXFLAGS="$CXXFLAGS" ]
save_LIBS="$LIBS" )
CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS" save_CXXFLAGS="$CXXFLAGS"
LIBS="$LIBS $PANGOX_LIBS" save_LIBS="$LIBS"
AC_CHECK_FUNCS([pango_font_family_is_monospace]) CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
CXXFLAGS="$save_CXXFLAGS" LIBS="$LIBS $PANGOX_LIBS"
LIBS="$save_LIBS" AC_CHECK_FUNCS([pango_font_family_is_monospace])
CXXFLAGS="$save_CXXFLAGS"
LIBS="$save_LIBS"
fi fi
wxUSE_UNIVERSAL="yes" wxUSE_UNIVERSAL="yes"