[q-lang-cvs] q ChangeLog,1.4,1.5 config.h.in,1.2,1.3 configure.in,1.3,1.4

[<ag...@us...>]

Update of /cvsroot/q-lang/q
In directory sc8-pr-cvs1:/tmp/cvs-serv9986

Modified Files:
	ChangeLog config.h.in configure.in 
Log Message:
Added FreeType2 support

Index: ChangeLog
===================================================================
RCS file: /cvsroot/q-lang/q/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	16 Dec 2003 19:11:16 -0000	1.4
--- ChangeLog	19 Dec 2003 21:31:34 -0000	1.5
***************
*** 1,2 ****
--- 1,14 ----
+ 2003-12-19  Albert Graef  <Dr....@t-...>
+ 
+ 	* README-GGI: add information about FreeType support
+ 
+ 	* ggi.q, ggi.c: replaced ggi_get_char_size with the more general
+ 	ggi_get_string_size function which calculates the dimensions of
+ 	the bounding box of a rendered string
+ 
+ 	* ggi.q, ggi.c, configury: added FreeType2 support (TODO: add
+ 	support for linear transformations and alpha blending in the text
+ 	rendering algorithm)
+ 
  2003-12-16  Albert Graef  <Dr....@t-...>
  

Index: config.h.in
===================================================================
RCS file: /cvsroot/q-lang/q/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h.in	15 Dec 2003 12:07:13 -0000	1.2
--- config.h.in	19 Dec 2003 21:31:34 -0000	1.3
***************
*** 117,120 ****
--- 117,123 ----
  #undef HAVE_FTRUNCATE
  
+ /* Define if you have the `FT_Init_FreeType' function. */
+ #undef HAVE_FT_INIT_FREETYPE
+ 
  /* Define if you have the `getegid' function. */
  #undef HAVE_GETEGID

Index: configure.in
===================================================================
RCS file: /cvsroot/q-lang/q/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in	16 Dec 2003 19:11:16 -0000	1.3
--- configure.in	19 Dec 2003 21:31:34 -0000	1.4
***************
*** 235,239 ****
  GGI_LIBBUF="yes"
  AC_ARG_WITH(ggibuf,
!   [  --with-ggibuf[[=LIBS]]    use GGI libbuf (alpha/z buffer support)],
    [case "${withval}" in
      no)  GGI_LIBBUF="" ;;
--- 235,239 ----
  GGI_LIBBUF="yes"
  AC_ARG_WITH(ggibuf,
!   [  --with-ggibuf[[=LIBS]]    use the GGI buffer extension (alpha/z buffer support)],
    [case "${withval}" in
      no)  GGI_LIBBUF="" ;;
***************
*** 247,251 ****
    AC_CHECK_LIB(ggibuf, ggiBufInit, [ GGI_LIBBUF="-lggibuf -lggigalloc" ])
    if test "${GGI_LIBBUF}" = ""; then
!     AC_MSG_WARN([could not find the GGI buffer library, building without buffer support])
    else
      AC_MSG_RESULT([defining GGI_LIBBUF to be ${GGI_LIBBUF}])
--- 247,251 ----
    AC_CHECK_LIB(ggibuf, ggiBufInit, [ GGI_LIBBUF="-lggibuf -lggigalloc" ])
    if test "${GGI_LIBBUF}" = ""; then
!     AC_MSG_WARN([could not find the GGI buffer extension, building without buffer support])
    else
      AC_MSG_RESULT([defining GGI_LIBBUF to be ${GGI_LIBBUF}])
***************
*** 264,267 ****
--- 264,302 ----
  AC_SUBST(GGI_INCLUDES)
  
+ # FreeType2
+ 
+ FT2_LIBS="yes"
+ AC_ARG_WITH(ft2,
+   [  --with-ft2[[=LIBS]]       use the FreeType2 library (font support for ggi)],
+   [case "${withval}" in
+     no)  FT2_LIBS="" ;;
+     *) FT2_LIBS="${withval}" ;;
+   esac])
+ ftconf=`which freetype-config 2>/dev/null`
+ if test "${FT2_LIBS}" = "yes"; then
+   FT2_LIBS=""
+   if test -x "$ftconf"; then
+     FT2_LIBS=`$ftconf --libs`
+     AC_MSG_RESULT([defining FT2_LIBS to be ${FT2_LIBS}])
+   else
+     AC_MSG_WARN([could not find the FreeType2 library, building without font support])
+   fi
+ fi
+ AC_SUBST(FT2_LIBS)
+ 
+ if test -x "$ftconf"; then
+   FT2_INCLUDES=`$ftconf --cflags`
+ else
+   FT2_INCLUDES=""
+ fi
+ AC_ARG_WITH(ft2-includes,
+   [  --with-ft2-includes=INC extra includes for the FreeType2 library],
+   [case "${withval}" in
+     yes) ;;
+     no)  FT2_INCLUDES="" ;;
+     *) FT2_INCLUDES="${withval}" ;;
+   esac])
+ AC_SUBST(FT2_INCLUDES)
+ 
  # ImageMagick
  
***************
*** 554,557 ****
--- 589,596 ----
  AC_CHECK_FUNCS(ggiBufInit)
  LIBS=$OLDLIBS
+ dnl freetype2 support
+ LIBS="$LIBS ${FT2_LIBS}"
+ AC_CHECK_FUNCS(FT_Init_FreeType)
+ LIBS=$OLDLIBS
  
  dnl Configure readline support.
***************
*** 666,669 ****
--- 705,714 ----
  else
  AC_MSG_RESULT([  GGI:                  disabled])
+ fi
+ if test "${FT2_LIBS}" != ""; then
+ AC_MSG_RESULT([  FreeType2:            libraries: ${FT2_LIBS}])
+ AC_MSG_RESULT([                        includes : ${FT2_INCLUDES}])
+ else
+ AC_MSG_RESULT([  FreeType2:            disabled])
  fi
  if test "${MAGICK_LIBS}" != ""; then