CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/11/28 03:34:27
Modified files:
. : Makefile.am configure.ac ChangeLog
Added files:
macros : qtopia.m4
Log message:
* macros/qtopia.m4: New file to find Qtopia bits. Current
supports
only QT2 and Qt4.
* Makefile.am: Add Qtopia debug statements.
* configure.ac: Add Qtopia as a GUI. Look for Qtopia dev files
if
specified. Currently because of the diversity of Qtopia
installation paths, --with-qtopia-incl and --with-qtopia-lib
must
always be used.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.442&r2=1.443
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4989&r2=1.4990
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qtopia.m4?cvsroot=gnash&rev=1.1
Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- Makefile.am 22 Nov 2007 16:19:56 -0000 1.93
+++ Makefile.am 28 Nov 2007 03:34:26 -0000 1.94
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.93 2007/11/22 16:19:56 rsavoye Exp $
+# $Id: Makefile.am,v 1.94 2007/11/28 03:34:26 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -121,14 +121,18 @@
@echo "GUI Toolkit decoding support..."
@echo " SDL_CFLAGS is $(SDL_CFLAGS)"
@echo " SDL_LIBS is $(SDL_LIBS)"
-if HAVE_KDE
+if BUILD_KDE_GUI
@echo " KDE_CFLAGS is $(KDE_CFLAGS)"
@echo " KDE_LIBS is $(KDE_LIBS)"
endif
-if HAVE_QT
+if BUILD_QT_GUI
@echo " QT_CFLAGS is $(QT_CFLAGS)"
@echo " QT_LIBS is $(QT_LIBS)"
endif
+if BUILD_QTOPIA_GUI
+ @echo " QTOPIA_CFLAGS is $(QTOPIA_CFLAGS)"
+ @echo " QTOPIA_LIBS is $(QTOPIA_LIBS)"
+endif
if BUILD_FLTK_GUI
@echo " FLTK2_CFLAGS is $(FLTK2_CFLAGS)"
@echo " FLTK2_LIBS is $(FLTK2_LIBS)"
@@ -221,6 +225,10 @@
@echo " AGG_CFLAGS is $(AGG_CFLAGS)"
@echo " AGG_LIBS is $(AGG_LIBS)"
endif
+if BUILD_ALP_GUI
+ @echo " ALP_CFLAGS is $(ALP_CFLAGS)"
+ @echo " ALP_LIBS is $(ALP_LIBS)"
+endif
@echo ""
@echo "A blank value for CFLAGS means the header is installed in the"
@echo "default system header location. All the LIBS should have a"
@@ -243,6 +251,9 @@
if BUILD_KDE_GUI
@echo " Supported GUI: KDE"
endif
+if BUILD_QTOPIA_GUI
+ @echo " Supported GUI: QTOPIA"
+endif
if BUILD_SDL_GUI
@echo " Supported GUI: SDL"
endif
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -b -r1.442 -r1.443
--- configure.ac 22 Nov 2007 17:34:45 -0000 1.442
+++ configure.ac 28 Nov 2007 03:34:26 -0000 1.443
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.442 2007/11/22 17:34:45 rsavoye Exp $
+dnl $Id: configure.ac,v 1.443 2007/11/28 03:34:26 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -250,6 +250,7 @@
build_aqua=no
build_hildon=no
build_alp=no
+build_qtopia=no
AC_ARG_ENABLE(gui,
AC_HELP_STRING([--enable-gui=], [Use the specified GUI toolkit
(default=gtk,kde)]),
if test -n ${enableval}; then
@@ -262,21 +263,25 @@
build_hildon=yes
AC_DEFINE(USE_HILDON, [1], [Use the Hildon mobile framework])
build_gtk=yes
- AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
+dnl AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
;;
alp|ALP|alp|ALP)
build_alp=yes
- AC_DEFINE(USE_ALP, [1], [Use the ALP framework])
+dnl AC_DEFINE(USE_ALP, [1], [Use the ALP framework])
build_gtk=yes
- AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
+dnl AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
;;
gtk|GTK|gtk2|GTK2)
- AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
+dnl AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
build_gtk=yes
;;
kde|KDE)
build_kde=yes
;;
+ qtopia|QTOPIA)
+ build_qtopia=yes
+ build_qt=yes
+ ;;
qt|QT)
build_qt=yes
;;
@@ -301,11 +306,12 @@
build_kde=yes
build_gtk=yes
build_sdl=yes
+dnl build_qtopia=yes
dnl build_hildon=yes
dnl build_alp=yes
dnl build_riscos=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde|fltk|sdl|riscos|aqua|fb|hildon|alp)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia)])
;;
esac]
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1111,10 +1117,17 @@
dnl # Check KDE if kde gui or kparts were requested
if test x$build_kde = xyes -o x$kparts = xyes; then
GNASH_PATH_KDE
+fi
+if test x$build_qt = xyes -o x$build_qtopia = xyes; then
GNASH_PATH_QT
+ if test x$build_qtopia = xyes; then
+ GNASH_PATH_QTOPIA
+ fi
fi
+AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
+AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
dnl Need GLIB for both GTK and GST
if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
@@ -1139,11 +1152,12 @@
AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based
GUI!"])
fi
+AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
+AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
AM_CONDITIONAL(BUILD_HILDON_GUI, [ test x$build_hildon = xyes ])
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
-dnl AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
@@ -1503,6 +1517,15 @@
AC_SUBST(RENDERER_CONFIG)
SUPPORTED_GUIS=
+if test x$build_qtopia = xyes; then
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},qtopia"
+fi
+if test x$build_hildon = xyes; then
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},hildon"
+fi
+if test x$build_alp = xyes; then
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},alp"
+fi
if test x$build_fb = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},fb"
fi
@@ -1756,6 +1779,22 @@
fi
fi
+if test x"$has_qt" = xyes; then
+ if test x"${QTOPIA_LIBS}" != x ; then
+ if test x"${QTOPIA_CFLAGS}" != x ; then
+ echo " QTOPIA flags are: $QTOPIA_CFLAGS"
+ else
+ echo " QTOPIA flags are: default include path"
+ fi
+ echo " QTOPIA libs are: $QTOPIA_LIBS"
+ else
+ echo " ERROR: No QTOPIA library development package installed!"
+ echo " Install it from http://trolltech.com/downloads/";
+ echo " binary packages are not available."
+ nogo=true
+ fi
+fi
+
if test x"${JPEG_LIBS}" != x ; then
if test x"${JPEG_CFLAGS}" != x ; then
echo " JPEG flags are: $JPEG_CFLAGS"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4989
retrieving revision 1.4990
diff -u -b -r1.4989 -r1.4990
--- ChangeLog 27 Nov 2007 23:29:39 -0000 1.4989
+++ ChangeLog 28 Nov 2007 03:34:26 -0000 1.4990
@@ -1,3 +1,13 @@
+2007-11-27 Rob Savoye <[EMAIL PROTECTED]>
+
+ * macros/qtopia.m4: New file to find Qtopia bits. Current supports
+ only QT2 and Qt4.
+ * Makefile.am: Add Qtopia debug statements.
+ * configure.ac: Add Qtopia as a GUI. Look for Qtopia dev files if
+ specified. Currently because of the diversity of Qtopia
+ installation paths, --with-qtopia-incl and --with-qtopia-lib must
+ always be used.
+
2007-11-27 Sandro Santilli <[EMAIL PROTECTED]>
* server/swf/tag_loaders.cpp (serialnumber_loader): fix parsing
Index: macros/qtopia.m4
===================================================================
RCS file: macros/qtopia.m4
diff -N macros/qtopia.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/qtopia.m4 28 Nov 2007 03:34:27 -0000 1.1
@@ -0,0 +1,236 @@
+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 3 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 $Id: qtopia.m4,v 1.1 2007/11/28 03:34:27 rsavoye Exp $
+
+dnl [EMAIL PROTECTED] pts/8> QtCore QtSvg Qtnetwork QtXml
+dnl QtCore: Command not found.
+dnl [EMAIL PROTECTED] pts/8>
-L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/lib -lQtSvg
-L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/qtopiacore/target/lib
-lQtSql -lQtXml -lQtGui -lpng -lQtNetwork -lQtCore -lz -lm -lrt -ldl -lpthread
-lqtopiabase -lqtopia -lmd5 -lqtopia-sqlite -lqtopiasecurity
-Wl,-rpath,/usr/local/qtopia-prefix/lib
+dnl -L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/lib: Command not
found.
+
+AC_DEFUN([GNASH_PATH_QTOPIA],
+[
+
+ has_qtopia=no
+ dnl the list of Qtopia headers we need
+ dnl Look for the header
+ AC_ARG_WITH(qtopia_incl, AC_HELP_STRING([--with-qtopia-incl], [directory
where libqtopia header is]), with_qtopia_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_qtopia_incl,[
+ if test x"${with_qtopia_incl}" != x ; then
+ if test -f ${with_qtopia_incl}/qtopiamail/qtopiamail.h ; then
+ gnash_qtopia_topdir="${with_qtopia_incl}"
+ ac_cv_path_qtopia_incl="-I`(cd ${with_qtopia_incl}; pwd)`"
+ gnash_qtopia_version=4
+ else
+ gnash_qtopia_topdir="${with_qtopia_incl}"
+ if test -f ${with_qtopia_incl}/qtopia/mail/qtopiamail.h ; then
+ ac_cv_path_qtopia_incl="-I`(cd ${with_qtopia_incl}; pwd)`"
+ gnash_qtopia_version=2
+ else
+ AC_MSG_ERROR([${with_qtopia_incl} directory doesn't contain
qtopiamail.h])
+ fi
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_qtopia_incl}" = x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_qtopia_incl}" = x; then
+ $PKG_CONFIG --exists qt-mt && ac_cv_path_qtopia_incl="`$PKG_CONFIG
--cflags-only-I qt-mt | cut -d ' ' -f 1`"
+ fi
+ fi
+
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+
+ AC_MSG_CHECKING([for the Qtopia Version])
+
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists qtopia-1 && gnash_qtopia_version="`$PKG_CONFIG
--modversion qtopia-1 | cut -d '.' -f 1`"
+ fi
+ fi
+
+ if test x"${gnash_qtopia_version}" = x; then
+ gnash_qtopia_topdir=""
+ gnash_qtopia_version=""
+ for i in $incllist; do
+ for j in `ls -dr $i/qtopia-[[0-9]] 2>/dev/null`; do
+ if test -f $j/qtopia/qtopia-program.h; then
+ gnash_qtopia_topdir="`basename $j`"
+ gnash_qtopia_version="`echo ${gnash_qtopia_topdir} | sed -e
's:qtopia-::'`"
+ ac_cv_path_qtopia_incl="-I$i/${gnash_qtopia_topdir}"
+ break
+ fi
+ done
+ if test x$gnash_qtopia_version != x; then
+ break;
+ fi
+ done
+ fi
+ fi dnl end of ${ac_cv_path_qtopia_incl}
+
+ dnl this a sanity check for Qtopia 2
+ AC_MSG_CHECKING([Sanity checking the Qtopia header installation])
+ qt_headers="qpen.h qpixmap.h"
+ if test $gnash_qtopia_version -eq 2; then
+ gnash_qtopia_topdir=`dirname ${gnash_qtopia_topdir}`
+ if test x"${ac_cv_path_qtopia_incl}" != x; then
+ for i in $qt_headers; do
+ if ! test -f ${gnash_qtopia_topdir}/include/$i; then
+ AC_MSG_WARN([$i not found!])
+ qtopia_nogo=yes
+ fi
+ done
+ fi
+ fi
+
+ dnl this a sanity check for Qtopia 4
+ qt_headers="QtXml QtGui QtCore"
+ if test $gnash_qtopia_version -eq 4; then
+ gnash_qtopia_topdir=`dirname ${gnash_qtopia_topdir}`
+ if test x"${ac_cv_path_qtopia_incl}" != x; then
+ for i in $qt_headers; do
+ if ! test -f ${gnash_qtopia_topdir}/qtopiacore/target/include/Qt/$i;
then
+ AC_MSG_WARN([$i not found!])
+ qtopia_nogo=yes
+ fi
+ done
+ fi
+ fi
+
+ if test x"${qtopia_nogo}" = xyes; then
+ AC_MSG_ERROR([Broken Qtopia header installation!])
+ else
+ AC_MSG_RESULT([fine])
+ fi
+
+ if test x"${gnash_qtopia_version}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${gnash_qtopia_version}])
+ fi
+
+ AC_MSG_CHECKING([for libqtopia header])
+ AC_MSG_RESULT(${ac_cv_path_qtopia_incl})
+
+ dnl the list of Qtopia libs we need
+ qt_libs="qtopiabase qtopia md5 qtopia-sqlite qtopiasecurity"
+
+ dnl Look for the library
+ AC_ARG_WITH(qtopia_lib, AC_HELP_STRING([--with-qtopia-lib], [directory where
qtopia library is]), with_qtopia_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_qtopia_lib,[
+ if test x"${with_qtopia_lib}" != x ; then
+ if test -f ${with_qtopia_lib}/libqtopiamail.a -o -f
${with_qtopia_lib}/libqtopiamail.${shlibext}; then
+ ac_cv_path_qtopia_lib="-L`(cd ${with_qtopia_lib}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_qtopia_lib} directory doesn't contain
libqtopiaqtopia.])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_qtopia_lib}" = x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_qtopia_lib}" = x; then
+ $PKG_CONFIG --exists qt-mt && ac_cv_path_qtopia_lib="`$PKG_CONFIG
--libs-only-l qt-mt | cut -d ' ' -f 1`"
+ fi
+ fi
+
+ if test x"${ac_cv_path_qtopia_lib}" = x; then
+ for i in $libslist; do
+ if test -f $i/libqtopiamail.a -o -f $i/libqtopiamail.${shlibext}; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
+ ac_cv_path_qtopia_lib="-L$i -lqtopiamail"
+ break
+ else
+ ac_cv_path_qtopia_lib="-lqtopiamail"
+ break
+ fi
+ fi
+ done
+ else
+ qtopia_lib_path=`$PKG_CONFIG --libs-only-L qtopia`
+ if test ! $qtopia_lib_path = "-L/usr/lib" -o $qtopia_lib_path =
"-L/usr/lib64"; then
+ ac_cv_path_qtopia_lib="${qtopia_lib_path} ${ac_cv_path_qtopia_lib}"
+ fi
+ fi
+ fi
+
+ dnl this a sanity check for Qtopia 2
+ qt_libs="libqt libqtopia"
+ if test $gnash_qtopia_version -eq 2; then
+ if test x"${ac_cv_path_qtopia_lib}" != x; then
+ for i in $qt_libs; do
+ if ! test -f ${gnash_qtopia_topdir}/lib/$i.${shlibext}; then
+ AC_MSG_WARN([$i not found!])
+ qtopia_nogo=yes
+ fi
+ done
+ fi
+ fi
+
+ dnl this a sanity check for Qtopia 4
+ AC_MSG_CHECKING([Sanity checking the Qtopia installation])
+ qt_libs="libqtopia libqtopiabase"
+ if test $gnash_qtopia_version -eq 4; then
+ if test x"${ac_cv_path_qtopia_lib}" != x; then
+ for i in $qt_libs; do
+ if ! test -f ${gnash_qtopia_topdir}/lib/$i.${shlibext}; then
+ AC_MSG_WARN([$i not found!])
+ qtopia_nogo=yes
+ fi
+ done
+ fi
+ fi
+ if test x"${qtopia_nogo}" = xyes; then
+ AC_MSG_ERROR([Broken Qtopia library installation!])
+ else
+ AC_MSG_RESULT([fine])
+ fi
+
+ AC_DEFINE([QTOPIA_VERSION], [${gnash_qtopia_version}], [The Qtopia version])
+
+ AC_MSG_CHECKING([for libqtopia library])
+ AC_MSG_RESULT(${ac_cv_path_qtopia_lib})
+
+ if test x"${ac_cv_path_qtopia_lib}" = x; then
+ AC_CHECK_LIB(qtopia-${gnash_qtopia_version},
qtopia_engine_shape_class_init,
[ac_cv_path_qtopia_lib="-lqtopia-${gnash_qtopia_version}"])
+ fi
+
+ if test x"${ac_cv_path_qtopia_incl}" != x; then
+ QTOPIA_CFLAGS="${ac_cv_path_qtopia_incl}"
+ else
+ QTOPIA_CFLAGS=""
+ fi
+
+ if test x"${ac_cv_path_qtopia_lib}" != x; then
+ QTOPIA_LIBS="${ac_cv_path_qtopia_lib}"
+ AC_DEFINE(HAVE_QTOPIA, [1], [has the Qtopia framework])
+ has_qtopia=yes
+ else
+ QTOPIA_LIBS=""
+ fi
+
+ AC_SUBST(QTOPIA_CFLAGS)
+ AC_SUBST(QTOPIA_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
