[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac Makefile.am ChangeLog macros...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash configure.ac Makefile.am ChangeLog macros... |
Date: |
Sat, 30 Sep 2006 15:56:30 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/09/30 15:56:30
Modified files:
. : configure.ac Makefile.am ChangeLog
Added files:
macros : boost.m4 agg.m4
Log message:
* macros/boost.m4: Look for Boost paths.
* macros/agg.m4: Look for Antigrain paths.
* configure.ac: Look for Antigrain and Boost headers and
libraries. Add an "agg" option to --enable-renderer.
* Makefile.am: Print AGG and Boost flags for the dumpconfig.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.975&r2=1.976
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&rev=1.1
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- configure.ac 29 Sep 2006 15:27:07 -0000 1.119
+++ configure.ac 30 Sep 2006 15:56:30 -0000 1.120
@@ -33,7 +33,7 @@
dnl also makes it possible to release a modified version which carries
dnl forward this exception.
-dnl $Id: configure.ac,v 1.119 2006/09/29 15:27:07 rsavoye Exp $
+dnl $Id: configure.ac,v 1.120 2006/09/30 15:56:30 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.1-cvs)
@@ -181,10 +181,12 @@
renderer,
[ --enable-renderer=engine Specify rendering engine:
OpenGL (default)
+ Agg (experimental)
Cairo (experimental)],
[case "${enableval}" in
opengl|OpenGL) renderer=opengl ;;
cairo|Cairo) renderer=cairo ;;
+ agg|Agg|AGG) renderer=agg ;;
*) AC_MSG_ERROR([invalid renderer ${enableval} given]) ;;
esac],
[renderer=opengl]
@@ -200,6 +202,11 @@
fi
AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
+if test x$renderer = xagg; then
+ AC_DEFINE([RENDERER_AGG], [], [Use AntiGrain renderer])
+fi
+AM_CONDITIONAL(USE_RENDERER_AGG, test x$renderer = xagg)
+
dnl --------------------------------------------------------
dnl Select sound streamer
dnl --------------------------------------------------------
@@ -381,6 +388,7 @@
GNASH_PATH_SDL
AM_CONDITIONAL(HAS_SDL, [ test x$has_sdl = xyes ])
GNASH_PATH_SDL_MIXER
+GNASH_PATH_BOOST
dnl
dnl NOTE: make sure to check for GLIB and LIBXML2
@@ -400,6 +408,7 @@
GNASH_PATH_XFT
AM_CONDITIONAL(HAS_XFT, [ test x$has_xft = xyes ])
GNASH_PATH_CAIRO
+GNASH_PATH_AGG
GNASH_PATH_PANGO
GNASH_PATH_ATK
GNASH_PATH_PTHREADS
@@ -957,6 +966,28 @@
echo " CURL libs are: $CURL_LIBS"
fi
+if test x$renderer = xagg; then
+ if test x"$AGG_LIBS" != x; then
+ if test x"$AGG_CFLAGS" != x; then
+ echo " AGG flags are: $AGG_CFLAGS"
+ else
+ echo " AGG flags are: default include path"
+ fi
+ echo " AGG libs are: $AGG_LIBS"
+ else
+ echo "ERROR: No AGG development package installed!\
+ You need to have the AGG development package installed\
+ to compile this project or install libagg-dev \
+ (using apt-get) or agg-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+
+dnl For now, Boost is optional
+echo " Boost flags are: ${BOOST_CFLAGS}"
+echo " Boost lib flags are: ${BOOST_LIBS}"
+
# If anything critical is missing, don't bother to continue
if test x"$nogo" = x"true"; then
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- Makefile.am 17 Sep 2006 19:45:58 -0000 1.34
+++ Makefile.am 30 Sep 2006 15:56:30 -0000 1.35
@@ -126,8 +126,6 @@
@echo "XFT_LIBS is $(XFT_LIBS)"
@echo "PANGO_CFLAGS is $(PANGO_CFLAGS)"
@echo "PANGO_LIBS is $(PANGO_LIBS)"
- @echo "CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
- @echo "CAIRO_LIBS is $(CAIRO_LIBS)"
@echo "ATK_CFLAGS is $(ATK_CFLAGS)"
@echo "ATK_LIBS is $(ATK_LIBS)"
@echo "GLIB_CFLAGS is $(GLIB_CFLAGS)"
@@ -146,6 +144,12 @@
@echo "GSTREAMER_LIBS is $(GSTREAMER_LIBS)"
@echo "KDE_INCLUDES is $(KDE_INCLUDES)"
@echo "KDE_LDFLAGS is $(KDE_LDFLAGS)"
+ @echo "CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
+ @echo "CAIRO_LIBS is $(CAIRO_LIBS)"
+ @echo "BOOST_CFLAGS is $(BOOST_CFLAGS)"
+ @echo "BOOST_LIBS is $(BOOST_LIBS)"
+ @echo "AGG_CFLAGS is $(AGG_CFLAGS)"
+ @echo "AGG_LIBS is $(AGG_LIBS)"
@echo "A blank value for CFLAGS means the header is installed in the"
@echo "default system header location. All the LIBS should have a"
@echo "legit value"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -b -r1.975 -r1.976
--- ChangeLog 30 Sep 2006 11:05:13 -0000 1.975
+++ ChangeLog 30 Sep 2006 15:56:30 -0000 1.976
@@ -1,4 +1,12 @@
-2006-09-30 Markus Gothe <address@hidden>
+2006-09-30 Rob Savoye <address@hidden>
+
+ * macros/boost.m4: Look for Boost paths.
+ * macros/agg.m4: Look for Antigrain paths.
+ * configure.ac: Look for Antigrain and Boost headers and
+ libraries. Add an "agg" option to --enable-renderer.
+ * Makefile.am: Print AGG and Boost flags for the dumpconfig.
+
+006-09-30 Markus Gothe <address@hidden>
* libbase/noseek_fd_adapter.cpp: fixed typecasting.
Index: macros/boost.m4
===================================================================
RCS file: macros/boost.m4
diff -N macros/boost.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/boost.m4 30 Sep 2006 15:56:30 -0000 1.1
@@ -0,0 +1,122 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+dnl Linking Gnash statically or dynamically with other modules is making a
+dnl combined work based on Gnash. Thus, the terms and conditions of the GNU
+dnl General Public License cover the whole combination.
+dnl
+dnl As a special exception, the copyright holders of Gnash give you
+dnl permission to combine Gnash with free software programs or libraries
+dnl that are released under the GNU LGPL and with code included in any
+dnl release of Talkback distributed by the Mozilla Foundation. You may
+dnl copy and distribute such a system following the terms of the GNU GPL
+dnl for all but the LGPL-covered parts and Talkback, and following the
+dnl LGPL for the LGPL-covered parts.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is their
+dnl choice whether to do so. The GNU General Public License gives permission
+dnl to release a modified version without this exception; this exception
+dnl also makes it possible to release a modified version which carries
+dnl forward this exception.
+dnl
+dnl
+
+AC_DEFUN([GNASH_PATH_BOOST],
+[
+ dnl Lool for the header
+ AC_ARG_WITH(boost_incl, [ --with-boost-incl directory where boost
headers are], with_boost_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_boost_incl,[
+ if test x"${with_boost_incl}" != x ; then
+ if test -f ${with_boost_incl}/weak_ptr.hpp ; then
+ ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
+ elif test -f ${with_boost_incl}/weak_ptr.hpp ; then
+ ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_boost_incl}" = x ; then
+ AC_MSG_CHECKING([for boost header])
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+
+ for i in $incllist; do
+ if test -f $i/boost/weak_ptr.hpp; then
+ ac_cv_path_boost_incl="-I$i/boost"
+ break
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_boost_incl}" != x ; then
+ BOOST_CFLAGS="${ac_cv_path_boost_incl}"
+ fi
+ AC_SUBST(BOOST_CFLAGS)
+
+
+ dnl Look for the library
+ AC_ARG_WITH(boost_lib, [ --with-boost-lib directory where boost
libraries are], with_boost_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_boost_lib,[
+ if test x"${with_boost_lib}" != x ; then
+ if test -f ${with_boost_lib}/libboost_thread.a -o -f
${with_boost_lib}/libboost_thread.so; then
+ ac_cv_path_boost_lib=`(cd ${with_boost_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_boost_lib} directory doesn't contain boost
libraries.])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_boost_lib}" = x; then
+ AC_CHECK_LIB(boost_thread, cleanup_slots, [ac_cv_path_boost_lib=""],[
+ AC_MSG_CHECKING([for libboost library])
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/libboost_thread.a -o -f $i/libboost_thread.so; then
+ if test x"$i" != x"/usr/lib"; then
+ ac_cv_path_boost_lib="-L$i"
+ AC_MSG_RESULT(${ac_cv_path_boost_lib})
+ break
+ else
+ ac_cv_path_boost_lib=""
+ AC_MSG_RESULT(yes)
+ break
+ fi
+ fi
+ done])
+ else
+ if test -f ${ac_cv_path_boost_lib}/libboost_thread.a -o -f
${ac_cv_path_boost_lib}/libboost_thread.so; then
+
+ if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
+ ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib}"
+ else
+ ac_cv_path_boost_lib=""
+ fi
+ fi
+ fi
+
+ if test x"${ac_cv_path_boost_lib}" != x ; then
+ BOOST_LIBS="${ac_cv_path_boost_lib} -lboost_thread"
+ else
+ BOOST_LIBS="-lboost_thread"
+ fi
+
+ AM_CONDITIONAL(HAVE_BOOST, [test x${ac_cv_path_boost_lib} != x])
+
+ AC_SUBST(BOOST_LIBS)
+
+])
Index: macros/agg.m4
===================================================================
RCS file: macros/agg.m4
diff -N macros/agg.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/agg.m4 30 Sep 2006 15:56:30 -0000 1.1
@@ -0,0 +1,122 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+dnl Linking Gnash statically or dynamically with other modules is making a
+dnl combined work based on Gnash. Thus, the terms and conditions of the GNU
+dnl General Public License cover the whole combination.
+dnl
+dnl As a special exception, the copyright holders of Gnash give you
+dnl permission to combine Gnash with free software programs or libraries
+dnl that are released under the GNU LGPL and with code included in any
+dnl release of Talkback distributed by the Mozilla Foundation. You may
+dnl copy and distribute such a system following the terms of the GNU GPL
+dnl for all but the LGPL-covered parts and Talkback, and following the
+dnl LGPL for the LGPL-covered parts.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is their
+dnl choice whether to do so. The GNU General Public License gives permission
+dnl to release a modified version without this exception; this exception
+dnl also makes it possible to release a modified version which carries
+dnl forward this exception.
+dnl
+dnl
+
+AC_DEFUN([GNASH_PATH_AGG],
+[
+ dnl Lool for the header
+ AC_ARG_WITH(agg_incl, [ --with-agg-incl directory where AGG headers
are], with_agg_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_agg_incl,[
+ if test x"${with_agg_incl}" != x ; then
+ if test -f ${with_agg_incl}/agg_math.h ; then
+ ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
+ elif test -f ${with_agg_incl}/agg_math.h ; then
+ ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_agg_incl}" = x ; then
+ AC_MSG_CHECKING([for AGG headers])
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+
+ for i in $incllist; do
+ if test -f $i/agg2/agg_math.h; then
+ ac_cv_path_agg_incl="-I$i/agg2"
+ break
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_agg_incl}" != x ; then
+ AGG_CFLAGS="${ac_cv_path_agg_incl}"
+ fi
+ AC_SUBST(AGG_CFLAGS)
+
+
+ dnl Look for the library
+ AC_ARG_WITH(agg_lib, [ --with-agg-lib directory where AGG libraries
are], with_agg_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_agg_lib,[
+ if test x"${with_agg_lib}" != x ; then
+ if test -f ${with_agg_lib}/libagg.a -o -f ${with_agg_lib}/libagg.so; then
+ ac_cv_path_agg_lib=`(cd ${with_agg_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_agg_lib} directory doesn't contain AGG libraries.])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_agg_lib}" = x; then
+ AC_CHECK_LIB(agg, agg::gamma_ctrl_impl::calc_points,
[ac_cv_path_agg_lib=""],[
+ AC_MSG_CHECKING([for libagg library])
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/libagg.a -o -f $i/libagg.so; then
+ if test x"$i" != x"/usr/lib"; then
+ ac_cv_path_agg_lib="-L$i"
+ AC_MSG_RESULT(${ac_cv_path_agg_lib})
+ break
+ else
+ ac_cv_path_agg_lib=""
+ AC_MSG_RESULT(yes)
+ break
+ fi
+ fi
+ done])
+ else
+ if test -f ${ac_cv_path_agg_lib}/libagg.a -o -f
${ac_cv_path_agg_lib}/libagg.so; then
+
+ if test x"${ac_cv_path_agg_lib}" != x"/usr/lib"; then
+ ac_cv_path_agg_lib="-L${ac_cv_path_agg_lib}"
+ else
+ ac_cv_path_agg_lib=""
+ fi
+ fi
+ fi
+
+ if test x"${ac_cv_path_agg_lib}" != x ; then
+ AGG_LIBS="${ac_cv_path_agg_lib} -lagg -laggplatformX11"
+ else
+ AGG_LIBS="-lagg -laggplatformX11"
+ fi
+
+ AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
+
+ AC_SUBST(AGG_LIBS)
+
+])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash configure.ac Makefile.am ChangeLog macros...,
Rob Savoye <=