Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14798
Modified Files:
ChangeLog configure.ac openvrml.pc.in
Log Message:
Use pkg-config to check for FreeType.
Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** configure.ac 3 Feb 2007 07:41:20 -0000 1.108
--- configure.ac 4 Feb 2007 07:55:43 -0000 1.109
***************
*** 37,40 ****
--- 37,41 ----
#
REQUIRE_FONTCONFIG="fontconfig"
+ REQUIRE_FREETYPE="freetype2"
REQUIRE_FIREFOX_JS="firefox-js"
REQUIRE_MOZILLA_JS="mozilla-js >= 1.2.1"
***************
*** 81,90 ****
PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
! AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config])
#
# FreeType >= 2.2 uses const in callback function signatures. This
# doesn't cause an error in C; but it does in C++.
#
! AS_IF([test -n "${FREETYPE_CONFIG}"],
[AC_MSG_CHECKING([if FreeType callback function signatures use const])
AC_CACHE_VAL([ov_cv_ft_const],
--- 82,91 ----
PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
! PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
#
# FreeType >= 2.2 uses const in callback function signatures. This
# doesn't cause an error in C; but it does in C++.
#
! AS_IF([test X$have_freetype != Xno],
[AC_MSG_CHECKING([if FreeType callback function signatures use const])
AC_CACHE_VAL([ov_cv_ft_const],
***************
*** 198,208 ****
[AC_HELP_STRING([--disable-render-text-node],
[disable support for rendering Text nodes])])
! if test "X$enable_render_text_node" = "Xno"; then
! FONTCONFIG_CFLAGS=""
! FONTCONFIG_LIBS=""
! FREETYPE_CFLAGS=""
! FREETYPE_LIBS=""
! else
! if test "X$have_fontconfig" = "Xno" -o -z "$FREETYPE_CONFIG"; then
AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.])
fi
--- 199,204 ----
[AC_HELP_STRING([--disable-render-text-node],
[disable support for rendering Text nodes])])
! if test X$enable_render_text_node != Xno; then
! if test X$have_fontconfig = Xno -o X$have_freetype = Xno; then
AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.])
fi
***************
*** 210,216 ****
OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES},"
fi
! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG}"
! FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
! FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
[Defined if support for rendering Text nodes is enabled.])
--- 206,210 ----
OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES},"
fi
! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG} ${REQUIRE_FREETYPE}"
AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
[Defined if support for rendering Text nodes is enabled.])
***************
*** 218,225 ****
[const for FreeType callback function signatures.])
fi
- AC_SUBST([FONTCONFIG_CFLAGS])
- AC_SUBST([FONTCONFIG_LIBS])
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
#
--- 212,215 ----
Index: openvrml.pc.in
===================================================================
RCS file: /cvsroot/openvrml/openvrml/openvrml.pc.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** openvrml.pc.in 28 Aug 2005 21:27:33 -0000 1.10
--- openvrml.pc.in 4 Feb 2007 07:55:43 -0000 1.11
***************
*** 8,11 ****
Version: @PACKAGE_VERSION@
Requires: @OPENVRML_PKG_REQUIRES@
! Libs: -L${libdir} -lopenvrml @FREETYPE_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread
Cflags: -I${includedir}
--- 8,11 ----
Version: @PACKAGE_VERSION@
Requires: @OPENVRML_PKG_REQUIRES@
! Libs: -L${libdir} -lopenvrml @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread
Cflags: -I${includedir}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1435
retrieving revision 1.1436
diff -C2 -d -r1.1435 -r1.1436
*** ChangeLog 3 Feb 2007 08:22:39 -0000 1.1435
--- ChangeLog 4 Feb 2007 07:55:43 -0000 1.1436
***************
*** 1,2 ****
--- 1,12 ----
+ 2007-02-04 Braden McDaniel <br...@en...>
+
+ Use pkg-config to check for FreeType.
+
+ * configure.ac: Use pkg-config to check for FreeType; add
+ freetype2 to OPENVRML_PKG_REQUIRES if Text node rendering is
+ enabled.
+ * openvrml.pc.in: Removed FREETYPE_LIBS from Libs; this is now
+ covered by Requires.
+
2007-02-03 Braden McDaniel <br...@en...>
|
