[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/gstream...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/gstream... |
|
Date: |
Tue, 11 Apr 2006 17:11:09 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/04/11 17:11:09
Modified files:
. : ChangeLog configure.ac
macros : gstreamer.m4 gtk2.m4 gtkglext.m4 pango.m4
sdl.m4
server : action.cpp
Log message:
* configure.ac: Check for a SDL, SDL_Mixer, and Gstreamer based on
whether the library exists, not the headers. Comment out Gstreamer
warning for now, it's not used anyway.
* macros/gstreamer.m4: Remove extraneous setting of
ac_cv_path_gstreamer_incl. Remove extraneous MSG_RESULT.
* macros/gtk2.m4: Remove extraneous setting of
ac_cv_path_gtk2_incl. Check for the versioned directory before the
unversioned directory.
* macros/gtkglext.m4: Remove extraneous setting of
ac_cv_path_glext_incl. Remove extraneous MSG_RESULT.
* macros/pango.m4: Always add the library name if we have a legit
path.
* macros/sdl.m4: Remove extraneous MSG_RESULTs.
* server/action.cpp: Tweak the test for getURL() to include https
as well as http.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.209&tr2=1.210&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gstreamer.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.209 gnash/ChangeLog:1.210
--- gnash/ChangeLog:1.209 Mon Apr 10 20:25:52 2006
+++ gnash/ChangeLog Tue Apr 11 17:11:09 2006
@@ -1,3 +1,21 @@
+2006-04-11 Rob Savoye <address@hidden>
+
+ * configure.ac: Check for a SDL, SDL_Mixer, and Gstreamer based on
+ whether the library exists, not the headers. Comment out Gstreamer
+ warning for now, it's not used anyway.
+ * macros/gstreamer.m4: Remove extraneous setting of
+ ac_cv_path_gstreamer_incl. Remove extraneous MSG_RESULT.
+ * macros/gtk2.m4: Remove extraneous setting of
+ ac_cv_path_gtk2_incl. Check for the versioned directory before the
+ unversioned directory.
+ * macros/gtkglext.m4: Remove extraneous setting of
+ ac_cv_path_glext_incl. Remove extraneous MSG_RESULT.
+ * macros/pango.m4: Always add the library name if we have a legit
+ path.
+ * macros/sdl.m4: Remove extraneous MSG_RESULTs.
+ * server/action.cpp: Tweak the test for getURL() to include https
+ as well as http.
+
2006-04-10 Sandro Santilli <address@hidden>
* server/action.cpp: fixe compiler error
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.57 gnash/configure.ac:1.58
--- gnash/configure.ac:1.57 Wed Apr 5 15:50:27 2006
+++ gnash/configure.ac Tue Apr 11 17:11:09 2006
@@ -621,7 +621,7 @@
fi
fi
-if test x"$SDL_CFLAGS" != x; then
+if test x"$SDL_LIBS" != x; then
echo " SDL flags are: $SDL_CFLAGS"
echo " SDL libs are: $SDL_LIBS"
else
@@ -632,7 +632,7 @@
nogo=true
fi
-if test x"$SDL_MIXER_CFLAGS" != x; then
+if test x"$SDL_MIXER_LIBS" != x; then
echo " SDL_Mixer flags are: $SDL_MIXER_CFLAGS"
echo " SDL_Mixer libs are: $SDL_MIXER_LIBS"
else
@@ -642,11 +642,14 @@
libsdl-mixer1.2-dev (using apt-get) or SDL_mixer-devel (using yum)."
fi
-if test x"$GSTREAMER_CFLAGS" != x; then
+dnl As the GStreamer support isn;t used, but is to support a
+dnl work-in-progress, we don't want to confuse people by printing a
+dnl warnign if it's not installed.
+if test x"$GSTREAMER_LIBS" != x; then
echo " Gstreamer flags are: $GSTREAMER_CFLAGS"
echo " Gstreamer libs are: $GSTREAMER_LIBS"
-else
- echo "ERROR: No Gstreamer development package installed!."
+dnl else
+dnl echo "ERROR: No Gstreamer development package installed!."
fi
if test x"$plugin" = x"yes"; then
Index: gnash/macros/gstreamer.m4
diff -u gnash/macros/gstreamer.m4:1.3 gnash/macros/gstreamer.m4:1.4
--- gnash/macros/gstreamer.m4:1.3 Tue Apr 4 20:42:56 2006
+++ gnash/macros/gstreamer.m4 Tue Apr 11 17:11:09 2006
@@ -84,16 +84,11 @@
for i in $incllist; do
if test -f $i/gstr/gst.h; then
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_gstreamer_incl="$i"
- break
- else
- ac_cv_path_gstreamer_incl=""
- break
- fi
+ ac_cv_path_gstreamer_incl="-I$i"
+ break;
else
if test -f $i/${topdir}/gst/gst.h; then
- ac_cv_path_gstreamer_incl="$i/${topdir}"
+ ac_cv_path_gstreamer_incl="-I$i/${topdir}"
break
fi
fi
@@ -101,11 +96,11 @@
fi])
fi
- if test x"${ac_cv_path_gstreamer_incl}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+dnl if test x"${ac_cv_path_gstreamer_incl}" != x ; then
+dnl AC_MSG_RESULT(yes)
+dnl else
+dnl AC_MSG_RESULT(no)
+dnl fi
dnl Look for the library
AC_ARG_WITH(gstreamer_lib, [ --with-gstreamer-lib directory where
gstreamer library is], with_gstreamer_lib=${withval})
@@ -152,14 +147,14 @@
fi
if test x"${ac_cv_path_gstreamer_incl}" != x ; then
- GSTREAMER_CFLAGS="-I${ac_cv_path_gstreamer_incl}"
+ GSTREAMER_CFLAGS="${ac_cv_path_gstreamer_incl}"
else
GSTREAMER_CFLAGS=""
fi
if test x"${ac_cv_path_gstreamer_lib}" != x ; then
GSTREAMER_LIBS="${ac_cv_path_gstreamer_lib}"
- AC_MSG_WARN([You need GStreamer 0.10 or greater for sound support!])
+dnl AC_MSG_WARN([You need GStreamer 0.10 or greater for sound support!])
else
GSTREAMER_LIBS=""
fi
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.5 gnash/macros/gtk2.m4:1.6
--- gnash/macros/gtk2.m4:1.5 Mon Apr 10 22:34:36 2006
+++ gnash/macros/gtk2.m4 Tue Apr 11 17:11:09 2006
@@ -71,11 +71,11 @@
done
fi
- if test x"${topdir}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${version}])
- fi
+dnl if test x"${topdir}" = x; then
+dnl AC_MSG_RESULT(none)
+dnl else
+dnl AC_MSG_RESULT([${version}])
+dnl fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_gtk2_incl}" = x; then
@@ -85,17 +85,11 @@
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/gtk/gtk.h; then
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_gtk2_incl="$i"
- break
- else
- ac_cv_path_gtk2_incl=""
- break
- fi
- else
- if test -f $i/${topdir}/gtk/gtk.h; then
+ if test -f $i/${topdir}/gtk/gtk.h; then
ac_cv_path_gtk2_incl="$i/${topdir}"
+ else
+ if test -f $i/gtk/gtk.h; then
+ ac_cv_path_gtk2_incl="-I$i"
break
fi
fi
@@ -104,11 +98,11 @@
])
fi
- if test x"${ac_cv_path_gtk2_incl}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ if test x"${ac_cv_path_gtk2_incl}" != x ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
dnl Look for the library
AC_ARG_WITH(gtk2_lib, [ --with-gtk2-lib directory where gtk2
library is], with_gtk2_lib=${withval})
@@ -156,10 +150,14 @@
fi
fi
- if test x"${ac_cv_path_gtk2_incl}" != x ; then
- libincl=`echo ${ac_cv_path_gtk2_incl} | sed -e 's/include/lib/'`
+ if test x"${ac_cv_path_gtk2_incl}" != x; then
+ if test x"${ac_cv_path_gtk2_incl}" = x"yes"; then
+ GTK2_CFLAGS=""
+ else
+ libincl=`echo ${ac_cv_path_gtk2_incl} | sed -e 's/include/lib/'`
+ GTK2_CFLAGS="-I${ac_cv_path_gtk2_incl} -I${libincl}/include"
+ fi
AC_DEFINE([HAVE_GTK2], [], [Use GTK2 for windowing])
- GTK2_CFLAGS="-I${ac_cv_path_gtk2_incl} -I${libincl}/include"
else
GTK2_CFLAGS=""
fi
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.3 gnash/macros/gtkglext.m4:1.4
--- gnash/macros/gtkglext.m4:1.3 Wed Mar 29 05:42:41 2006
+++ gnash/macros/gtkglext.m4 Tue Apr 11 17:11:09 2006
@@ -81,11 +81,11 @@
done
fi
- if test x"${topdir}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${version}])
- fi
+ if test x"${topdir}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${version}])
+ fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_glext_incl}" = x; then
@@ -94,15 +94,13 @@
AC_MSG_CHECKING([for libglext header])
incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ ac_cv_path_glext_incl=""
for i in $incllist; do
if test -f $i/gtk/gtkgl.h; then
if test x"$i" != x"/usr/include"; then
ac_cv_path_glext_incl="$i"
break
- else
- ac_cv_path_glext_incl=""
- break
- fi
+ fi
else
if test -f $i/${topdir}/gtk/gtkgl.h; then
ac_cv_path_glext_incl="$i/${topdir}"
@@ -136,15 +134,12 @@
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glext_lib="$i"
break
- else
- ac_cv_path_glext_lib=""
- break
- fi
+ fi
else
if test -f $i/libgtkglext-x11-${version}.a -o -f
$i/libgtkglext-x11-${version}.so; then
ac_cv_path_glext_lib="$i/${topdir}"
break
- fi
+ fi
fi
done])
else
@@ -163,11 +158,9 @@
if test x"${ac_cv_path_glext_incl}" != x ; then
libincl=`echo ${ac_cv_path_glext_incl} | sed -e 's/include/lib/'`
GLEXT_CFLAGS="-I${ac_cv_path_glext_incl} -I${libincl}/include"
- AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GTK_GTKGL_H,[], [GTKGLExt header])
else
GLEXT_CFLAGS=""
- AC_MSG_RESULT(no)
fi
if test x"${ac_cv_path_glext_lib}" != x ; then
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.5 gnash/macros/pango.m4:1.6
--- gnash/macros/pango.m4:1.5 Sat Apr 1 02:36:53 2006
+++ gnash/macros/pango.m4 Tue Apr 11 17:11:09 2006
@@ -99,11 +99,11 @@
])
fi
- if test x"${ac_cv_path_pango_incl}" != x; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ if test x"${ac_cv_path_pango_incl}" != x; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
dnl Look for the library
AC_ARG_WITH(pango_lib, [ --with-pango-lib directory where pango
library is], with_pango_lib=${withval})
@@ -129,7 +129,7 @@
ac_cv_path_pango_lib="-L$i -lpango-${version}"
break
else
- ac_cv_path_pango_lib=""
+ ac_cv_path_pango_lib="-lpango-${version}"
break
fi
else
@@ -143,9 +143,9 @@
else
if test -f $i/libpango-${version}.a -o -f $i/libpango-${version}.so;
then
if test x"${ac_cv_path_pango_lib}" != x"/usr/lib"; then
- ac_cv_path_pango_lib="-L${ac_cv_path_pango_lib}"
+ ac_cv_path_pango_lib="-L${ac_cv_path_pango_lib} -lpango-${version}"
else
- ac_cv_path_pango_lib=""
+ ac_cv_path_pango_lib="-lpango-${version}"
fi
fi
fi
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.12 gnash/macros/sdl.m4:1.13
--- gnash/macros/sdl.m4:1.12 Thu Mar 9 19:29:06 2006
+++ gnash/macros/sdl.m4 Tue Apr 11 17:11:09 2006
@@ -196,10 +196,8 @@
if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
AC_CHECK_LIB(SDL_mixer, Mix_Linked_Version, [], AC_MSG_RESULT([no]))
if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
- AC_CHECK_LIB(SDL_mixer-1.2, Mix_Linked_Version,
[ac_cv_path_sdl_mixer_lib="-lSDL_mixer-1.2"], AC_MSG_RESULT([no]))
+ AC_CHECK_LIB(SDL_mixer-1.2, Mix_Linked_Version,
[ac_cv_path_sdl_mixer_lib="-lSDL_mixer-1.2"])
fi
- else
- AC_MSG_RESULT([yes])
fi
if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
@@ -209,9 +207,11 @@
if test -f $i/libSDL_mixer.a -o -f $i/libSDl_mixer.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_sdl_mixer_lib="-L$i -lSDL_mixer"
+dnl AC_MSG_RESULT(${ac_cv_path_sdl_mixer_lib})
break
else
ac_cv_path_sdl_mixer_lib="-lSDL_mixer"
+dnl AC_MSG_RESULT([yes])
break
fi
fi
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.61 gnash/server/action.cpp:1.62
--- gnash/server/action.cpp:1.61 Mon Apr 10 20:24:19 2006
+++ gnash/server/action.cpp Tue Apr 11 17:11:09 2006
@@ -2998,9 +2998,9 @@
int url_len = strlen(url);
const char* target = (const char*)
&(m_buffer[pc + 3 + url_len + 1]);
- // If the url starts with an "http:", then we
- // want to load it into a web browser.
- if (strncmp(url, "http:", 5) == 0) {
+ // If the url starts with an "http" or "https",
+ // then we want to load it into a web browser.
+ if (strncmp(url, "http", 4) == 0) {
// if (windowid) {
// Atom mAtom = 486;
// Display *mDisplay = XOpenDisplay(NULL);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure.ac macros/gstream...,
Rob Savoye <=