[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ... |
|
Date: |
Sun, 08 Apr 2007 23:06:17 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/04/08 23:06:17
Modified files:
. : configure.ac ChangeLog
cygnal : cygnal.cpp
macros : agg.m4 boost.m4 curl.m4 ffmpeg.m4 firefox.m4
glib.m4 gnashpkgtool.m4 gtk2.m4 gtkglext.m4
incllist jpeg.m4 kde.m4 libXML.m4 libslist
ming.m4 mysql.m4 opengl.m4 pango.m4 pthreads.m4
sdl.m4 x11.m4
libbase : curl_adapter.cpp extension.cpp log.h network.h
noseek_fd_adapter.cpp rc.cpp ref_counted.h
sharedlib.cpp
testsuite/samples: Makefile.am
Log message:
* macros/agg.m4, boost.m4, curl.m4, ffmpeg.m4, firefox.m4,
glib.m4, gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4,
libXML.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
sdl.m4, x11.m4: Use ${shlibext} instead of .so to be more
portable.
* macros/ffmpeg.m4: Look for avutil after avformat, as there is
a
dependancy on the order on some systems.
* macros/x11.m4: Reverse the logic, we *do* want to look for
the X11
librsaries if the X11 headers are found earlier.
* testsuite/samples/Makefile.am: Add GotoAndPlayTestRunner to
CLEANFILES.
* configure.ac: Improve openbsd host test. Test for Darwin
libtool
vs ar. Reset AR if it's the Darwin libtool. Set FL_MUTEX to 0 if
lf_flmutext_register isn't found.
* cygnal/cygnal.cpp: Include libintl.h.
* libbase/curl_adapter.cpp: Use USE_CURL consistantly instead of
HAVE_CURL and HAVE_CURL_CURL.
* libbase/noseek_fd_adapter.cpp: Remove HAVE_STDIN_CURL_H test.
* libbase/rc.cpp: Include cctype.
* macros/incllist, libslist: Add Darwin Developer SDK
directories.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.287&r2=1.288
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2815&r2=1.2816
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/ref_counted.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.14&r2=1.15
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- configure.ac 6 Apr 2007 07:58:15 -0000 1.287
+++ configure.ac 8 Apr 2007 23:06:16 -0000 1.288
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.287 2007/04/06 07:58:15 jgilmore Exp $
+dnl $Id: configure.ac,v 1.288 2007/04/08 23:06:16 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -33,7 +33,7 @@
powerpc-apple-darwin*)
AC_DEFINE([__powerpc64__], [], [this is a 64 bit powerpc])
;;
- i386-*-openbsd*)
+ i[34567]86-*-openbsd*)
openbsd_os=openbsd
;;
*64-*-openbsd*)
@@ -299,7 +299,7 @@
)
dnl --------------------------------------------------------
-dnl ...
+dnl Figure out development tool stuff
dnl --------------------------------------------------------
AC_PROG_CC
@@ -308,6 +308,34 @@
AC_PROG_INSTALL
AM_COMPILER_LIB
+dnl Darwin uses libtool instead of ar to produce libraries. We determine which
one
+dnl we have here now. For some reason on Darwin, we don't get the
+dnl count from grep via stdin correctly. Writing a temp file does the
+dnl trick, so although it's ugly, that's what we gotta do...
+AC_MSG_CHECKING([Checking which type of library archiver we have])
+rm -f .tmp
+libtool > .tmp 2>&1
+archiver=`grep -c dynamic .tmp 2>&1`
+rm -f .tmp
+if test $archiver -eq 1; then
+ if test "$enable_shared" = no; then
+ AR="libtool -static"
+ else
+ AR="libtool -dynamic"
+ CXXFLAGS="${CXXFLAGS} -dynamic"
+ export MACOSX_DEPLOYMENT_TARGET="10.3"
+ fi
+ AR_FLAGS="-o"
+ darwin=yes
+else
+ AR="ar"
+ AR_FLAGS="cvu"
+ darwin=no
+fi
+AC_MSG_RESULT([${AR}])
+AC_SUBST(AR)
+AC_SUBST(AR_FLAGS)
+
dnl When cross compiling, limit the search directories cause otherwise
dnl we may get the host headers or libraries by accident. These values
dnl are exported, so all the other configure tests in macros/*.m4 use
@@ -739,8 +767,10 @@
AC_LIBTOOL_DLOPEN
dnl AC_LIBLTDL_CONVENIENCE
AC_LIBLTDL_INSTALLABLE
+LTVERSION_VERSION
AC_PROG_LIBTOOL
-AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]))
+AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]),
+ AC_DEFINE(LT_DLMUTEX, 0, [doesn't have
lt_dlmutex_register]) )
DLOPEN="-dlopen"
DLPREOPEN="-dlpreopen"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2815
retrieving revision 1.2816
diff -u -b -r1.2815 -r1.2816
--- ChangeLog 8 Apr 2007 15:23:43 -0000 1.2815
+++ ChangeLog 8 Apr 2007 23:06:16 -0000 1.2816
@@ -1,10 +1,31 @@
+2007-04-08 Rob Savoye <address@hidden>
+
+ * macros/agg.m4, boost.m4, curl.m4, ffmpeg.m4, firefox.m4,
+ glib.m4, gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4,
+ libXML.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
+ sdl.m4, x11.m4: Use ${shlibext} instead of .so to be more
+ portable.
+ * macros/ffmpeg.m4: Look for avutil after avformat, as there is a
+ dependancy on the order on some systems.
+ * macros/x11.m4: Reverse the logic, we *do* want to look for the X11
+ librsaries if the X11 headers are found earlier.
+ * testsuite/samples/Makefile.am: Add GotoAndPlayTestRunner to
CLEANFILES.
+ * configure.ac: Improve openbsd host test. Test for Darwin libtool
+ vs ar. Reset AR if it's the Darwin libtool. Set FL_MUTEX to 0 if
+ lf_flmutext_register isn't found.
+ * cygnal/cygnal.cpp: Include libintl.h.
+ * libbase/curl_adapter.cpp: Use USE_CURL consistantly instead of
+ HAVE_CURL and HAVE_CURL_CURL.
+ * libbase/noseek_fd_adapter.cpp: Remove HAVE_STDIN_CURL_H test.
+ * libbase/rc.cpp: Include cctype.
+ * macros/incllist, libslist: Add Darwin Developer SDK directories.
+
2007-04-08 Bastiaan Jacques <address@hidden>
* server/asobj/NetStreamFfmpeg{.cpp, .h}: Only use a single
thread (rather than two extra threads) for decoding. Plug a
memory leak (ByteIOCxt.buffer). Modularise some more code.
-
2007-04-08 Ann Barcomb <address@hidden>
* devtools/testsuite/c_casts.t: added this test at Bastiaan's
Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cygnal/cygnal.cpp 6 Apr 2007 07:58:15 -0000 1.7
+++ cygnal/cygnal.cpp 8 Apr 2007 23:06:16 -0000 1.8
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: cygnal.cpp,v 1.7 2007/04/06 07:58:15 jgilmore Exp $ */
+/* $Id: cygnal.cpp,v 1.8 2007/04/08 23:06:16 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -51,6 +51,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <libintl.h>
#ifdef ENABLE_NLS
#include <locale.h>
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/agg.m4 28 Mar 2007 23:42:19 -0000 1.25
+++ macros/agg.m4 8 Apr 2007 23:06:17 -0000 1.26
@@ -14,7 +14,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
-dnl $Id: agg.m4,v 1.25 2007/03/28 23:42:19 rsavoye Exp $
+dnl $Id: agg.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
@@ -75,7 +75,7 @@
AC_ARG_WITH(agg_lib, AC_HELP_STRING([--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
+ if test -f ${with_agg_lib}/libagg.a -o -f
${with_agg_lib}/libagg.${shlibext}; then
ac_cv_path_agg_lib="-L`(cd ${with_agg_lib}; pwd)`"
else
AC_MSG_ERROR([${with_agg_lib} directory doesn't contain AGG libraries.])
@@ -94,7 +94,7 @@
AC_LANG_PUSH(C++)
if test x"${ac_cv_path_agg_lib}" = x; then
for i in $libslist; do
- if test -f $i/libagg.a -o -f $i/libagg.so; then
+ if test -f $i/libagg.a -o -f $i/libagg.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_agg_lib="-L$i"
break
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- macros/boost.m4 11 Mar 2007 05:53:20 -0000 1.36
+++ macros/boost.m4 8 Apr 2007 23:06:17 -0000 1.37
@@ -14,7 +14,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
-dnl $Id: boost.m4,v 1.36 2007/03/11 05:53:20 rsavoye Exp $
+dnl $Id: boost.m4,v 1.37 2007/04/08 23:06:17 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -99,7 +99,7 @@
AC_MSG_CHECKING([for Boost's thread libraries])
for i in $libslist; do
for libname in ${boostnames}; do
- if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
+ if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_boost_lib="-L$i -l${libname}"
break
@@ -116,7 +116,7 @@
AC_MSG_RESULT(${ac_cv_path_boost_lib})
else
for k in ${boostnames}; do
- if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f
${ac_cv_path_boost_lib}/lib${k}.so; then
+ if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f
${ac_cv_path_boost_lib}/lib${k}.${shlibext}; then
if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
ac_cv_path_boost_lib="L${ac_cv_path_boost_lib} -l${k}"
else
@@ -140,7 +140,7 @@
break;
fi
for libname in ${boostnames}; do
- if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
+ if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
boost_date_time=yes
ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
break;
@@ -150,8 +150,8 @@
AC_MSG_RESULT(${ac_cv_path_boost_lib})
fi
+ dnl we don't want any boost libraries in LIBS, we prefer to keep it seperate.
AC_LANG_POP(C++)
- dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.
LIBS="$save_LIBS"
BOOST_CFLAGS="$ac_cv_path_boost_incl"
@@ -160,7 +160,7 @@
BOOST_LIBS="$ac_cv_path_boost_lib"
AC_SUBST(BOOST_LIBS)
- AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes])
+dnl AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes])
])
# Local Variables:
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/curl.m4 6 Mar 2007 18:06:13 -0000 1.14
+++ macros/curl.m4 8 Apr 2007 23:06:17 -0000 1.15
@@ -14,7 +14,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
-dnl $Id: curl.m4,v 1.14 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: curl.m4,v 1.15 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -59,6 +59,10 @@
done
fi
+ if test x"${ac_cv_path_curl_incl}" = x ; then
+ AC_CHECK_HEADERS(curl/curl.h)
+ fi
+
if test x"${ac_cv_path_curl_incl}" != x ; then
AC_MSG_RESULT(yes)
else
@@ -77,7 +81,7 @@
AC_ARG_WITH(curl_lib, AC_HELP_STRING([--with-curl-lib], [directory where
curl library is]), with_curl_lib=${withval})
AC_CACHE_VAL(ac_cv_path_curl_lib,[
if test x"${with_curl_lib}" != x ; then # {
- if test -f ${with_curl_lib}/libcurl.a -o -f ${with_curl_lib}/libcurl.so;
then # {
+ if test -f ${with_curl_lib}/libcurl.a -o -f
${with_curl_lib}/libcurl.${shlibext}; then # {
ac_cv_path_curl_lib="-L`(cd ${with_curl_lib}; pwd)`"
else # }{
AC_MSG_ERROR([${with_curl_lib} directory doesn't contain libcurl.])
@@ -87,13 +91,15 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_curl_lib}" = x; then # {
-
- if test x"${curlconfig}" != "x"; then # {
- ac_cv_path_curl_lib=`${curlconfig} --libs`
+ if test x"${curlconfig}" != "x" -a x"${darwin}" = xno; then # {
+ dnl curl-config gives us way to many libraries, which create nasty
linking
+ dnl dependancy issue, so we strip them off here. The real dependencies
are
+ dnl are taken care of by other config tests.
+ ac_cv_path_curl_lib=`${curlconfig} --libs | sed -e 's/lcurl.*/lcurl/'`
else # }{
AC_MSG_CHECKING([for libcurl library])
for i in $libslist; do # {
- if test -f $i/libcurl.a -o -f $i/libcurl.so; then # {
+ if test -f $i/libcurl.a -o -f $i/libcurl.${shlibext}; then # {
if test x"$i" != x"/usr/lib"; then # {
ac_cv_path_curl_lib="-L$i -lcurl"
AC_MSG_RESULT(${ac_cv_path_curl_lib})
@@ -121,36 +127,6 @@
CURL_LIBS=""
fi
- dnl
- dnl Call AC_CHECK_HEADERS here to
- dnl get HAVE_* macros automatically defined
- dnl
- dnl NOTE: we need additional CFLAGS for things to work
- dnl (stuff included by gstreamer header)
- dnl
-
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS $CURL_CFLAGS"
- CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
- AC_CHECK_HEADERS(curl/curl.h)
- CFLAGS="$ac_save_CFLAGS"
- CPPFLAGS="$ac_save_CPPFLAGS"
-
- dnl
- dnl Call AC_CHECK_LIB here to
- dnl make sure curl actually works
- dnl
-
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $CURL_LIBS"
- AC_CHECK_LIB(curl, curl_global_init, [curl_lib_ok="yes"],[curl_lib_ok="no"])
- LIBS="$ac_save_LIBS"
-
- if test x"${curl_lib_ok}" = xno; then
- CURL_LIBS=""
- fi
-
AM_CONDITIONAL(CURL, [test -n "$CURL_LIBS"])
if test -n "$CURL_LIBS"; then
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/ffmpeg.m4 6 Mar 2007 18:06:13 -0000 1.33
+++ macros/ffmpeg.m4 8 Apr 2007 23:06:17 -0000 1.34
@@ -14,7 +14,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
-dnl $Id: ffmpeg.m4,v 1.33 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -107,7 +107,7 @@
AC_ARG_WITH(ffmpeg_lib, AC_HELP_STRING([--with-ffmpeg-lib], [directory where
ffmpeg libraries are]), with_ffmpeg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_lib, [
if test x"${with_ffmpeg_lib}" != x ; then
- if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f
${with_ffmpeg_lib}/libavcodec.so; then
+ if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f
${with_ffmpeg_lib}/libavcodec.${shlibext}; then
ac_cv_path_ffmpeg_lib="-L`(cd ${with_ffmpeg_lib}; pwd)`"
else
AC_MSG_ERROR([${with_ffmpeg_lib} directory doesn't contain ffmpeg
libraries.])
@@ -128,7 +128,7 @@
AC_MSG_CHECKING([for libavcodec library])
topdir=""
for i in $libslist; do
- if test -f $i/libavcodec.a -o -f $i/libavcodec.so; then
+ if test -f $i/libavcodec.a -o -f $i/libavcodec.${shlibext}; then
topdir=$i
AC_MSG_RESULT(${topdir}/libavcodec)
if test x"$i" != x"/usr/lib"; then
@@ -163,7 +163,7 @@
libdts=""
fi
if test x"${libdts}" = x; then
- if test -f ${topdir}/libdts.a -o -f ${topdir}/libdts.so; then
+ if test -f ${topdir}/libdts.a -o -f ${topdir}/libdts.${shlibext}; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
AC_MSG_RESULT(${topdir}/libdts)
else
@@ -177,28 +177,6 @@
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"
fi
- dnl Look for the AVUTIL library, which is required on some systems.
- AC_MSG_CHECKING([for libavutil library])
- if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs
libavutil`
- else
- libavutil=""
- fi
- if test x"${libavutil}" = x; then
- if test -f ${topdir}/libavutil.a -o -f ${topdir}/libavutil.so; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
- AC_MSG_RESULT(${topdir}/libavutil)
- else
- AC_MSG_RESULT(no)
- if test x${cross_compiling} = xno; then
- AC_CHECK_LIB(avutil, av_log,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"])
- fi
- fi
- else
- AC_MSG_RESULT(${libavutil})
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavutil}"
- fi
-
dnl Look for the VORBISENC library, which is required on some systems.
AC_MSG_CHECKING([for libvorbisenc library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
@@ -207,7 +185,7 @@
libvorbisenc=""
fi
if test x"${libvorbisenc}" = x; then
- if test -f ${topdir}/libvorbisenc.a -o -f ${topdir}/libvorbisenc.so; then
+ if test -f ${topdir}/libvorbisenc.a -o -f
${topdir}/libvorbisenc.${shlibext}; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"
AC_MSG_RESULT(${topdir}/libvorbisenc)
else
@@ -229,7 +207,7 @@
libavformat=""
fi
if test x"${libavformat}" = x; then
- if test -f ${topdir}/libavformat.a -o -f ${topdir}/libavformat.so; then
+ if test -f ${topdir}/libavformat.a -o -f
${topdir}/libavformat.${shlibext}; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"
AC_MSG_RESULT(${topdir}/libavformat)
else
@@ -243,6 +221,28 @@
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavformat}"
fi
+ dnl Look for the AVUTIL library, which is required on some systems.
+ AC_MSG_CHECKING([for libavutil library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+ $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs
libavutil`
+ else
+ libavutil=""
+ fi
+ if test x"${libavutil}" = x; then
+ if test -f ${topdir}/libavutil.a -o -f ${topdir}/libavutil.${shlibext};
then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
+ AC_MSG_RESULT(${topdir}/libavutil)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(avutil, av_log,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"])
+ fi
+ fi
+ else
+ AC_MSG_RESULT(${libavutil})
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavutil}"
+ fi
+
dnl Look for the THEORA library, which is required on some systems.
AC_MSG_CHECKING([for libtheora library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
@@ -251,7 +251,7 @@
libtheora=""
fi
if test x"${libtheora}" = x; then
- if test -f ${topdir}/libtheora.a -o -f ${topdir}/libtheora.so; then
+ if test -f ${topdir}/libtheora.a -o -f ${topdir}/libtheora.${shlibext};
then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"
AC_MSG_RESULT(${topdir}/libtheora)
else
@@ -273,7 +273,7 @@
libtdc=""
fi
if test x"${libdc}" = x; then
- if test -f ${topdir}/libdc1394.a -o -f ${topdir}/libdc1394.so; then
+ if test -f ${topdir}/libdc1394.a -o -f ${topdir}/libdc1394.${shlibext};
then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394"
AC_MSG_RESULT(${topdir}/libdc1394)
else
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/glib.m4 21 Jan 2007 22:41:02 -0000 1.25
+++ macros/glib.m4 8 Apr 2007 23:06:17 -0000 1.26
@@ -14,7 +14,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
-dnl $Id: glib.m4,v 1.25 2007/01/21 22:41:02 rsavoye Exp $
+dnl $Id: glib.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -71,7 +71,7 @@
AC_ARG_WITH(glib_lib, AC_HELP_STRING([--with-glib-lib], [directory where
glib library is]), with_glib_lib=${withval})
AC_CACHE_VAL(ac_cv_path_glib_lib,[
if test x"${with_glib_lib}" != x ; then
- if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f
${with_glib_lib}/libglib-${gnash_glib_version}.so; then
+ if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f
${with_glib_lib}/libglib-${gnash_glib_version}.${shlibext}; then
ac_cv_path_glib_lib="-L`(cd ${with_glib_lib}; pwd)`
-lglib-${gnash_glib_version}"
else
AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.])
@@ -88,7 +88,7 @@
AC_MSG_CHECKING([for glib library])
if test x"${ac_cv_path_glib_lib}" = x; then
for i in $libslist; do
- if test -f $i/libglib-${gnash_glib_version}.a -o -f
$i/libglib-${gnash_glib_version}.so; then
+ if test -f $i/libglib-${gnash_glib_version}.a -o -f
$i/libglib-${gnash_glib_version}.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}"
break
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/gnashpkgtool.m4 6 Mar 2007 18:06:13 -0000 1.39
+++ macros/gnashpkgtool.m4 8 Apr 2007 23:06:17 -0000 1.40
@@ -14,7 +14,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
-dnl $Id: gnashpkgtool.m4,v 1.39 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.40 2007/04/08 23:06:17 rsavoye Exp $
dnl Generic macros for finding and setting include-paths and library-path
dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -163,7 +163,7 @@
AC_CACHE_VAL(ac_cv_path_$1_lib,[
if test x"${with_$1_lib}" != x ; then
AC_MSG_CHECKING([for lib$1 library in specified directory])
- if test -f ${with_$1_lib}/lib$name.a -o -f
${with_$1_lib}/lib$name.so; then
+ if test -f ${with_$1_lib}/lib$name.a -o -f
${with_$1_lib}/lib$name.${shlibext}; then
tmp=`(cd ${with_$1_lib}; pwd)`
ac_cv_path_$1_lib="-L${tmp} -l$name"
AC_MSG_RESULT([yes])
@@ -190,8 +190,8 @@
ac_save_LIBS=$LIBS
LIBS=""
for i in $libslist; do
- if test -f $i/lib$1.a -o -f $i/lib$1.so; then
- if test -f "$i/lib$1.a" -o -f "$i/lib$1.so";
then
+ if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
+ if test -f "$i/lib$1.a" -o -f
"$i/lib$1.${shlibext}"; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_$1_lib="-L$i -l$1 $5"
break
@@ -201,7 +201,7 @@
fi
fi
else
- if test -f "$i/lib$name.a" -o -f
"$i/lib$name.so"; then
+ if test -f "$i/lib$name.a" -o -f
"$i/lib$name.${shlibext}"; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_$1_lib="-L$i -l$name
$5"
break
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/gtk2.m4 21 Jan 2007 22:41:02 -0000 1.39
+++ macros/gtk2.m4 8 Apr 2007 23:06:17 -0000 1.40
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: gtk2.m4,v 1.39 2007/01/21 22:41:02 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.40 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -63,8 +63,9 @@
fi
if test x"${ac_cv_path_gtk2_incl}" = x; then
AC_CHECK_HEADERS(gtk/gtk.h)
- else
AC_MSG_RESULT($ac_cv_path_gtk2_incl)
+ else
+ AC_MSG_WARN([not sure])
fi
dnl Look for the library
@@ -74,14 +75,14 @@
AC_CACHE_VAL(ac_cv_path_gtk2_lib,[
if test x"${with_gtk2_lib}" != x ; then
- if test -f ${with_gtk2_lib}/libgtk-x11-2.0.so; then
+ if test -f ${with_gtk2_lib}/libgtk-x11-2.0.${shlibext}; then
if test -f ${with_gtk2_lib}/libgdk-x11-2.0; then
ac_cv_path_gtk2_lib=-I`(cd ${with_gtk2_lib}; pwd)`
else
AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain
libgdk-x11-2.0])
fi
else
- AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain
libgtk-x11-2.0.so])
+ AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain
libgtk-x11-2.0.${shlibext}])
fi
fi
])
@@ -97,7 +98,7 @@
AC_MSG_CHECKING([for libgtk2 library])
if test x"${ac_cv_path_gtk2_incl}" != x -a x"${ac_cv_path_gtk2_lib}" = x;
then
for i in $libslist; do
- if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
+ if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0
-lgmodule-2.0"
break
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/gtkglext.m4 9 Jan 2007 00:43:43 -0000 1.33
+++ macros/gtkglext.m4 8 Apr 2007 23:06:17 -0000 1.34
@@ -14,7 +14,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
-dnl: $Id: gtkglext.m4,v 1.33 2007/01/09 00:43:43 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -99,7 +99,7 @@
AC_ARG_WITH(glext_lib, AC_HELP_STRING([--with-glext-lib], [directory where
gtkglext library is]), with_glext_lib=${withval})
AC_CACHE_VAL(ac_cv_path_glext_lib,[
if test x"${with_glext_lib}" != x ; then
- if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a
-o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.so; then
+ if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a
-o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
ac_cv_path_glext_lib=-L`(cd ${with_glext_lib}; pwd)`
else
AC_MSG_ERROR([${with_glext_lib} directory doesnt contain
libgtkglext-x11-${gnash_glext_version}.[a|so]])
@@ -115,14 +115,14 @@
if test x"${ac_cv_path_glext_lib}" = x; then
AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init,
[ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version}
-lgdkglext-x11-${gnash_glext_version}"],[
for i in $libslist; do
- if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.so; then
+ if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
ac_cv_path_glext_incl_config="-I$i/gtkglext-${gnash_glext_version}/include"
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glext_lib="-L$i
-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
break
fi
else
- if test -f $i/libgtkglext-x11-${gnash_glext_version}.a
-o -f $i/libgtkglext-x11-${gnash_glext_version}.so; then
+ if test -f $i/libgtkglext-x11-${gnash_glext_version}.a
-o -f $i/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
ac_cv_path_glext_lib="-L$i/${gnash_glext_topdir}
-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
break
fi
Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/incllist 2 Mar 2007 14:13:43 -0000 1.3
+++ macros/incllist 8 Apr 2007 23:06:17 -0000 1.4
@@ -1 +1 @@
-${prefix}/${host_alias}/include ${prefix}/include /sw/include
/usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/mesa/include
/opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include
.. ../..
+/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/include
/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${prefix}/${host_alias}/include
${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include
/pkg/include /opt/local/include /usr/local/include /home/latest/include
/opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include
/usr/include /usr/pkg/include /usr/local/olpc/include .. ../..
Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/jpeg.m4 9 Jan 2007 00:43:43 -0000 1.22
+++ macros/jpeg.m4 8 Apr 2007 23:06:17 -0000 1.23
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: jpeg.m4,v 1.22 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: jpeg.m4,v 1.23 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_JPEG],
[
@@ -72,7 +72,7 @@
AC_ARG_WITH(jpeg_lib, AC_HELP_STRING([--with-jpeg-lib], [directory where
jpeg library is]), with_jpeg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_jpeg_lib,[
if test x"${with_jpeg_lib}" != x ; then
- if test -f ${with_jpeg_lib}/libjpeg.a -o -f
${with_jpeg_lib}/libjpeg.so; then
+ if test -f ${with_jpeg_lib}/libjpeg.a -o -f
${with_jpeg_lib}/libjpeg.${shlibext}; then
ac_cv_path_jpeg_lib=`(cd ${with_jpeg_lib}; pwd)`
else
AC_MSG_ERROR([${with_jpeg_lib} directory doesn't contain libjpeg.])
@@ -84,7 +84,7 @@
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_MSG_CHECKING([for libjpeg library])
for i in $libslist; do
- if test -f $i/libjpeg.a -o -f $i/libjpeg.so; then
+ if test -f $i/libjpeg.a -o -f $i/libjpeg.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_jpeg_lib="-L$i"
break
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/kde.m4 20 Mar 2007 20:27:29 -0000 1.28
+++ macros/kde.m4 8 Apr 2007 23:06:17 -0000 1.29
@@ -14,7 +14,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
-dnl $Id: kde.m4,v 1.28 2007/03/20 20:27:29 martinwguy Exp $
+dnl $Id: kde.m4,v 1.29 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_KDE],
[
@@ -76,7 +76,7 @@
AC_ARG_WITH(kde_lib, AC_HELP_STRING([--with-kde-lib], [directory where kde
libraries are]), with_kde_lib=${withval})
AC_CACHE_VAL(ac_cv_path_kde_lib, [
if test x"${with_kde_lib}" != x ; then
- if test -f ${with_kde_lib}/libkdeui.a -o -f ${with_kde_lib}/kdeui.so;
then
+ if test -f ${with_kde_lib}/libkdeui.a -o -f
${with_kde_lib}/kdeui.${shlibext}; then
ac_cv_path_kde_lib="-L`(cd ${with_kde_lib}; pwd)`"
else
AC_MSG_ERROR([${with_kde_lib} directory doesn't contain kde
libraries.])
@@ -89,7 +89,7 @@
topdir=""
libslist="${kde_prefix}/lib ${libslist}"
for i in $libslist ; do
- if test -f $i/libkdeui.a -o -f $i/libkdeui.so ; then
+ if test -f $i/libkdeui.a -o -f $i/libkdeui.${shlibext} ; then
topdir=$i
AC_MSG_RESULT(${topdir}/libkdeui)
if test x"$i" != x"/usr/lib"; then
@@ -106,7 +106,7 @@
dnl Look for the kdecore library, which is required
if test x"${ac_cv_path_kde_lib}" != x; then
AC_MSG_CHECKING([for kdecore library])
- if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.so; then
+ if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.${shlibext};
then
ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdecore"
AC_MSG_RESULT(${topdir}/libkdecore)
else
@@ -116,7 +116,7 @@
dnl Look for the kdeprint library, which is required
AC_MSG_CHECKING([for kdeprint library])
if test x"${libkdeprint}" = x; then
- if test -f ${topdir}/libkdeprint.a -o -f ${topdir}/libkdeprint.so; then
+ if test -f ${topdir}/libkdeprint.a -o -f
${topdir}/libkdeprint.${shlibext}; then
ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdeprint"
AC_MSG_RESULT(${topdir}/libkdeprint)
else
@@ -219,7 +219,7 @@
AC_ARG_WITH(qt_lib, AC_HELP_STRING([--with-qt-lib], [directory where qt
libraries are]), with_qt_lib=${withval})
AC_CACHE_VAL(ac_cv_path_qt_lib, [
if test x"${with_qt_lib}" != x ; then
- if test -f ${with_qt_lib}/libqt-mt.q -o -f ${with_qt_lib}/libqt-mt.so;
then
+ if test -f ${with_qt_lib}/libqt-mt.q -o -f
${with_qt_lib}/libqt-mt.${shlibext}; then
ac_cv_path_qt_lib="-L`(cd ${with_qt_lib}; pwd)` -lqt-mt"
else
AC_MSG_ERROR([${with_qt_lib} directory doesn't contain qt
libraries.])
@@ -229,7 +229,7 @@
if test x"${ac_cv_path_qt_lib}" = x; then
AC_MSG_CHECKING([for qt library])
- if test -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f
${gnash_qt_topdir}/lib/libqt-mt.so ; then
+ if test -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f
${gnash_qt_topdir}/lib/libqt-mt.${shlibext} ; then
ac_cv_path_qt_lib="-L${gnash_qt_topdir}/lib -lqt-mt"
fi
if test x"${ac_cv_path_qt_lib}" != x; then
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/libXML.m4 23 Mar 2007 00:30:10 -0000 1.29
+++ macros/libXML.m4 8 Apr 2007 23:06:17 -0000 1.30
@@ -14,7 +14,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
-dnl $Id: libXML.m4,v 1.29 2007/03/23 00:30:10 tgc Exp $
+dnl $Id: libXML.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_LIBXML], [
has_xml=no
@@ -32,7 +32,7 @@
if test x"${ac_cv_path_libxml_incl}" = x; then
AC_PATH_PROG(XML2_CONFIG, xml2-config, ,[${pathlist}])
- if test "x$XML2_CONFIG" != "x" ; then
+ if test "x$XML2_CONFIG" != "x" -a x"${darwin}" = xno ; then
if test "x$XML2_CFLAGS" = "x" ; then
ac_cv_path_libxml_incl=`$XML2_CONFIG --cflags`
fi
@@ -70,16 +70,15 @@
AC_ARG_WITH(libxml_lib, AC_HELP_STRING([--with-libxml-lib], [directory where
libxml2 library is]), with_libxml_lib=${withval})
AC_CACHE_VAL(ac_cv_path_libxml_lib, [
if test x"${with_libxml_lib}" != x ; then
- if test -f ${with_libxml_libs}/libxml2.a -o -f
${with_libxml_lib}/libxml2.so; then
+ if test -f ${with_libxml_libs}/libxml2.a -o -f
${with_libxml_lib}/libxml2.${shlibext}; then
ac_cv_path_libxml_lib="-L`(cd ${with_libxml_lib}; pwd)` -lxml2"
fi
fi
])
-
AC_MSG_CHECKING([for libxml library])
if test x"${ac_cv_path_libxml_lib}" = x ; then
for i in $libslist; do
- if test -f $i/libxml2.a -o -f $i/libxml2.so; then
+ if test -f $i/libxml2.a -o -f $i/libxml2.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_libxml_lib="-L$i -lxml2"
break
Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/libslist 2 Mar 2007 14:13:43 -0000 1.5
+++ macros/libslist 8 Apr 2007 23:06:17 -0000 1.6
@@ -1 +1 @@
-${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /lib
/usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib
/opt/mesa/lib64 .. ../..
+/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib
/Developer/SDKs/MacOSX10.4*.sdk/usr/lib ${prefix}/${host_alias}/lib
${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64
/usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib
/home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib
/usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib /opt/mesa/lib64 .. ../..
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/ming.m4 21 Jan 2007 22:41:03 -0000 1.12
+++ macros/ming.m4 8 Apr 2007 23:06:17 -0000 1.13
@@ -99,7 +99,7 @@
AC_ARG_WITH(ming_lib, AC_HELP_STRING([--with-ming-lib], [directory where
ming library is]), with_ming_lib=${withval})
AC_CACHE_VAL(ac_cv_path_ming_lib, [
if test x"${with_ming_lib}" != x ; then
- if test -f ${with_ming_lib}/libming.a -o -f
${with_ming_lib}/libming.so; then
+ if test -f ${with_ming_lib}/libming.a -o -f
${with_ming_lib}/libming.${shlibext}; then
ac_cv_path_ming_lib=`(cd ${with_ming_lib}; pwd)`
else
AC_MSG_ERROR([${with_ming_lib} directory doesn't contain libming.])
@@ -110,7 +110,7 @@
dnl If the header doesn't exist, there is no point looking for the library.
if test x"${ac_cv_path_ming_incl}" != x; then
for i in $libslist; do
- if test -f $i/libming.a -o -f $i/libming.so; then
+ if test -f $i/libming.a -o -f $i/libming.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_ming_lib="-L$i -lming"
break
Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/mysql.m4 6 Mar 2007 18:06:13 -0000 1.3
+++ macros/mysql.m4 8 Apr 2007 23:06:17 -0000 1.4
@@ -14,7 +14,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
-dnl $Id: mysql.m4,v 1.3 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MYSQL],
[
@@ -65,7 +65,7 @@
AC_ARG_WITH(mysql-lib, AC_HELP_STRING([--with-mysql-lib], [directory where
mysql libraries are]), with_mysql_lib=${withval})
AC_CACHE_VAL(ac_cv_path_mysql_lib,[
if test x"${with_mysql_lib}" != x ; then
- if test -f ${with_mysql_lib}/libmysqlclient.a -o -f
${with_mysql_lib}/libmysqlclient.so; then
+ if test -f ${with_mysql_lib}/libmysqlclient.a -o -f
${with_mysql_lib}/libmysqlclient.${shlibext}; then
ac_cv_path_mysql_lib="-L`(cd ${with_mysql_lib}; pwd)`"
else
AC_MSG_ERROR([${with_mysql_lib} directory doesn't contain mysql
libraries.])
@@ -84,7 +84,7 @@
AC_CHECK_LIB(mysqlclient, mysql_init,
[ac_cv_path_mysql_lib="-lmysqlclient"], [
for i in $libslist; do
- if test -f $i/libmysqlclient.a -o -f $i/libmysqlclient.so; then
+ if test -f $i/libmysqlclient.a -o -f $i/libmysqlclient.${shlibext}; then
topdir=$i
if test x"$i" != x"/usr/lib"; then
ac_cv_path_mysql_lib="-L$i -lmysqlclient"
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/opengl.m4 6 Mar 2007 18:06:13 -0000 1.29
+++ macros/opengl.m4 8 Apr 2007 23:06:17 -0000 1.30
@@ -14,16 +14,10 @@
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: opengl.m4,v 1.29 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
-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.
@@ -35,22 +29,19 @@
else
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])
- newincllist="${incllist} /usr/X11R6/include"
-
- for i in $newincllist; do
+ for i in $incllist; do
if test -f $i/GL/gl.h; then
if test x"$i" != x"/usr/include"; then
ac_cv_path_opengl_includes="-I$i"
break
else
- ac_cv_path_opengl_includes=""
+ ac_cv_path_opengl_includes="default"
break
fi
if test -f $i/GL/glu.h; then
@@ -58,28 +49,24 @@
fi
fi
done
- fi])
- else
- AC_MSG_RESULT(-I${ac_cv_path_opengl_includes})
- if test x"${ac_cv_path_opengl_includes}" != x"/usr/include"; then
- ac_cv_path_opengl_includes="-I${ac_cv_path_opengl_includes}"
- else
- ac_cv_path_opengl_includes=""
fi
+
+ if test x"${ac_cv_path_opengl_includes}" = x; then
+ AC_CHECK_HEADERS([GL/gl.h], [ac_cv_path_opengl_includes=""])
fi
- if test x"${ac_cv_path_opengl_includes}" != x ; then
+ if test x"${ac_cv_path_opengl_includes}" != x -a
x"${ac_cv_path_opengl_includes}" != x"default"; then
OPENGL_CFLAGS="${ac_cv_path_opengl_includes}"
- AC_MSG_RESULT(${ac_cv_path_opengl_includes})
else
OPENGL_CFLAGS=""
fi
+ AC_MSG_RESULT(${ac_cv_path_opengl_includes})
dnl Look for the libraries.
AC_ARG_WITH(opengl_lib, AC_HELP_STRING([--with-opengl-lib], [directory
where OpenGL libraries are]), with_opengl_lib=${withval})
AC_CACHE_VAL(ac_cv_path_opengl_lib,[
if test x"${with_opengl_lib}" != x ; then
- if test -f ${with_opengl_lib}/libGL.a -o -f ${with_opengl_lib}/libGL.so;
then
+ if test -f ${with_opengl_lib}/libGL.a -o -f
${with_opengl_lib}/libGL.${shlibext}; then
ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd)` -lGL -lGLU"
else
if test -f ${with_opengl_lib}/libopengl32.a -o; then
@@ -91,37 +78,36 @@
])
if test x"${ac_cv_path_opengl_lib}" = x; then
- AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
- newliblist="${libslist} /usr/X11R6/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64
/opt/mesa/lib64 /opt/mesa/lib .. ../.."
- for i in $newliblist; do
- if test -f $i/libGLU.a -o -f $i/libGLU.so; then
+ for i in $libslist; do
+ if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
if test x"$i" != x"/usr/lib"; then
- ac_cv_path_opengl_lib="-L$i -lGL -lGLU"
+ ac_cv_path_opengl_lib="-L$i -lGL"
break
else
- ac_cv_path_opengl_lib="-lGL -lGLU"
- fi
- else
- if test -f $i/libopengl32.a; then
- ac_cv_path_opengl_lib="-L$i -lopengl32 -lglu32"
+ ac_cv_path_opengl_lib="-lGL"
break
- else
- ac_cv_path_opengl_lib="-lopengl32 -lglu32"
fi
fi
- if test -f $i/libGLU.a -o -f $i/libGLU.so; then
- AC_MSG_WARN([libGLU not installed!])
- fi
- done])
- else
- if test -f ${ac_cv_path_opengl_lib}/libGLU.a -o -f
${ac_cv_path_opengl_lib}/libGLU.so; then
- if test x"${ac_cv_path_opengl_lib}" != x"/usr/lib"; then
- ac_cv_path_opengl_lib="-L${ac_cv_path_opengl_lib} -lGL -lGLU"
+ done
+ if test x"${ac_cv_path_opengl_lib}" != x; then
+ if test -f $i/libGLU.${shlibext} -o -f $i/libGLU.a; then
+ ac_cv_path_opengl_lib="${ac_cv_path_opengl_lib} -lGLU"
else
- ac_cv_path_opengl_lib="-lGL -lGLU"
+ AC_WARN([No GLU library found!])
fi
+ else dnl nothing found, check for the win32 names
+ for i in $newliblist; do
+ if test -f $i/libopengl32.${shlibext} -o -f $i/libopengl32.a; then
+ ac_cv_path_opengl_lib="-L$i -lopengl32 =lopenglu32"
+ break
fi
+ done
fi
+ fi dnl end of if ac_cv_path_opengl_lib
+ fi dnl end of if $opengl
+
+ if test x"${ac_cv_path_opengl_lib}" = x; then
+ AC_CHECK_LIB([GL], [glBegin], [ac_cv_path_opengl_lib="-lGL -lGLU"])
fi
if test x"${ac_cv_path_opengl_lib}" != x ; then
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/pango.m4 9 Jan 2007 00:43:43 -0000 1.23
+++ macros/pango.m4 8 Apr 2007 23:06:17 -0000 1.24
@@ -14,7 +14,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
-dnl $Id: pango.m4,v 1.23 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: pango.m4,v 1.24 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
@@ -80,7 +80,7 @@
AC_ARG_WITH(pango_lib, AC_HELP_STRING([--with-pango-lib], [directory where
pango library is]), with_pango_lib=${withval})
AC_CACHE_VAL(ac_cv_path_pango_lib,[
if test x"${with_pango_lib}" != x ; then
- if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a
-o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.so; then
+ if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a
-o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.${shlibext};
then
ac_cv_path_pango_lib=-L`(cd ${with_pango_lib}; pwd)`
else
AC_MSG_ERROR([${with_pango_lib} directory doesn't contain
libpangopango.])
@@ -96,7 +96,7 @@
if test x"${ac_cv_path_pango_lib}" = x; then
for i in $libslist; do
- if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.so; then
+ if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_pango_lib="-L$i -lpango-${gnash_pango_version}"
break
Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/pthreads.m4 28 Mar 2007 23:42:19 -0000 1.27
+++ macros/pthreads.m4 8 Apr 2007 23:06:17 -0000 1.28
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl Copyright (C) 2006 Steven G. Johnson <address@hidden>.
-dnl $Id: pthreads.m4,v 1.27 2007/03/28 23:42:19 rsavoye Exp $
+dnl $Id: pthreads.m4,v 1.28 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
@@ -175,7 +175,7 @@
if test x"${PTHREAD_LIBS}" = "x"; then
AC_MSG_CHECKING([searching for pthread library])
for i in $libslist; do
- if test -f $i/libpthread.a -o -f $i/libpthread.so -o -f
$i/libpthread.dylib; then
+ if test -f $i/libpthread.a -o -f $i/libpthread.${shlibext} -o -f
$i/libpthread.dylib; then
pthreads=yes
if test x"$i" != x"/usr/lib"; then
PTHREAD_LIBS="-L$i -lpthread"
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- macros/sdl.m4 21 Jan 2007 22:41:03 -0000 1.38
+++ macros/sdl.m4 8 Apr 2007 23:06:17 -0000 1.39
@@ -14,7 +14,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
-dnl $Id: sdl.m4,v 1.38 2007/01/21 22:41:03 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.39 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_SDL], [
has_sdl=no
@@ -94,10 +94,10 @@
dnl AC_MSG_CHECKING([for sdl library])
AC_CACHE_VAL(ac_cv_path_sdl_lib, [
if test x"${with_sdl_lib}" != x ; then
- if test -f ${with_sdl_lib}/libSDL.a -o -f ${with_sdl_lib}/libSDL.so; then
+ if test -f ${with_sdl_lib}/libSDL.a -o -f
${with_sdl_lib}/libSDL.${shlibext}; then
ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
else
- if test -f ${with_sdl_lib}/libSDL-1.1.a -o -f
${with_sdl_lib}/libSDL-1.1.so; then
+ if test -f ${with_sdl_lib}/libSDL-1.1.a -o -f
${with_sdl_lib}/libSDL-1.1.${shlibext}; then
ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
else
AC_MSG_ERROR([${with_sdl_lib} directory doesn't contain libSDL])
@@ -118,7 +118,7 @@
if test x"${ac_cv_path_sdl_lib}" = x ; then
for i in $libslist; do
- if test -f $i/libSDL.a -o -f $i/libSDL.so; then
+ if test -f $i/libSDL.a -o -f $i/libSDL.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_sdl_lib="-L$i -lSDL"
dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})
@@ -130,7 +130,7 @@
break
fi
else
- if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.so; then
+ if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.${shlibext}; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_sdl_lib="-L$i -lSDL-1.1"
dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})
Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/x11.m4 26 Jan 2007 19:41:41 -0000 1.3
+++ macros/x11.m4 8 Apr 2007 23:06:17 -0000 1.4
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: x11.m4,v 1.3 2007/01/26 19:41:41 rsavoye Exp $
+dnl $Id: x11.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
AC_DEFUN([GNASH_PATH_X11],
[
@@ -61,6 +61,7 @@
AC_MSG_RESULT(${ac_cv_path_x11_incl})
+
if test x"${ac_cv_path_x11_incl}" != x ; then
X11_CFLAGS="${ac_cv_path_x11_incl}"
AC_MSG_RESULT(${ac_cv_path_x11_incl})
@@ -72,7 +73,7 @@
AC_ARG_WITH(x11_lib, AC_HELP_STRING([--with-x11-lib], [directory where x11
library is]), with_x11_lib=${withval})
AC_CACHE_VAL(ac_cv_path_x11_lib,[
if test x"${with_x11_lib}" != x ; then
- if test -f ${with_x11_lib}/libX11.a -o -f ${with_x11_lib}/libX11.so;
then
+ if test -f ${with_x11_lib}/libX11.a -o -f
${with_x11_lib}/libX11.${shlibext}; then
ac_cv_path_x11_lib=`(cd ${with_x11_lib}; pwd)`
else
AC_MSG_ERROR([${with_x11_lib} directory doesn't contain
libx11.])
@@ -81,11 +82,11 @@
])
dnl If the header doesn't exist, there is no point looking for the library.
- if test x"${ac_cv_path_x11_incl}" = x; then
+ if test x"${ac_cv_path_x11_incl}" != x; then
AC_MSG_CHECKING([for X11 library])
for i in $libslist; do
- if test -f $i/libX11.a -o -f $i/libX11.so; then
- if test -f $i/libXinerama.a -o -f $i/libXinerama.so; then
+ if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
+ if test -f $i/libXinerama.a -o -f $i/libXinerama.${shlibext}; then
ac_cv_path_x11_lib="-lXinerama"
fi
if test x"$i" != x"/usr/lib"; then
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/curl_adapter.cpp 9 Mar 2007 14:38:29 -0000 1.24
+++ libbase/curl_adapter.cpp 8 Apr 2007 23:06:17 -0000 1.25
@@ -16,7 +16,7 @@
//
-/* $Id: curl_adapter.cpp,v 1.24 2007/03/09 14:38:29 tgc Exp $ */
+/* $Id: curl_adapter.cpp,v 1.25 2007/04/08 23:06:17 rsavoye Exp $ */
#if defined(_WIN32) || defined(WIN32)
#define snprintf _snprintf
@@ -26,10 +26,6 @@
#include "config.h"
#endif
-#ifdef HAVE_CURL_CURL_H
-# define HAVE_LIBCURL 1
-#endif
-
#include "curl_adapter.h"
#include "tu_file.h"
#include "utility.h"
@@ -47,7 +43,7 @@
// define this if you want seeks back to be reported (on stderr)
//#define GNASH_CURL_WARN_SEEKSBACK 1
-#ifndef HAVE_LIBCURL
+#ifndef USE_CURL
// Stubs, in case client doesn't want to link to zlib.
namespace curl_adapter
@@ -60,7 +56,7 @@
}
-#else // def HAVE_LIBCURL
+#else // def USE_CURL
#include <stdexcept>
@@ -666,7 +662,7 @@
} // namespace curl_adapter
-#endif // def HAVE_LIBCURL
+#endif // def USE_CURL
// Local Variables:
Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/extension.cpp 10 Jan 2007 00:09:56 -0000 1.7
+++ libbase/extension.cpp 8 Apr 2007 23:06:17 -0000 1.8
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: extension.cpp,v 1.7 2007/01/10 00:09:56 strk Exp $ */
+/* $Id: extension.cpp,v 1.8 2007/04/08 23:06:17 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -36,6 +36,7 @@
#include <cstring>
#include <iostream>
#include <sys/types.h>
+
#include "log.h"
#include "sharedlib.h"
#include "extension.h"
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/log.h 3 Apr 2007 16:13:07 -0000 1.43
+++ libbase/log.h 8 Apr 2007 23:06:17 -0000 1.44
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: log.h,v 1.43 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: log.h,v 1.44 2007/04/08 23:06:17 rsavoye Exp $ */
#ifndef GNASH_LOG_H
#define GNASH_LOG_H
@@ -24,7 +24,7 @@
#endif
#include "rc.h" // for IF_VERBOSE_* implementation
-#include "tu_config.h"
+//#include "tu_config.h"
#include <fstream>
#include <sstream>
Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/network.h 3 Apr 2007 16:54:35 -0000 1.14
+++ libbase/network.h 8 Apr 2007 23:06:17 -0000 1.15
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,9 +14,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
#ifndef __NETWORK_H__
#define __NETWORK_H__
Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/noseek_fd_adapter.cpp 9 Mar 2007 14:38:29 -0000 1.14
+++ libbase/noseek_fd_adapter.cpp 8 Apr 2007 23:06:17 -0000 1.15
@@ -16,7 +16,7 @@
//
-/* $Id: noseek_fd_adapter.cpp,v 1.14 2007/03/09 14:38:29 tgc Exp $ */
+/* $Id: noseek_fd_adapter.cpp,v 1.15 2007/04/08 23:06:17 rsavoye Exp $ */
#if defined(_WIN32) || defined(WIN32)
#define snprintf _snprintf
@@ -26,10 +26,6 @@
#include "config.h"
#endif
-#ifdef HAVE_STDIN_CURL_H
-# define HAVE_LIBCURL 1
-#endif
-
#include "noseek_fd_adapter.h"
#include "tu_file.h"
#include "utility.h"
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libbase/rc.cpp 13 Dec 2006 12:00:06 -0000 1.20
+++ libbase/rc.cpp 8 Apr 2007 23:06:17 -0000 1.21
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,26 +14,22 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
// This is generated by autoconf
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "StringPredicates.h"
-
#include <sys/types.h>
#include <sys/stat.h>
-#include "tu_types.h"
-
+#include <cctype> // for toupper
#include <string>
#include <vector>
#include <iostream>
#include <fstream>
+#include "tu_types.h"
+#include "StringPredicates.h"
#include "log.h"
#include "rc.h"
Index: libbase/ref_counted.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/ref_counted.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/ref_counted.h 7 Nov 2006 17:16:18 -0000 1.3
+++ libbase/ref_counted.h 8 Apr 2007 23:06:17 -0000 1.4
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,10 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-/* $Id: ref_counted.h,v 1.3 2006/11/07 17:16:18 strk Exp $ */
+/* $Id: ref_counted.h,v 1.4 2007/04/08 23:06:17 rsavoye Exp $ */
#ifndef GNASH_REF_COUNTED_H
#define GNASH_REF_COUNTED_H
Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/sharedlib.cpp 10 Jan 2007 00:09:56 -0000 1.14
+++ libbase/sharedlib.cpp 8 Apr 2007 23:06:17 -0000 1.15
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: sharedlib.cpp,v 1.14 2007/01/10 00:09:56 strk Exp $ */
+/* $Id: sharedlib.cpp,v 1.15 2007/04/08 23:06:17 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -224,7 +224,7 @@
run = lt_dlsym (_dlhandle, symbol);
if (run == NULL) {
- dbglogfile << "Couldn't find symbol: " << symbol << endl;
+ dbglogfile << " Couldn't find symbol: " << symbol << endl;
return NULL;
} else {
dbglogfile << "Found symbol " << symbol << " @ " << (void *)run <<
endl;
@@ -249,7 +249,7 @@
Markus: 'Id est NULL.'
*/
if (run == NULL) {
- dbglogfile << "Couldn't find symbol: " << symbol << endl;
+ dbglogfile << " Couldn't find symbol: " << symbol << endl;
return NULL;
} else {
dbglogfile << "Found symbol " << symbol << " @ " << (void *)run <<
endl;
Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/samples/Makefile.am 2 Apr 2007 10:47:36 -0000 1.14
+++ testsuite/samples/Makefile.am 8 Apr 2007 23:06:17 -0000 1.15
@@ -21,9 +21,8 @@
CLEANFILES = \
gnash-dbg.log \
site.exp.bak \
- testrun.sum \
- testrun.log
-
+ testrun.* \
+ GotoAndPlayTestRunner
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
- [Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ...,
Rob Savoye <=