diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | configure.in | 11 |
8 files changed, 57 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c171996b..75d8c8fd 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +2001-05-06 Alexander Larsson <alla@lysator.liu.se> + + * configure.in: + Fix Xft detection by setting CPPFLAGS before trying + the Xft/XftFreetyp.h header file. + Use CPPFLAGS instead of CFLAGS. + 2001-01-06 Hans Breuer <hans@breuer.org> * pango/makefile.msc : reflect new version number, removed diff --git a/configure.in b/configure.in index e4f85aa2..3648276e 100644 --- a/configure.in +++ b/configure.in @@ -78,8 +78,8 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then ,:,$FREETYPE_LIBS) if $have_freetype ; then - pango_save_cflags="$CFLAGS" - CFLAGS="$CFLAGS $FREETYPE_CFLAGS" + pango_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)]) AC_TRY_COMPILE([ @@ -93,7 +93,7 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then AC_MSG_RESULT(no) fi - CFLAGS="$pango_save_cflags" + CPPFLAGS="$pango_save_cppflags" fi fi AC_SUBST(FREETYPE_LIBS) @@ -108,6 +108,9 @@ XFT_LIBS="" XFT_CFLAGS="" if test $have_x = true ; then if test $have_freetype = true ; then + pango_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" + AC_CHECK_LIB(Xrender, XRenderFindFormat, AC_CHECK_LIB(Xft, XftFontOpen, AC_CHECK_HEADER(X11/Xft/XftFreetype.h, @@ -115,6 +118,8 @@ if test $have_x = true ; then :,-lXrender -lXext $X_LIBS $FREETYPE_LIBS) ,:,-lXext $X_LIBS) + CPPFLAGS="$pango_save_cppflags" + if $have_xft = 'true' ; then XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS" fi |