[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac libgeometry/kd...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac libgeometry/kd... |
|
Date: |
Fri, 24 Feb 2006 00:06:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/02/24 00:06:21
Modified files:
. : ChangeLog configure.ac
libgeometry : kd_tree_packed.cpp
macros : firefox.m4 jpeg.m4 libXML.m4 mad.m4 ming.m4
ogg.m4 opengl.m4 png.m4 sdl.m4 zlib.m4
Added files:
macros : atk.m4 cairo.m4 glib.m4 gtk2.m4 gtkglext.m4
pango.m4
Log message:
* libgeometry/kd_tree_packed.cpp: Comment out the two somewhat
bogus assertions so this file can be cross compiled.
* configure.ac: If the plugin is disabled, or glext is disabled,
don't spew errors messages, since we didn't bother to look for
those components anyway. Rename the macros where the prefix
changed.
* macros/firefox.m4: Don't try to configure if the plugin is
disabled.
* macros/jpeg.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/libXML.m4: Look in $prefix for headers and libraries,
useful for cross-compiling.
* macros/mad.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/ming.m4: Rename to use GNASH_ instead of AM_ for the
prefix.
* macros/ogg.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/opengl.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/png.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/sdl.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/zlib.m4: Look in $prefix for headers and libraries,
useful for cross-compiling. Rename to use GNASH_ instead of AM_
for the prefix.
* macros/gtkglext.m4: If --enable-glext is passed to configure,
enable configuring pango, cairo, atk, glib, and gtk2 macros.
* macros/atk.m4: New file to look for Gnome ATK, which is
unfortunately a dependancy of GtkGlext.
* macros/cairo.m4: New file to look for Cairo, which we wanted to
do eventually anyway, byt GtkGlext needs it too.
* macros/glib.m4: New file to look for Glib, which is
unfortunately a dependancy of GtkGlext.
* macros/gtk2.m4: New file to look for GTK+ version 2.x, which is
a dependancy of GtkGlext, but Firefox uses it too.
* macros/pango.m4: New file to look for Gnome ATK, which is
unfortunately a dependancy of GtkGlext.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/kd_tree_packed.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/atk.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/cairo.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/jpeg.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/mad.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ming.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ogg.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/png.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/zlib.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.152 gnash/ChangeLog:1.153
--- gnash/ChangeLog:1.152 Thu Feb 23 17:37:25 2006
+++ gnash/ChangeLog Fri Feb 24 00:06:21 2006
@@ -1,5 +1,51 @@
2006-02-23 Rob Savoye <address@hidden>
+ * libgeometry/kd_tree_packed.cpp: Comment out the two somewhat
+ bogus assertions so this file can be cross compiled.
+ * configure.ac: If the plugin is disabled, or glext is disabled,
+ don't spew errors messages, since we didn't bother to look for
+ those components anyway. Rename the macros where the prefix
+ changed.
+ * macros/firefox.m4: Don't try to configure if the plugin is
+ disabled.
+ * macros/jpeg.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/libXML.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling.
+ * macros/mad.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/ming.m4: Rename to use GNASH_ instead of AM_ for the
+ prefix.
+ * macros/ogg.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/opengl.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/png.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/sdl.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/zlib.m4: Look in $prefix for headers and libraries,
+ useful for cross-compiling. Rename to use GNASH_ instead of AM_
+ for the prefix.
+ * macros/gtkglext.m4: If --enable-glext is passed to configure,
+ enable configuring pango, cairo, atk, glib, and gtk2 macros.
+ * macros/atk.m4: New file to look for Gnome ATK, which is
+ unfortunately a dependancy of GtkGlext.
+ * macros/cairo.m4: New file to look for Cairo, which we wanted to
+ do eventually anyway, byt GtkGlext needs it too.
+ * macros/glib.m4: New file to look for Glib, which is
+ unfortunately a dependancy of GtkGlext.
+ * macros/gtk2.m4: New file to look for GTK+ version 2.x, which is
+ a dependancy of GtkGlext, but Firefox uses it too.
+ * macros/pango.m4: New file to look for Gnome ATK, which is
+ unfortunately a dependancy of GtkGlext.
+
* doc/C/gnash.xml: Add the -x command line option.
* doc/C/internals.xml: Add section under Plugin about using
Mozplugger to use the standalone player.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.39 gnash/configure.ac:1.40
--- gnash/configure.ac:1.39 Mon Feb 20 17:05:34 2006
+++ gnash/configure.ac Fri Feb 24 00:06:21 2006
@@ -139,9 +139,10 @@
AM_COMPILER_LIB
GNASH_PATH_DMALLOC
AC_CHECK_FUNCS(mallinfo)
-LIBS+="-L/usr/lib64"
-AC_PATH_FIREFOX
+dnl LIBS+="-L/usr/lib64"
+
+GNASH_PATH_FIREFOX
AC_PATH_XTRA
AC_CHECK_HEADERS(dejagnu.h)
AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
@@ -150,19 +151,25 @@
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open)
dnl AC_CHECK_LIB(c, mremap)
-AM_PATH_ZLIB
-AM_PATH_JPEG
-AM_PATH_PNG
-AC_PATH_MING
+GNASH_PATH_ZLIB
+GNASH_PATH_JPEG
+GNASH_PATH_PNG
+GNASH_PATH_MING
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
AC_PATH_PROG(DOXYGEN, doxygen)
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
-AM_PATH_MP3
-AM_PATH_OGG
-AM_PATH_SDL
-AM_PATH_SDL_MIXER
-AM_PATH_OPENGL
+GNASH_PATH_MP3
+GNASH_PATH_OGG
+GNASH_PATH_SDL
+GNASH_PATH_SDL_MIXER
+GNASH_PATH_OPENGL
+GNASH_PATH_GLEXT
+GNASH_PATH_GTK2
+GNASH_PATH_PANGO
+GNASH_PATH_GLIB
+GNASH_PATH_CAIRO
+GNASH_PATH_ATK
GNASH_PATH_PTHREADS
GNASH_PATH_GHELP
AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
@@ -177,6 +184,10 @@
fi
dnl AC_CONFIG_LINKS(doc/C/images)
+plugmk=""
+if test x"$plugin" = x"yes"; then
+plugmk="plugin/Makefile plugin/mozilla-sdk/Makefile"
+fi
AC_OUTPUT(Makefile
libbase/Makefile
@@ -185,13 +196,12 @@
libamf/Makefile
backend/Makefile
utilities/Makefile
-plugin/Makefile
-plugin/mozilla-sdk/Makefile
doc/Makefile
doc/C/Makefile
doc/Doxyfile
testsuite/Makefile
testsuite/actionscript.all/Makefile
+plugin/Makefile plugin/mozilla-sdk/Makefile
)
dnl config.mk
dnl plugin/test/Makefile
@@ -354,9 +364,9 @@
if test x"$opengl" = x"yes"; then
if test x"$OPENGL_LIBS" != x; then
if test x"$OPENGL_CFLAGS" != x; then
- echo " OPENGL flags are: $OPENGL_CFLAGS"
+ echo " Opengl flags are: $OPENGL_CFLAGS"
else
- echo " OPENGL flags are: default include path"
+ echo " Opengl flags are: default include path"
fi
echo " Opengl libs are: $OPENGL_LIBS"
else
@@ -368,6 +378,108 @@
fi
fi
+if test x"$glext" = x"yes"; then
+ if test x"$GLEXT_LIBS" != x; then
+ if test x"$GLEXT_CFLAGS" != x; then
+ echo " GtkGlext flags are: $GLEXT_CFLAGS"
+ else
+ echo " GtkGLext flags are: default include path"
+ fi
+ echo " GtkGLext libs are: $GLEXT_LIBS"
+ else
+ echo "ERROR: No GtkGLext development package installed!\
+ You need to have the GtkGLext development package installed\
+ to compile this project or install libgtkglext1-dev \
+ (using apt-get) or libgtkglext-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+if test x"$glext" = x"yes"; then
+ if test x"$GTK2_LIBS" != x; then
+ if test x"$GTK2_CFLAGS" != x; then
+ echo " Gtk2 flags are: $GTK2_CFLAGS"
+ else
+ echo " Gtk2 flags are: default include path"
+ fi
+ echo " Gtk2 libs are: $GTK2_LIBS"
+ else
+ echo "ERROR: No Gtk2 development package installed!\
+ You need to have the Gtk2 development package installed\
+ to compile this project or install libgtk2-dev \
+ (using apt-get) or libgtk2-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+if test x"$glext" = x"yes"; then
+ if test x"$PANGO_LIBS" != x; then
+ if test x"$PANGO_CFLAGS" != x; then
+ echo " Pango flags are: $PANGO_CFLAGS"
+ else
+ echo " Pango flags are: default include path"
+ fi
+ echo " Pango libs are: $PANGO_LIBS"
+ else
+ echo "ERROR: No Pango development package installed!\
+ You need to have the Pango development package installed\
+ to compile this project or install libpango1.0-dev \
+ (using apt-get) or libpango-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+if test x"$glext" = x"yes"; then
+ if test x"$GLIB_LIBS" != x; then
+ if test x"$GLIB_CFLAGS" != x; then
+ echo " Glib flags are: $GLIB_CFLAGS"
+ else
+ echo " Glib flags are: default include path"
+ fi
+ echo " Glib libs are: $GLIB_LIBS"
+ else
+ echo "ERROR: No Glib development package installed!\
+ You need to have the Glib development package installed\
+ to compile this project or install libglib2.0-dev \
+ (using apt-get) or libglib2-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+if test x"$glext" = x"yes"; then
+ if test x"$CAIRO_LIBS" != x; then
+ if test x"$CAIRO_CFLAGS" != x; then
+ echo " Cairo flags are: $CAIRO_CFLAGS"
+ else
+ echo " Cairo flags are: default include path"
+ fi
+ echo " Cairo libs are: $CAIRO_LIBS"
+ else
+ echo "ERROR: No Cairo development package installed!\
+ You need to have the Cairo development package installed\
+ to compile this project or install libcairo-dev \
+ (using apt-get) or libcairo-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
+if test x"$glext" = x"yes"; then
+ if test x"$ATK_LIBS" != x; then
+ if test x"$ATK_CFLAGS" != x; then
+ echo " Atk flags are: $ATK_CFLAGS"
+ else
+ echo " Atk flags are: default include path"
+ fi
+ echo " Atk libs are: $ATK_LIBS"
+ else
+ echo "ERROR: No Atk development package installed!\
+ You need to have the Atk development package installed\
+ to compile this project or install libatk1.0-dev \
+ (using apt-get) or libatk-devel (using yum)."
+dnl nogo=true
+ fi
+fi
+
if test x"$SDL_CFLAGS" != x; then
echo " SDL flags are: $SDL_CFLAGS"
echo " SDL libs are: $SDL_LIBS"
Index: gnash/libgeometry/kd_tree_packed.cpp
diff -u gnash/libgeometry/kd_tree_packed.cpp:1.2
gnash/libgeometry/kd_tree_packed.cpp:1.3
--- gnash/libgeometry/kd_tree_packed.cpp:1.2 Wed Feb 1 23:58:32 2006
+++ gnash/libgeometry/kd_tree_packed.cpp Fri Feb 24 00:06:21 2006
@@ -125,7 +125,7 @@
{
uint16 m_vi[3]; // vert indices
- void local_assert() { compiler_assert(sizeof(kd_face) == 6); }
+// void local_assert() { compiler_assert(sizeof(struct kd_face) == 6); }
};
@@ -138,10 +138,10 @@
{
assert(index >= 0 && index < m_face_count);
- return (kd_face*) (((uint8*) this) + sizeof(kd_leaf) +
sizeof(kd_face) * index);
+ return (kd_face*) (((uint8*) this) + sizeof(struct kd_leaf) +
sizeof(kd_face) * index);
}
- void local_assert() { compiler_assert(sizeof(kd_leaf) == 2); }
+// void local_assert() { compiler_assert(sizeof(struct kd_leaf) == 2); }
};
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.10 gnash/macros/firefox.m4:1.11
--- gnash/macros/firefox.m4:1.10 Mon Feb 13 19:57:34 2006
+++ gnash/macros/firefox.m4 Fri Feb 24 00:06:21 2006
@@ -17,80 +17,84 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Configure paths for libfirefox
-AC_DEFUN([AC_PATH_FIREFOX],
+AC_DEFUN([GNASH_PATH_FIREFOX],
[dnl
dnl Get the cflags and libraries
dnl
dnl This enables or disables the support to make Gnash function as a
dnl Mozilla or Firefox plugin.
-AC_ARG_ENABLE(reader, [ --enable-plugin Enable support for being a
plugin],
-[case "${enableval}" in
- yes) plugin=yes ;;
- no) plugin=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-plugin option]) ;;
-esac], plugin=yes)
+ AC_ARG_ENABLE(plugin, [ --disable-plugin Enable support for being a
plugin],
+ [case "${enableval}" in
+ yes) plugin=yes ;;
+ no) plugin=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
+ esac], plugin=yes)
-if test x$plugin = xyes; then
+ if test x"$plugin" = x"yes"; then
AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
-fi
-AC_ARG_WITH(firefox,[ --with-firefox=PFX Prefix where firefox is installed
(optional)],
- [firefox_prefix=$withval], [firefox_prefix=""])
-AC_ARG_WITH(firefox-libraries,[ --with-firefox-libraries=DIR Directory
where firefox library is installed (optional)],
- [firefox_libraries=$withval], [firefox_libraries=""])
-AC_ARG_WITH(firefox-includes,[ --with-firefox-includes=DIR Directory where
firefox header files are installed (optional)],
- [firefox_includes=$withval], [firefox_includes=""])
-AC_ARG_WITH(plugin-dir, [ --with-plugin-dir=DIR Mozilla plugin dir],
- [FIREFOX_PLUGINS=$withval])
+ AC_ARG_WITH(firefox,[ --with-firefox=PFX Prefix where firefox is
installed (optional)],
+ [firefox_prefix=$withval], [firefox_prefix=""]
+ )
+ AC_ARG_WITH(firefox-libraries,[ --with-firefox-libraries=DIR Directory
where firefox library is installed (optional)],
+ [firefox_libraries=$withval], [firefox_libraries=""]
+ )
+ AC_ARG_WITH(firefox-includes,[ --with-firefox-includes=DIR Directory
where firefox header files are installed (optional)],
+ [firefox_includes=$withval], [firefox_includes=""]
+ )
+ AC_ARG_WITH(plugin-dir, [ --with-plugin-dir=DIR Mozilla plugin
dir],
+ [FIREFOX_PLUGINS=$withval]
+ )
- if test "x${firefox_libraries}" != "x" ; then
- FIREFOX_LIBS="-L$firefox_libraries"
- elif test "x${firefox_prefix}" != "x" ; then
- FIREFOX_LIBS="-L${firefox_prefix}/lib"
- fi
-
- if test "x$firefox_includes" != "x" ; then
- FIREFOX_CFLAGS="-I$firefox_includes"
- elif test "x$firefox_prefix" != "x" ; then
- FIREFOX_CFLAGS="-I$firefox_prefix/include"
- fi
+ if test "x${firefox_libraries}" != "x" ; then
+ FIREFOX_LIBS="-L$firefox_libraries"
+ elif test "x${firefox_prefix}" != "x" ; then
+ FIREFOX_LIBS="-L${firefox_prefix}/lib"
+ fi
- no_firefox=""
- mconfig=""
+ if test "x$firefox_includes" != "x" ; then
+ FIREFOX_CFLAGS="-I$firefox_includes"
+ elif test "x$firefox_prefix" != "x" ; then
+ FIREFOX_CFLAGS="-I$firefox_prefix/include"
+ fi
- AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
+ no_firefox=""
+ mconfig=""
- if test x"${mconfig}" = "x" ; then
- AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
- fi
+ AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
- if test x"${mconfig}" = "x" ; then
- plugin="no"
- FIREFOX_CFLAGS=""
- FIREFOX_LIBS=""
- FIREFOX_DEFS=""
- else
- AC_MSG_CHECKING([for Firefox/Mozilla SDK])
- if test "x${FIREFOX_CFLAGS}" = "x" ; then
- FIREFOX_CFLAGS=`${mconfig} --cflags java plugin`
+ if test x"${mconfig}" = "x" ; then
+ AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
fi
- if test "x${FIREFOX_LIBS}" = "x" ; then
- FIREFOX_LIBS=`${mconfig} --libs java plugin`
- fi
+ if test x"${mconfig}" = "x" ; then
+ plugin="no"
+ FIREFOX_CFLAGS=""
+ FIREFOX_LIBS=""
+ FIREFOX_DEFS=""
+ else
+ AC_MSG_CHECKING([for Firefox/Mozilla SDK])
+ if test "x${FIREFOX_CFLAGS}" = "x" ; then
+ FIREFOX_CFLAGS=`${mconfig} --cflags java plugin`
+ fi
+
+ if test "x${FIREFOX_LIBS}" = "x" ; then
+ FIREFOX_LIBS=`${mconfig} --libs java plugin`
+ fi
- if test "x${FIREFOX_LIBS}" != "x" ; then
- FIREFOX_DEFS=`${mconfig} --defines java plugin`
+ if test "x${FIREFOX_LIBS}" != "x" ; then
+ FIREFOX_DEFS=`${mconfig} --defines java plugin`
dnl if we don't have a path for the plugin by now, pick a default one
- if test x"${FIREFOX_PLUGINS}" = "x" ; then
- FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L\(@<:@^ @:>@*\)
.*$:\1:' -e 's:^-L::'`/plugins
+ if test x"${FIREFOX_PLUGINS}" = "x" ; then
+ FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L\(@<:@^ @:>@*\)
.*$:\1:' -e 's:^-L::'`/plugins
+ fi
fi
fi
- fi
- if test x"${FIREFOX_CFLAGS}" != "x" -a x"${FIREFOX_LIBS}" != "x"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support
available])
+ if test x"${FIREFOX_CFLAGS}" != "x" -a x"${FIREFOX_LIBS}" != "x"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support
available])
+ fi
fi
AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
Index: gnash/macros/jpeg.m4
diff -u gnash/macros/jpeg.m4:1.6 gnash/macros/jpeg.m4:1.7
--- gnash/macros/jpeg.m4:1.6 Mon Feb 20 17:05:34 2006
+++ gnash/macros/jpeg.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
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
-AC_DEFUN([AM_PATH_JPEG],
+AC_DEFUN([GNASH_PATH_JPEG],
[
AC_ARG_ENABLE(jpeg, [ --enable-jpeg Enable support for jpeg
images],
[case "${enableval}" in
@@ -26,7 +26,7 @@
if test x"$jpeg" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(jpeg_incl, [ --with-jpeg_incl directory where libjpeg
header is], with_jpeg_incl=${withval})
+ AC_ARG_WITH(jpeg_incl, [ --with-jpeg-incl directory where libjpeg
header is], with_jpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_jpeg_incl,[
if test x"${with_jpeg_incl}" != x ; then
if test -f ${with_jpeg_incl}/jpeglib.h ; then
@@ -41,7 +41,7 @@
AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""],[
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_MSG_CHECKING([for libjpeg header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/jpeglib.h; then
@@ -87,7 +87,7 @@
if test x"${ac_cv_path_jpeg_lib}" = x; then
AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib="-ljpeg"],[
AC_MSG_CHECKING([for libjpeg library])
- libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ 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/libjpeg.a -o -f $i/libjpeg.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.11 gnash/macros/libXML.m4:1.12
--- gnash/macros/libXML.m4:1.11 Mon Feb 20 17:05:34 2006
+++ gnash/macros/libXML.m4 Fri Feb 24 00:06:21 2006
@@ -60,7 +60,7 @@
dnl Try finding out yourself
dnl
if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
- dirlist="/lib64 /usr/lib64 /lib /usr/lib /usr/pkg /usr /usr/local /opt
/home/latest"
+ dirlist="${prefix} /lib64 /usr/lib64 /lib /usr/lib /usr/pkg /usr
/usr/local /opt /home/latest"
for i in $dirlist; do
if test "x$LIBXML_CFLAGS" = "x"; then
for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
Index: gnash/macros/mad.m4
diff -u gnash/macros/mad.m4:1.6 gnash/macros/mad.m4:1.7
--- gnash/macros/mad.m4:1.6 Mon Feb 20 17:05:34 2006
+++ gnash/macros/mad.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
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
-AC_DEFUN([AM_PATH_MP3],
+AC_DEFUN([GNASH_PATH_MP3],
[
AC_ARG_ENABLE(mp3, [ --enable-mp3 Enable support for playing
mp3s],
[case "${enableval}" in
@@ -42,7 +42,7 @@
AC_CHECK_HEADERS(mad.h, [ac_cv_path_mad_incl=""],[
if test x"${ac_cv_path_mad_incl}" = x; then
AC_MSG_CHECKING([for libmad header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/mad.h; then
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_mad_lib}" = x; then
AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
AC_MSG_CHECKING([for libmad library])
- libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ 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/libmad.a -o -f $i/libmad.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/ming.m4
diff -u gnash/macros/ming.m4:1.3 gnash/macros/ming.m4:1.4
--- gnash/macros/ming.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/ming.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
# MAKESWF
#
-AC_DEFUN([AC_PATH_MING],
+AC_DEFUN([GNASH_PATH_MING],
[
MING_CFLAGS=""
MING_LIBS=""
Index: gnash/macros/ogg.m4
diff -u gnash/macros/ogg.m4:1.5 gnash/macros/ogg.m4:1.6
--- gnash/macros/ogg.m4:1.5 Mon Feb 20 17:05:34 2006
+++ gnash/macros/ogg.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
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
-AC_DEFUN([AM_PATH_OGG],
+AC_DEFUN([GNASH_PATH_OGG],
[
AC_ARG_ENABLE(ogg, [ --enable-ogg Enable support for playing
oggs],
[case "${enableval}" in
@@ -42,7 +42,7 @@
AC_CHECK_HEADERS(ogg.h, [ac_cv_path_ogg_incl=""],[
if test x"${ac_cv_path_ogg_incl}" = x; then
AC_MSG_CHECKING([for libogg header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/ogg/ogg.h; then
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_ogg_lib}" = x; then
AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
AC_MSG_CHECKING([for libogg library])
- libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ 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/libogg.a -o -f $i/libogg.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.9 gnash/macros/opengl.m4:1.10
--- gnash/macros/opengl.m4:1.9 Mon Feb 20 17:05:34 2006
+++ gnash/macros/opengl.m4 Fri Feb 24 00:06:21 2006
@@ -15,15 +15,15 @@
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
-AC_DEFUN([AM_PATH_OPENGL],
+AC_DEFUN([GNASH_PATH_OPENGL],
[
- AC_ARG_ENABLE(opengl, [ --disable-opengl Disable support for OpenGL],
- [case "${enableval}" in
- yes) opengl=no ;;
- no) opengl=yes ;;
- *) AC_MSG_ERROR([bad value ${enableval} for disable-opengl option]) ;;
- esac], opengl=yes)
-
+dnl AC_ARG_ENABLE(opengl, [ --disable-opengl Disable support for
OpenGL],
+dnl [case "${enableval}" in
+dnl yes) opengl=no ;;
+dnl no) opengl=yes ;;
+dnl *) AC_MSG_ERROR([bad value ${enableval} for disable-opengl option])
;;
+dnl esac], opengl=yes)
+ opengl=yes
if test x"$opengl" = x"yes"; then
dnl Look for the headers.
AC_ARG_WITH(opengl_includes, [ --with-opengl-includes directory where
OpenGL headers are], with_opengl_includes=${withval})
@@ -32,17 +32,16 @@
if test -f ${with_opengl_includes}/GL/gl.h ; then
ac_cv_path_opengl_includes=`(cd ${with_opengl_includes}; pwd)`
else
- AC_MSG_ERROR([${with_opengl_includes} directory doesn't contain GL.h])
+ AC_MSG_ERROR([${with_opengl_includes} directory doesn't contain
GL/gl.h])
fi
- fi
- ])
+ fi])
dnl If the include path hasn't been specified, go look for it.
if test x"${ac_cv_path_opengl_includes}" = x; then
AC_CHECK_HEADERS(GL/gl.h, [ac_cv_path_opengl_includes=""],[
if test x"${ac_cv_path_opengl_includes}" = x; then
AC_MSG_CHECKING([for OpenGL headers])
- incllist="/usr/include /usr/local/include /opt/include
/usr/X11R6/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /usr/include /usr/local/include
/opt/include /usr/X11R6/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/GL/gl.h; then
@@ -88,7 +87,7 @@
if test x"${ac_cv_path_opengl_libraries}" = x; then
AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_libraries="-lGL -lGLU"],[
AC_MSG_CHECKING([for libGL library])
- libslist="/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib /usr/lib64
/usr/lib /usr/local/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libGL.a -o -f $i/libGL.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/png.m4
diff -u gnash/macros/png.m4:1.8 gnash/macros/png.m4:1.9
--- gnash/macros/png.m4:1.8 Mon Feb 20 17:05:34 2006
+++ gnash/macros/png.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
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
-AC_DEFUN([AM_PATH_PNG],
+AC_DEFUN([GNASH_PATH_PNG],
[
AC_ARG_ENABLE(png, [ --enable-png Enable support for png images],
[case "${enableval}" in
@@ -27,7 +27,7 @@
if test x"$png" = x"yes"; then
dnl Look for the header
AC_ARG_WITH(png_incl, [ --with-png-incl directory where libpng
header is], with_png_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_png_incl,[
+ AC_CACHE_VAL(ac_cv_path_png_incl, [
AC_MSG_CHECKING([for png.h header in specified directory])
if test x"${with_png_incl}" != x ; then
if test -f ${with_png_incl}/png.h ; then
@@ -35,8 +35,9 @@
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([${with_png_incl} directory doesn't contain png.h])
- AC_MSG_RESULT([no])
fi
+ else
+ AC_MSG_RESULT([no])
fi
])
@@ -45,7 +46,7 @@
AC_CHECK_HEADERS(png.h, [ac_cv_path_png_incl=""],[
if test x"${ac_cv_path_png_incl}" = x; then
AC_MSG_CHECKING([for libpng header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/png.h; then
@@ -93,7 +94,7 @@
if test x"${ac_cv_path_png_lib}" = x; then
AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib="-lpng"],[
AC_MSG_CHECKING([for libpng library])
- libslist=" /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
for i in $libslist; do
if test -f $i/libpng.a -o -f $i/libpng.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.8 gnash/macros/sdl.m4:1.9
--- gnash/macros/sdl.m4:1.8 Mon Feb 20 17:05:34 2006
+++ gnash/macros/sdl.m4 Fri Feb 24 00:06:21 2006
@@ -8,7 +8,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN([GNASH_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
@@ -179,7 +179,7 @@
rm -f conf.sdltest
])
-AC_DEFUN([AM_PATH_SDL_MIXER],
+AC_DEFUN([GNASH_PATH_SDL_MIXER],
[
dnl Lool for the header
AC_ARG_WITH(sdl_mixer_incl, [ --with-sdl_mixer-incl directory where
sdl_mixer header is], with_sdl_mixer_incl=${withval})
@@ -195,7 +195,7 @@
if test x"${ac_cv_path_sdl_mixer_incl}" = x ; then
AC_MSG_CHECKING([for SDL_mixer header])
- incllist="/usr/pkg /sw /usr/local /home/latest /opt /usr .. ../.."
+ incllist="${prefix} /usr/pkg /sw /usr/local /home/latest /opt /usr ..
../.."
for i in $incllist; do
if test -f $i/SDL/include/SDL_mixer.h; then
@@ -215,7 +215,7 @@
else
AC_MSG_RESULT(${ac_cv_path_sdl_mixer_incl})
if test x"${ac_cv_path_sdl_mixer_incl}" != x"/usr/include"; then
- ac_cv_path_sdl_mixer_incl="-I${ac_cv_path_sdl_mixer_incl}"
+ ac_cv_path_sdl_mixer_incl="${ac_cv_path_sdl_mixer_incl}"
else
ac_cv_path_sdl_mixer_incl=""
fi
@@ -223,7 +223,7 @@
fi
if test x"${ac_cv_path_sdl_mixer_incl}" != x ; then
- SDL_MIXER_CFLAGS="${ac_cv_path_sdl_mixer_incl}"
+ SDL_MIXER_CFLAGS="-I${ac_cv_path_sdl_mixer_incl}"
fi
dnl Look for the library
@@ -240,7 +240,7 @@
])
if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
- liblist=" /usr/lib64 /usr/lib /usr/pkg/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib.. ../.."
+ liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /usr/pkg/lib
/sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
for i in $liblist; do
if test -f $i/libSDL_mixer.a -o -f $i/libSDL_mixer.so -o -f
$i/libSDL_mixer.dylib; then
Index: gnash/macros/zlib.m4
diff -u gnash/macros/zlib.m4:1.4 gnash/macros/zlib.m4:1.5
--- gnash/macros/zlib.m4:1.4 Mon Feb 20 17:05:34 2006
+++ gnash/macros/zlib.m4 Fri Feb 24 00:06:21 2006
@@ -15,7 +15,7 @@
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
-AC_DEFUN([AM_PATH_ZLIB],
+AC_DEFUN([GNASH_PATH_ZLIB],
[
dnl Lool for the header
AC_ARG_WITH(zlib_incl, [ --with-zlib-incl directory where zlib
header is], with_zlib_incl=${withval})
@@ -33,7 +33,7 @@
if test x"${ac_cv_path_zlib_incl}" = x ; then
AC_MSG_CHECKING([for zlib header])
- incllist="/sw/include /usr/local/include /home/latest/include /opt/include
/usr/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/zlib.h; then
@@ -76,7 +76,7 @@
])
if test x"${ac_cv_path_zlib_lib}" = x ; then
- liblist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib .. ../.."
+ liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib .. ../.."
for i in $liblist; do
if test -f $i/libz.a -o -f $i/libz.so -o -f $i/libz.dylib; then
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure.ac libgeometry/kd...,
Rob Savoye <=