gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 08:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug #18508

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24300 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-12-31 07:06:38 +00:00
parent 30bfacc835
commit fc3254d9fc
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-12-31 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Explicitly add freetype libs and flags when building
cairo, in case the cairo config stuff has left them out.
Should fix bug #18508
* configure: regenerate
2006-12-30 Mark Tracy <tracy454@concentric.net>
* Source/art/ReadRect.m (-GSReadRect:): incorporate offset into
coordinate transformation calculations. Fixes bug #18260

9
configure vendored
View file

@ -7395,6 +7395,11 @@ echo "$as_me: error: can't find cairo, required for graphics=cairo!" >&2;}
{ (exit 1); exit 1; }; }
BUILD_GRAPHICS=xlib
fi
if test "$have_freetype" = no; then
{ echo "$as_me:$LINENO: WARNING: can't find freetype, required for graphics=cairo" >&5
echo "$as_me: WARNING: can't find freetype, required for graphics=cairo" >&2;}
BUILD_GRAPHICS=xlib
fi
if test $BUILD_GRAPHICS = xlib; then
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
@ -7402,8 +7407,8 @@ echo "$as_me: error: can't find cairo, required for graphics=cairo!" >&2;}
{ echo "$as_me:$LINENO: Switching to $BUILD_GRAPHICS" >&5
echo "$as_me: Switching to $BUILD_GRAPHICS" >&6;}
else
LIBS="$CAIRO_LIBS $LIBS"
CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
LIBS="$CAIRO_LIBS $FREETYPE_LIBS $LIBS"
CPPFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS $CPPFLAGS"
fi
elif test x"$BUILD_GRAPHICS" = "xxlib"; then
: # Nothing to do

8
configure.ac
View file

@ -383,14 +383,18 @@ elif test x"$BUILD_GRAPHICS" = "xcairo"; then
AC_MSG_ERROR([can't find cairo, required for graphics=cairo!])
BUILD_GRAPHICS=xlib
fi
if test "$have_freetype" = no; then
AC_MSG_WARN([can't find freetype, required for graphics=cairo])
BUILD_GRAPHICS=xlib
fi
if test $BUILD_GRAPHICS = xlib; then
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
else
LIBS="$CAIRO_LIBS $LIBS"
CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
LIBS="$CAIRO_LIBS $FREETYPE_LIBS $LIBS"
CPPFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS $CPPFLAGS"
fi
elif test x"$BUILD_GRAPHICS" = "xxlib"; then
: # Nothing to do