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

Make cairo the default backend.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@30359 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2010-05-11 16:40:01 +00:00
parent f3f94afa62
commit 9dea35036b
3 changed files with 2496 additions and 2057 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-05-11 Fred Kiefer <FredKiefer@gmx.de>
* configure.ac: Make cairo the default backend. Fall back to art
and xlib gracefully.
* configure: Regenerate.
2010-05-10 Adam Fedor <fedor@gnu.org>
* Fix release documentation

4480
configure vendored
View file

File diff suppressed because it is too large Load diff

67
configure.ac
View file

@ -458,9 +458,10 @@ LDFLAGS=${GRAPHIC_LFLAGS}
# Which projects should we build?
#--------------------------------------------------------------------
BUILD_SERVER=x11
BUILD_GRAPHICS=art
BUILD_GRAPHICS=cairo
case $target_os in
*mingw32* ) BUILD_SERVER=win32;;
*mingw32* ) BUILD_SERVER=win32
BUILD_GRAPHICS=winlib;;
esac
AC_ARG_ENABLE(server,
@ -478,33 +479,23 @@ AC_MSG_RESULT($BUILD_SERVER)
AC_MSG_CHECKING(Backend Graphics)
AC_MSG_RESULT($BUILD_GRAPHICS)
if test x"$BUILD_GRAPHICS" = "xxdps"; then
CPPFLAGS="-I$x_includes/X11 $CPPFLAGS"
LIBS="-ldpstk -ldps -lpsres -lXt $X_PRE_LIBS $LIBS"
elif test x"$BUILD_GRAPHICS" = "xart"; then
if test x"$BUILD_GRAPHICS" = "xcairo"; then
if test "$have_freetype" = no; then
AC_MSG_WARN([can't find freetype, required for graphics=art])
BUILD_GRAPHICS=xlib
fi
if test "$have_libart" = no; then
AC_MSG_WARN([can't find libart, required for graphics=art])
BUILD_GRAPHICS=xlib
fi
if test $BUILD_GRAPHICS = xlib; then
AC_MSG_WARN([can't find freetype, required for graphics=cairo])
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
else
BUILD_GRAPHICS=xlib
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
elif test "$have_cairo" = no -o "$have_cairo-ft" = no ; then
AC_MSG_WARN([can't find cairo, required for graphics=cairo!])
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
else
BUILD_GRAPHICS=art
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
else
LIBS="$LIBART_LIBS $FREETYPE_LIBS $LIBS"
CPPFLAGS="$LIBART_CFLAGS $FREETYPE_CFLAGS $CPPFLAGS"
fi
elif test x"$BUILD_GRAPHICS" = "xcairo"; then
if test "$have_freetype" = no; then
AC_MSG_ERROR([can't find freetype, required for graphics=cairo])
fi
if test "$have_cairo" = no -o "$have_cairo-ft" = no ; then
AC_MSG_ERROR([can't find cairo, required for graphics=cairo!])
else
AC_MSG_CHECKING(Cairo backend)
CAIRO_LIBS="$CAIRO_FT_LIBS"
@ -549,6 +540,34 @@ elif test x"$BUILD_GRAPHICS" = "xcairo"; then
LIBS="$CAIRO_LIBS $LIBS"
CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
fi
fi
if test x"$BUILD_GRAPHICS" = "xxdps"; then
CPPFLAGS="-I$x_includes/X11 $CPPFLAGS"
LIBS="-ldpstk -ldps -lpsres -lXt $X_PRE_LIBS $LIBS"
elif test x"$BUILD_GRAPHICS" = "xcairo"; then
: # Alread handled above
elif test x"$BUILD_GRAPHICS" = "xart"; then
if test "$have_freetype" = no; then
AC_MSG_WARN([can't find freetype, required for graphics=art])
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
else
BUILD_GRAPHICS=xlib
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
elif test "$have_libart" = no; then
AC_MSG_WARN([can't find libart, required for graphics=art])
if test $BUILD_SERVER = win32; then
BUILD_GRAPHICS=winlib
else
BUILD_GRAPHICS=xlib
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
else
LIBS="$LIBART_LIBS $FREETYPE_LIBS $LIBS"
CPPFLAGS="$LIBART_CFLAGS $FREETYPE_CFLAGS $CPPFLAGS"
fi
elif test x"$BUILD_GRAPHICS" = "xxlib"; then
: # Nothing to do
elif test x"$BUILD_GRAPHICS" = "xwinlib"; then