[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure ./configure.ac ba...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure ./configure.ac ba... |
Date: |
Tue, 27 Dec 2005 16:19:27 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/27 16:19:27
Modified files:
. : ChangeLog configure configure.ac
backend : gnash.cpp
doc/C : gnash.xml
macros : firefox.m4 libXML.m4
Log message:
* macros/libXML.m4: Don't look for XML libraries in the prefix
directory.
* macros/firefox.m4: Don't look for Firefox libraries in the
prefix directory.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash.xml.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.12 gnash/ChangeLog:1.13
--- gnash/ChangeLog:1.12 Tue Dec 27 03:12:33 2005
+++ gnash/ChangeLog Tue Dec 27 16:19:27 2005
@@ -1,3 +1,10 @@
+2005-12-27 Rob Savoye <address@hidden>
+
+ * macros/libXML.m4: Don't look for XML libraries in the prefix
+ directory.
+ * macros/firefox.m4: Don't look for Firefox libraries in the
+ prefix directory.
+
2005-12-26 Rob Savoye <address@hidden>
* Makefile.am: Add doc subdirectory to DIST_SUBDIRS so it gets
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.1 gnash/backend/gnash.cpp:1.2
--- gnash/backend/gnash.cpp:1.1 Mon Dec 26 23:35:34 2005
+++ gnash/backend/gnash.cpp Tue Dec 27 16:19:27 2005
@@ -53,15 +53,11 @@
// Brief instructions.
{
printf(
- "test_ogl -- a test player for the gameswf library.\n"
+ "gnash -- a standalone OpenGL player.\n"
"\n"
- "This program has been donated to the Public Domain.\n"
- "See http://tulrich.com/geekstuff/gameswf.html for more info.\n"
+ "usage: gnasg [options] movie_file.swf\n"
"\n"
- "usage: gameswf_test_ogl [options] movie_file.swf\n"
- "\n"
- "Plays a SWF (Shockwave Flash) movie, using OpenGL and the\n"
- "gameswf library.\n"
+ "Plays a SWF (Shockwave Flash) movie using OpenGL"
"\n"
"options:\n"
"\n"
Index: gnash/configure
diff -u gnash/configure:1.7 gnash/configure:1.8
--- gnash/configure:1.7 Tue Dec 27 00:45:59 2005
+++ gnash/configure Tue Dec 27 16:19:27 2005
@@ -2171,16 +2171,12 @@
LIBXML_LIBS="-L$libxml_libraries -lxml2"
elif test "x$libxml_prefix" != "x" ; then
LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
- elif test "x$prefix" != "xNONE" ; then
- LIBXML_LIBS="-L$libdir -lxml2"
fi
if test "x$libxml_includes" != "x" ; then
LIBXML_CFLAGS="-I$libxml_includes"
elif test "x$libxml_prefix" != "x" ; then
LIBXML_CFLAGS="-I$libxml_prefix/include"
- elif test "$prefix" != "NONE"; then
- LIBXML_CFLAGS="-I$prefix/include"
fi
no_libxml=""
@@ -2223,8 +2219,8 @@
echo "${ECHO_T}no" >&6
fi
- echo "$as_me:$LINENO: checking for libxml" >&5
-echo $ECHO_N "checking for libxml... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for libxml2" >&5
+echo $ECHO_N "checking for libxml2... $ECHO_C" >&6
if test "x$PKG_CONFIG" != "x" ; then
if test "x$LIBXML_CFLAGS" = "x" ; then
LIBXML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
@@ -2486,16 +2482,12 @@
FIREFOX_LIBS="-L$firefox_libraries"
elif test "x$firefox_prefix" != "x" ; then
FIREFOX_LIBS="-L$firefox_prefix/lib"
- elif test "x$prefix" != "xNONE" ; then
- FIREFOX_LIBS="-L$libdir"
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"
- elif test "$prefix" != "NONE"; then
- FIREFOX_CFLAGS="-I$prefix/include"
fi
no_firefox=""
@@ -8762,7 +8754,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8765 "configure"' > conftest.$ac_ext
+ echo '#line 8757 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9397,7 +9389,7 @@
# Provide some information about the compiler.
-echo "$as_me:9400:" \
+echo "$as_me:9392:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10431,11 +10423,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10434: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10438: \$? = $ac_status" >&5
+ echo "$as_me:10430: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10664,11 +10656,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10659: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10671: \$? = $ac_status" >&5
+ echo "$as_me:10663: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10724,11 +10716,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10727: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10719: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10731: \$? = $ac_status" >&5
+ echo "$as_me:10723: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12058,7 +12050,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12061 "configure"' > conftest.$ac_ext
+ echo '#line 12053 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12929,7 +12921,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12932 "configure"
+#line 12924 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13027,7 +13019,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13030 "configure"
+#line 13022 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15206,11 +15198,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15209: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15213: \$? = $ac_status" >&5
+ echo "$as_me:15205: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15266,11 +15258,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15269: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15261: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15273: \$? = $ac_status" >&5
+ echo "$as_me:15265: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15777,7 +15769,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15780 "configure"' > conftest.$ac_ext
+ echo '#line 15772 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16648,7 +16640,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16651 "configure"
+#line 16643 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16746,7 +16738,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16749 "configure"
+#line 16741 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17573,11 +17565,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17576: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17580: \$? = $ac_status" >&5
+ echo "$as_me:17572: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17633,11 +17625,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17628: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17640: \$? = $ac_status" >&5
+ echo "$as_me:17632: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18947,7 +18939,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18950 "configure"' > conftest.$ac_ext
+ echo '#line 18942 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19688,11 +19680,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19691: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19683: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19695: \$? = $ac_status" >&5
+ echo "$as_me:19687: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19921,11 +19913,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19924: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19916: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19928: \$? = $ac_status" >&5
+ echo "$as_me:19920: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19981,11 +19973,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19984: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19976: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19988: \$? = $ac_status" >&5
+ echo "$as_me:19980: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21315,7 +21307,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 21318 "configure"' > conftest.$ac_ext
+ echo '#line 21310 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22186,7 +22178,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22189 "configure"
+#line 22181 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22284,7 +22276,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22287 "configure"
+#line 22279 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24944,7 +24936,7 @@
fi
if test x"$FIREFOX_CFLAGS" != x; then
- echo " Firefox Cflags are: $FIREFOX_CFLAGS"
+ echo " Firefox flags are: $FIREFOX_CFLAGS"
echo " Firefox libs are: $FIREFOX_LIBS"
else
echo " WARNING: No Firefox development package installed!"
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.7 gnash/configure.ac:1.8
--- gnash/configure.ac:1.7 Tue Dec 27 00:05:03 2005
+++ gnash/configure.ac Tue Dec 27 16:19:27 2005
@@ -236,7 +236,7 @@
fi
if test x"$FIREFOX_CFLAGS" != x; then
- echo " Firefox Cflags are: $FIREFOX_CFLAGS"
+ echo " Firefox flags are: $FIREFOX_CFLAGS"
echo " Firefox libs are: $FIREFOX_LIBS"
else
echo " WARNING: No Firefox development package installed!"
Index: gnash/doc/C/gnash.xml
diff -u gnash/doc/C/gnash.xml:1.4 gnash/doc/C/gnash.xml:1.5
--- gnash/doc/C/gnash.xml:1.4 Wed Dec 21 16:45:09 2005
+++ gnash/doc/C/gnash.xml Tue Dec 27 16:19:27 2005
@@ -477,6 +477,56 @@
</sect2>
</sect1>
+ <sect1 id="build">
+ <title>Building From Source</title>
+
+ <para>
+ </para>
+
+ <sect2 id="depend">
+ <title>Dependancies</title>
+
+ <para>
+ Gnash has dependancies on other packages. When installing
+ from a packaged release file, you'll need to install the
+ development version as well to get the headers used to compile
+ Gnash.
+ </para>
+
+ <para>
+ Mozilla Firefox.
+ </para>
+
+ <para>
+ OpenGL/SDL.
+ </para>
+
+ <para>
+ libxml2.
+ </para>
+
+ </sect2>
+
+ <sect2 id="configure">
+ <title>Configuring</title>
+
+ <para>
+ </para>
+
+ </sect2>
+
+ <sect2 id="install">
+ <title>Installation</title>
+
+ <para>
+ LD_LIBRARY_PATH to $prefix/gnash.
+ /etc/ld.so.conf, ldconfig
+ </para>
+
+ </sect2>
+
+ </sect1>
+
<sect1 id="code">
<title>Code Overview</title>
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.3 gnash/macros/firefox.m4:1.4
--- gnash/macros/firefox.m4:1.3 Thu Dec 22 05:11:47 2005
+++ gnash/macros/firefox.m4 Tue Dec 27 16:19:27 2005
@@ -42,16 +42,12 @@
FIREFOX_LIBS="-L$firefox_libraries"
elif test "x$firefox_prefix" != "x" ; then
FIREFOX_LIBS="-L$firefox_prefix/lib"
- elif test "x$prefix" != "xNONE" ; then
- FIREFOX_LIBS="-L$libdir"
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"
- elif test "$prefix" != "NONE"; then
- FIREFOX_CFLAGS="-I$prefix/include"
fi
no_firefox=""
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.4 gnash/macros/libXML.m4:1.5
--- gnash/macros/libXML.m4:1.4 Tue Dec 27 00:45:59 2005
+++ gnash/macros/libXML.m4 Tue Dec 27 16:19:27 2005
@@ -29,16 +29,12 @@
LIBXML_LIBS="-L$libxml_libraries -lxml2"
elif test "x$libxml_prefix" != "x" ; then
LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
- elif test "x$prefix" != "xNONE" ; then
- LIBXML_LIBS="-L$libdir -lxml2"
fi
if test "x$libxml_includes" != "x" ; then
LIBXML_CFLAGS="-I$libxml_includes"
elif test "x$libxml_prefix" != "x" ; then
LIBXML_CFLAGS="-I$libxml_prefix/include"
- elif test "$prefix" != "NONE"; then
- LIBXML_CFLAGS="-I$prefix/include"
fi
no_libxml=""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure ./configure.ac ba...,
Rob Savoye <=