[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash backend/Makefile.am gui/Makefile.am serve... [relea
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash backend/Makefile.am gui/Makefile.am serve... [release_0_7_2] |
|
Date: |
Sat, 04 Nov 2006 03:07:26 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Rob Savoye <rsavoye> 06/11/04 03:07:25
Modified files:
backend : Makefile.am
gui : Makefile.am
server : Makefile.am
utilities : Makefile.am
. : ChangeLog
macros : agg.m4 atk.m4 boost.m4 cairo.m4 curl.m4
ffmpeg.m4 glib.m4 gnashpkgtool.m4 gstreamer.m4
gtk2.m4 gtkglext.m4 jpeg.m4 kde.m4 libXML.m4
libtool.m4 mad.m4 ming.m4 ogg.m4 opengl.m4
pango.m4 pkg.m4 png.m4 pthreads.m4 sdl.m4
xft.m4 zlib.m4
Log message:
* macros/curl.m4: Don't use curl-config when cross
compiling. Break when the header is found, and don't forget to
actually add the library to LDFLAGS.
* autogen.sh: Don't pass -I macro if the directory doesn't
exist. This is useful for nested configure scripts.
* macros/agg.m4, atk.m4, boost.m4, curl.m4, glib.m4, gtk2.m4,
gtkglext.m4, jpeg.m4, kde.m4, libXML.m4, pango.m4, png.m4,
sdl.m4:
Look in the $prefix path for includes and libraries. This lets
specifying --prefix become the default path to search in for
cross
compiling.
* macros/pkg.m4: When cross compiling, don't use pkg-config, as
it
only gets host values.
* server/Makefile.am: Add CURL_LIBS to the link list.
* utilities/Makefile.am: Add CURL_LIBS to the link list.
* backend/Makefile.am: Add CURL_LIBS to the link list.
* gui/Makefile.am: Add CURL_LIBS to the link list.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.44&r2=1.44.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.39.2.6&r2=1.39.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.80.2.2&r2=1.80.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.34&r2=1.34.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.65&r2=1.1412.2.66
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.16.2.1&r2=1.16.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.21.2.2&r2=1.21.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22.2.2&r2=1.22.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.10.2.1&r2=1.10.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.8.2.1&r2=1.8.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.21.2.1&r2=1.21.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.2&r2=1.17.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.12.2.3&r2=1.12.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.21.2.1&r2=1.21.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.1&r2=1.29.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.26.2.1&r2=1.26.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.18.2.1&r2=1.18.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.20.2.3&r2=1.20.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22.2.1&r2=1.22.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libtool.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.16.2.1&r2=1.16.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.19.2.1&r2=1.19.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.26.2.1&r2=1.26.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.18.2.2&r2=1.18.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.16.2.1&r2=1.16.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.18.2.1&r2=1.18.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.31.2.1&r2=1.31.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/xft.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.1&r2=1.11.2.2
Patches:
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -b -r1.44 -r1.44.2.1
--- backend/Makefile.am 22 Oct 2006 17:27:40 -0000 1.44
+++ backend/Makefile.am 4 Nov 2006 03:07:24 -0000 1.44.2.1
@@ -33,6 +33,7 @@
$(SDL_LIBS) \
$(PANGO_LIBS) \
$(ATK_LIBS) \
+ $(CURL_LIBS) \
$(X_LIBS) \
$(DMALLOC_LIBS) \
$(PTHREAD_LIBS) \
@@ -54,6 +55,7 @@
$(PNG_CFLAGS) \
$(JPEG_CFLAGS) \
$(OGG_CFLAGS) \
+ $(CURL_CFLAGS) \
$(NULL)
noinst_HEADERS = \
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -b -r1.39.2.6 -r1.39.2.7
--- gui/Makefile.am 3 Nov 2006 11:43:10 -0000 1.39.2.6
+++ gui/Makefile.am 4 Nov 2006 03:07:24 -0000 1.39.2.7
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.39.2.6 2006/11/03 11:43:10 nihilus Exp $
+# $Id: Makefile.am,v 1.39.2.7 2006/11/04 03:07:24 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -45,6 +45,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(PANGO_LIBS) \
+ $(CURL_LIBS) \
$(PTHREAD_LIBS) \
$(NULL)
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.80.2.2
retrieving revision 1.80.2.3
diff -u -b -r1.80.2.2 -r1.80.2.3
--- server/Makefile.am 3 Nov 2006 08:39:09 -0000 1.80.2.2
+++ server/Makefile.am 4 Nov 2006 03:07:24 -0000 1.80.2.3
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.80.2.2 2006/11/03 08:39:09 strk Exp $
+# $Id: Makefile.am,v 1.80.2.3 2006/11/04 03:07:24 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -49,6 +49,7 @@
$(GLIB_CFLAGS) \
$(CAIRO_CFLAGS) \
$(ATK_CFLAGS) \
+ $(CURL_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(LIBXML_CFLAGS)
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- utilities/Makefile.am 22 Oct 2006 01:00:54 -0000 1.34
+++ utilities/Makefile.am 4 Nov 2006 03:07:24 -0000 1.34.2.1
@@ -31,7 +31,9 @@
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS = $(NULL)
+AM_LDFLAGS = \
+ $(CURL_LIBS) \
+ $(NULL)
# $(GLIB_LIBS) \
# $(PTHREAD_LIBS)
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.65
retrieving revision 1.1412.2.66
diff -u -b -r1.1412.2.65 -r1.1412.2.66
--- ChangeLog 4 Nov 2006 01:37:05 -0000 1.1412.2.65
+++ ChangeLog 4 Nov 2006 03:07:24 -0000 1.1412.2.66
@@ -1,3 +1,22 @@
+2006-11-03 Rob Savoye <address@hidden>
+
+ * macros/curl.m4: Don't use curl-config when cross
+ compiling. Break when the header is found, and don't forget to
+ actually add the library to LDFLAGS.
+ * autogen.sh: Don't pass -I macro if the directory doesn't
+ exist. This is useful for nested configure scripts.
+ * macros/agg.m4, atk.m4, boost.m4, curl.m4, glib.m4, gtk2.m4,
+ gtkglext.m4, jpeg.m4, kde.m4, libXML.m4, pango.m4, png.m4, sdl.m4:
+ Look in the $prefix path for includes and libraries. This lets
+ specifying --prefix become the default path to search in for cross
+ compiling.
+ * macros/pkg.m4: When cross compiling, don't use pkg-config, as it
+ only gets host values.
+ * server/Makefile.am: Add CURL_LIBS to the link list.
+ * utilities/Makefile.am: Add CURL_LIBS to the link list.
+ * backend/Makefile.am: Add CURL_LIBS to the link list.
+ * gui/Makefile.am: Add CURL_LIBS to the link list.
+
2006-11-03 Sandro Santilli <address@hidden>
* server/parser/button_character_def.{cpp,h}: fixed last
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- macros/agg.m4 30 Oct 2006 14:28:47 -0000 1.16.2.1
+++ macros/agg.m4 4 Nov 2006 03:07:25 -0000 1.16.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: agg.m4,v 1.16.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: agg.m4,v 1.16.2.2 2006/11/04 03:07:25 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
@@ -47,7 +47,7 @@
AC_MSG_CHECKING([for AGG headers])
if test x"${ac_cv_path_agg_incl}" = x ; then
- incllist="${includedir} /sw/include /usr/pkg/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
${includedir} /sw/include /usr/pkg/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
ac_cv_path_agg_incl="-I$i/agg2"
@@ -96,7 +96,7 @@
AC_LANG_PUSH(C++)
if test x"${ac_cv_path_agg_lib}" = x; then
AC_CHECK_LIB(agg, agg::gamma_ctrl_impl::calc_points,
[ac_cv_path_agg_lib=""],[
- libslist="${prefix}/lib32 ${prefix}/lib64 ${prefix}/lib /usr/lib32
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/local/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib ${prefix}/lib32
${prefix}/lib64 ${prefix}/lib /usr/lib32 /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/local/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libagg.a -o -f $i/libagg.so; then
if test x"$i" != x"/usr/lib"; then
@@ -125,18 +125,18 @@
fi
fi
- AC_EGREP_HEADER(render_scanlines_compound_layered,
- ${agg_include_dir}/agg_renderer_scanline.h,
- [ agg_need_compatibility_layer="no" ],
- [ agg_need_compatibility_layer="yes" ] )
-
- AC_SUBST(agg_need_compatibility_layer)
-
- if test x"${agg_need_compatibility_layer}" = xyes; then
- AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers
include the render_scanlines_compound_layered templated function])
- else
- AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [1], [AGG headers
include the render_scanlines_compound_layered templated function])
- fi
+dnl AC_EGREP_HEADER(render_scanlines_compound_layered,
+dnl ${agg_include_dir}/agg_renderer_scanline.h,
+dnl [ agg_need_compatibility_layer="no" ],
+dnl [ agg_need_compatibility_layer="yes" ] )
+
+dnl AC_SUBST(agg_need_compatibility_layer)
+
+dnl if test x"${agg_need_compatibility_layer}" = xyes; then
+dnl AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers
include the render_scanlines_compound_layered templated function])
+dnl else
+dnl AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [1], [AGG headers
include the render_scanlines_compound_layered templated function])
+dnl fi
AC_SUBST(AGG_LIBS)
Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- macros/atk.m4 30 Oct 2006 16:29:24 -0000 1.21.2.2
+++ macros/atk.m4 4 Nov 2006 03:07:25 -0000 1.21.2.3
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.21.2.2 2006/10/30 16:29:24 nihilus Exp $
+dnl $Id: atk.m4,v 1.21.2.3 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
@@ -46,7 +46,7 @@
$PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
fi
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/local/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/opt/local/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_atk_topdir=""
gnash_atk_version=""
for i in $pathlist; do
@@ -57,6 +57,9 @@
break
fi
done
+ if test x$gnash_atk_version != x; then
+ break;
+ fi
done
if test x"${gnash_atk_version}" = x; then
@@ -74,8 +77,7 @@
AC_MSG_CHECKING([for libatk header])
- incllist="${prefix}/include /sw/include /usr/local/include
/opt/local/include /home/latest/include /usr/X11R6/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
-
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/usr/X11R6/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
for i in $incllist; do #{
if test -f $i/atk/atk.h; then #{
ac_cv_path_atk_incl="-I$i"
@@ -122,7 +124,7 @@
if test x"${ac_cv_path_atk_incl}" != x -a x"${ac_cv_path_atk_lib}" = x ;
then #{
AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/lib64 /usr/lib /opt/local/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libatk-${gnash_atk_version}.a -o -f
$i/libatk-${gnash_atk_version}.so; then #{
if test x"$i" != x"/usr/lib"; then #{
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -b -r1.22.2.2 -r1.22.2.3
--- macros/boost.m4 30 Oct 2006 16:11:09 -0000 1.22.2.2
+++ macros/boost.m4 4 Nov 2006 03:07:25 -0000 1.22.2.3
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: boost.m4,v 1.22.2.2 2006/10/30 16:11:09 nihilus Exp $
+dnl $Id: boost.m4,v 1.22.2.3 2006/11/04 03:07:25 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -46,7 +46,7 @@
$PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $1".0"}'`
fi
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/nekoware/include /usr/freeware/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/nekoware/include /usr/freeware/include
/usr/local/include /home/latest/include /opt/include /opt/local/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_boost_topdir=""
gnash_boost_version=""
for i in $pathlist; do
@@ -57,6 +57,9 @@
break
fi
done
+ if test x$gnash_boost_version != x; then
+ break;
+ fi
done
if test x"${gnash_boost_version}" = x; then
@@ -69,7 +72,7 @@
if test x"${ac_cv_path_boost_incl}" = x ; then
AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp,
[ac_cv_path_boost_incl="-I/usr/include"],[
if test x"${ac_cv_path_boost_incl}" = x; then
- incllist="/usr/local/include /sw/include /opt/local/include
/usr/local/include /usr/nekoware/include /usr/freeware/include
/home/latest/include /opt/include /opt/local/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/usr/local/include /sw/include /opt/local/include /usr/local/include
/usr/nekoware/include /usr/freeware/include /home/latest/include /opt/include
/opt/local/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/boost/detail/lightweight_mutex.hpp; then
ac_cv_path_boost_incl="-I$i"
@@ -107,7 +110,7 @@
if test x"${ac_cv_path_boost_lib}" = x; then
AC_SEARCH_LIBS(cleanup_slots, ${boostnames},
[ac_cv_path_boost_lib="${LIBS}"],[
AC_MSG_CHECKING([for Boost thread library])
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib32
${prefix}/lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib
/usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
boostnames=`ls -dr $i/libboost?thread*.so 2>/dev/null`
for libname in ${boostnames}; do
Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- macros/cairo.m4 30 Oct 2006 14:28:47 -0000 1.10.2.1
+++ macros/cairo.m4 4 Nov 2006 03:07:25 -0000 1.10.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: cairo.m4,v 1.10.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: cairo.m4,v 1.10.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CAIRO],
[
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -b -r1.8.2.1 -r1.8.2.2
--- macros/curl.m4 30 Oct 2006 14:28:47 -0000 1.8.2.1
+++ macros/curl.m4 4 Nov 2006 03:07:25 -0000 1.8.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: curl.m4,v 1.8.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: curl.m4,v 1.8.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -33,6 +33,9 @@
fi
])
+
+
+ if test x$cross_compling = xno; then
AC_CHECK_PROG(curlconfig, [echo], [curl-config])
if test x"${curlconfig}" != "x" ; then
AC_MSG_CHECKING([for RTMP support])
@@ -45,25 +48,22 @@
rtmp=yes
fi
fi
+ fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_curl_incl}" = x; then
AC_MSG_CHECKING([for libcurl header])
- if test x"${curlconfig}" != "x" ; then
-
+ if test x"${curlconfig}" != "x" -a x$cross_compling = xno; then
ac_cv_path_curl_incl=`${curlconfig} --cflags`
-
else
-
- incllist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
-
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/curl/curl.h; then
ac_cv_path_curl_incl="-I$i"
+ break
fi
done
-
fi
if test x"${ac_cv_path_curl_incl}" != x ; then
@@ -71,7 +71,6 @@
else
AC_MSG_RESULT(no)
fi
-
fi
@@ -101,15 +100,15 @@
else # }{
AC_MSG_CHECKING([for libcurl library])
- libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/local/lib
/home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib /usr/lib64
/usr/lib /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib /opt/lib
/opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do # {
if test -f $i/libcurl.a -o -f $i/libcurl.so; then # {
if test x"$i" != x"/usr/lib"; then # {
- ac_cv_path_curl_lib="-L$i"
+ ac_cv_path_curl_lib="-L$i -lcurl"
AC_MSG_RESULT(${ac_cv_path_curl_lib})
break
else # }{
- ac_cv_path_curl_lib=""
+ ac_cv_path_curl_lib="-lcurl"
AC_MSG_RESULT(yes)
break
fi # }
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- macros/ffmpeg.m4 30 Oct 2006 14:28:47 -0000 1.21.2.1
+++ macros/ffmpeg.m4 4 Nov 2006 03:07:25 -0000 1.21.2.2
@@ -21,7 +21,7 @@
dnl date-time, filesystem. graph. iostreams, program options, python,
dnl regex, serialization, signals, unit test, thead, and wave.
-dnl $Id: ffmpeg.m4,v 1.21.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.21.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -180,6 +180,27 @@
])
if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG
--libs-only-l libavformat | cut -f 1 -d ' '`
+ else
+ libavformat=""
+ fi
+
+ if test x"${libavformat}" = x; then
+ AC_CHECK_LIB(libavformat, av_open_input_file,
+ [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"],
+ [
+ AC_MSG_CHECKING([for libavformat library])
+ if test -f $topdir/libavformat.so; then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"
+ AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+ fi
+ ])
+ else
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavformat}"
+ AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+ fi
+
+ if test x"$PKG_CONFIG" != x; then
$PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs theora`
else
libtheora=""
@@ -189,7 +210,7 @@
AC_CHECK_LIB(theora, theora_encode_init,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"],
[
- AC_MSG_CHECKING([for libvorbisenc library])
+ AC_MSG_CHECKING([for libtheora library])
if test -f $topdir/libtheora.so; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"
AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -b -r1.17.2.2 -r1.17.2.3
--- macros/glib.m4 30 Oct 2006 16:11:09 -0000 1.17.2.2
+++ macros/glib.m4 4 Nov 2006 03:07:25 -0000 1.17.2.3
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: glib.m4,v 1.17.2.2 2006/10/30 16:11:09 nihilus Exp $
+dnl $Id: glib.m4,v 1.17.2.3 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -46,7 +46,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Glib Version])
if test x"${gnash_glib_version}" = x; then
- pathlist="${with_glib_incl} ${prefix}/include /sw/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${with_glib_incl} ${prefix}/${target_alias}/include
${prefix}/include /sw/include /opt/local/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
gnash_glib_topdir=""
gnash_glib_version=""
@@ -58,6 +58,9 @@
break
fi
done
+ if test x$gnash_glib_version != x; then
+ break;
+ fi
done
fi
@@ -67,7 +70,7 @@
if test x"${ac_cv_path_glib_incl}" = x; then
AC_CHECK_HEADERS(glib.h, [ac_cv_path_glib_incl=""],[
if test x"${ac_cv_path_glib_incl}" = x; then
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /usr/include /opt/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /home/latest/include
/usr/include /opt/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/glib.h; then
@@ -105,7 +108,7 @@
if test x"${ac_cv_path_glib_lib}" = x; then
AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init,
[ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[
- libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib
/usr/lib64 /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${ac_cv_path_glib_lib}
${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
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 x"$i" != x"/usr/lib"; then
@@ -146,13 +149,23 @@
fi
if test x"${ac_cv_path_glib_incl}" != x; then
- GLIB_CFLAGS="${ac_cv_path_glib_incl}"
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/glib-${gnash_glib_version}/include/glibconfig.h; then
+ GLIB_CFLAGS="-I${i}/glib-${gnash_glib_version}/include"
+ break
+ fi
+ done
+ if test x"${ac_cv_path_glib_incl}" = x"yes"; then
+ GLIB_CFLAGS="$GLIB_CFLAGS"
+ else
+ GLIB_CFLAGS="${ac_cv_path_glib_incl} $GLIB_CFLAGS"
+ fi
+ AC_DEFINE([HAVE_GLIB], [1], [Has GLIB library installed])
else
GLIB_CFLAGS=""
fi
-
-
if test x"${ac_cv_path_glib_lib}" != x ; then
GLIB_LIBS="${ac_cv_path_glib_lib}"
else
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- macros/gnashpkgtool.m4 30 Oct 2006 16:20:21 -0000 1.12.2.3
+++ macros/gnashpkgtool.m4 4 Nov 2006 03:07:25 -0000 1.12.2.4
@@ -14,10 +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
-dnl
-
-dnl $Id: gnashpkgtool.m4,v 1.12.2.3 2006/10/30 16:20:21 strk Exp $
+dnl $Id: gnashpkgtool.m4,v 1.12.2.4 2006/11/04 03:07:25 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()..
@@ -27,6 +24,7 @@
dnl up with correct information about what's available and what not
dnl and every provided info is verified before acceptance
dnl
+dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()...
AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg
images])
[
Index: macros/gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- macros/gstreamer.m4 30 Oct 2006 14:28:47 -0000 1.21.2.1
+++ macros/gstreamer.m4 4 Nov 2006 03:07:25 -0000 1.21.2.2
@@ -17,7 +17,8 @@
dnl
dnl
-dnl $Id: gstreamer.m4,v 1.21.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: gstreamer.m4,v 1.21.2.2 2006/11/04 03:07:25 rsavoye Exp $
+dnl $Id: gstreamer.m4,v 1.21.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GSTREAMER],
[
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -b -r1.29.2.1 -r1.29.2.2
--- macros/gtk2.m4 30 Oct 2006 14:28:47 -0000 1.29.2.1
+++ macros/gtk2.m4 4 Nov 2006 03:07:25 -0000 1.29.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.29.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.29.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -48,7 +48,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Gtk Version])
if test x"${gnash_gtk2_version}" = x; then
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_gtk2_topdir=""
gnash_gtk2_version=""
@@ -60,6 +60,9 @@
break
fi
done
+ if test x$gnash_gtk2_version != x; then
+ break;
+ fi
done
fi
AC_MSG_RESULT(${gnash_gtk2_version})
@@ -70,7 +73,7 @@
AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
if test x"${ac_cv_path_gtk2_incl}" = x; then
AC_MSG_CHECKING([for libgtk2 header])
- incllist="${prefix}/include /sw/include /opt/local/lib
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/lib /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then
@@ -112,7 +115,7 @@
dnl the library.
if test x"${ac_cv_path_gtk2_incl}" != x -a x"$ac_cv_path_gtk2_lib" = x; then
AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0
-lgdk-x11-2.0"],[
- libslist="${with_gtk2_lib} ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${with_gtk2_lib} ${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
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 x"$i" != x"/usr/lib"; then
@@ -122,11 +125,6 @@
ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2.0"
break
fi
- else
- if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
- ac_cv_path_gtk2_lib="$i/${gnash_gtk2_topdir}"
- break
- fi
fi
done
])
@@ -143,7 +141,7 @@
AC_MSG_RESULT($ac_cv_path_gtk2_lib)
if test x"${ac_cv_path_gtk2_incl}" != x; then
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/gtk-${gnash_gtk2_version}/include/gdkconfig.h; then
GTK2_CFLAGS="-I${i}/gtk-${gnash_gtk2_version}/include"
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -b -r1.26.2.1 -r1.26.2.2
--- macros/gtkglext.m4 30 Oct 2006 14:28:47 -0000 1.26.2.1
+++ macros/gtkglext.m4 4 Nov 2006 03:07:25 -0000 1.26.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl: $Id: gtkglext.m4,v 1.26.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.26.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -58,7 +58,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Gtk GL Extensions Version])
if test x"${gnash_glext_version}" = x ; then
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
gnash_glext_topdir=""
gnash_glext_version=""
@@ -70,6 +70,9 @@
break
fi
done
+ if test x$gnash_glext_version != x; then
+ break;
+ fi
done
fi
@@ -78,7 +81,7 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_glext_incl}" = x; then
AC_MSG_CHECKING([for gtk/gtkgl.h])
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
ac_cv_path_glext_incl=""
for i in $incllist; do
@@ -121,7 +124,7 @@
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}"],[
- libslist="${prefix}/lib64 ${prefix}/lib /opt/local/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /opt/local/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib /opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib
/usr/lib64 /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
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 x"$i" != x"/usr/lib"; then
@@ -150,9 +153,7 @@
if test x"${ac_cv_path_glext_incl}" != x ; then
AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /opt/local/lib
/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
-
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib /usr/lib64 /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /opt/local/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
ac_cv_path_glext_incl="${ac_cv_path_glext_incl}"
for i in $libslist; do
if test -f $i/gtkglext-${gnash_glext_version}/include/gdkglext-config.h;
then
Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- macros/jpeg.m4 30 Oct 2006 14:28:47 -0000 1.18.2.1
+++ macros/jpeg.m4 4 Nov 2006 03:07:25 -0000 1.18.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: jpeg.m4,v 1.18.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: jpeg.m4,v 1.18.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_JPEG],
[
@@ -45,7 +45,7 @@
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""],[
if test x"${ac_cv_path_jpeg_incl}" = x; then
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/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
@@ -92,7 +92,7 @@
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib=""],[
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /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: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -b -r1.20.2.3 -r1.20.2.4
--- macros/kde.m4 2 Nov 2006 17:08:18 -0000 1.20.2.3
+++ macros/kde.m4 4 Nov 2006 03:07:25 -0000 1.20.2.4
@@ -14,10 +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
-dnl
-
-dnl $Id: kde.m4,v 1.20.2.3 2006/11/02 17:08:18 strk Exp $
+dnl $Id: kde.m4,v 1.20.2.4 2006/11/04 03:07:25 rsavoye Exp $
dnl ------------------------------------------------------------------------
dnl Find a file (or one of more files in a list of dirs)
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- macros/libXML.m4 30 Oct 2006 14:28:47 -0000 1.22.2.1
+++ macros/libXML.m4 4 Nov 2006 03:07:25 -0000 1.22.2.2
@@ -54,6 +54,7 @@
dnl -L/usr/lib, which I really want to avoid!
dnl
#no_libxml=""
+ if test x$cross_compling = xno; then
AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
if test "x$XML2_CONFIG" != "x" ; then
if test "x$LIBXML_CFLAGS" = "x" ; then
@@ -66,6 +67,7 @@
else
AC_MSG_RESULT(no)
fi
+ fi
AC_MSG_CHECKING(for libxml2)
@@ -73,7 +75,7 @@
dnl Try finding out yourself
dnl
if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
- dirlist="${prefix} /lib64 /usr/lib64 /opt/local/lib /lib /usr/lib /usr/pkg
/usr /usr/local /opt /opt/local /home/latest"
+ dirlist="${prefix}/${target_alias} /lib64 /usr/lib64 /opt/local/lib /lib
/usr/lib /usr/pkg /usr /usr/local /opt /opt/local /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: macros/libtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libtool.m4,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- macros/libtool.m4 30 Oct 2006 14:28:47 -0000 1.7.2.1
+++ macros/libtool.m4 4 Nov 2006 03:07:25 -0000 1.7.2.2
@@ -22,10 +22,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
-dnl
-
-dnl $Id: libtool.m4,v 1.7.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: libtool.m4,v 1.7.2.2 2006/11/04 03:07:25 rsavoye Exp $
# serial 48 AC_PROG_LIBTOOL
Index: macros/mad.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mad.m4,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- macros/mad.m4 30 Oct 2006 14:28:47 -0000 1.16.2.1
+++ macros/mad.m4 4 Nov 2006 03:07:25 -0000 1.16.2.2
@@ -14,10 +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
-dnl
-
-dnl $Id: mad.m4,v 1.16.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: mad.m4,v 1.16.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MAD],
[
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- macros/ming.m4 30 Oct 2006 14:28:47 -0000 1.7.2.1
+++ macros/ming.m4 4 Nov 2006 03:07:25 -0000 1.7.2.2
@@ -14,9 +14,6 @@
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
-dnl
-
# Configure paths for Ming
# Sandro Santilli 2006-01-24
#
Index: macros/ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -b -r1.19.2.1 -r1.19.2.2
--- macros/ogg.m4 30 Oct 2006 14:28:47 -0000 1.19.2.1
+++ macros/ogg.m4 4 Nov 2006 03:07:25 -0000 1.19.2.2
@@ -14,10 +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
-dnl
-
-dnl $Id: ogg.m4,v 1.19.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: ogg.m4,v 1.19.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OGG],
[
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -b -r1.26.2.1 -r1.26.2.2
--- macros/opengl.m4 30 Oct 2006 14:28:47 -0000 1.26.2.1
+++ macros/opengl.m4 4 Nov 2006 03:07:25 -0000 1.26.2.2
@@ -14,10 +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
-dnl
-
-dnl $Id: opengl.m4,v 1.26.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.26.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -b -r1.18.2.2 -r1.18.2.3
--- macros/pango.m4 30 Oct 2006 16:29:24 -0000 1.18.2.2
+++ macros/pango.m4 4 Nov 2006 03:07:25 -0000 1.18.2.3
@@ -14,10 +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
-dnl
-
-dnl $Id: pango.m4,v 1.18.2.2 2006/10/30 16:29:24 nihilus Exp $
+dnl $Id: pango.m4,v 1.18.2.3 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
@@ -41,7 +38,7 @@
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Pango Version])
- pathlist="/sw/include /usr/local/include /opt/local/include
/usr/X11R6/include /home/latest/include /opt/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include /sw/include
/usr/local/include /opt/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_pango_topdir=""
gnash_pango_version=""
@@ -53,6 +50,9 @@
break
fi
done
+ if test x$gnash_pango_version != x; then
+ break;
+ fi
done
if test x"${gnash_pango_topdir}" = x; then
@@ -66,27 +66,27 @@
AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
if test x"${ac_cv_path_pango_incl}" = x; then
AC_MSG_CHECKING([for libpango header])
- incllist="/sw/include /usr/local/include /opt/local/include
/usr/X11R6/include /home/latest/include /opt/include /opt/local/lib
/usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include /sw/include
/usr/local/include /opt/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/lib /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/pango/pango.h; then
- ac_cv_path_pango_incl="$i"
+ ac_cv_path_pango_incl="-I$i"
break
else
if test -f $i/${gnash_pango_topdir}/pango/pango.h; then
- ac_cv_path_pango_incl="$i/${gnash_pango_topdir}"
+ ac_cv_path_pango_incl="-I$i/${gnash_pango_topdir}"
break
fi
fi
done
+ fi])
+ fi
+
if test x"${ac_cv_path_pango_incl}" = x; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
- fi])
- fi
-
dnl Look for the library
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,[
@@ -116,7 +116,7 @@
if test x"${ac_cv_path_pango_lib}" = x; then
AC_CHECK_LIB(pango-${gnash_pango_version}, pango_engine_shape_class_init,
[ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"],[
AC_MSG_CHECKING([for libpango library])
- libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/X11R6/lib64
/usr/X11R6/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib /usr/lib64 /usr/lib /sw/lib
/opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
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 x"$i" != x"/usr/lib"; then
@@ -126,11 +126,6 @@
ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"
break
fi
- else
- if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.so; then
- ac_cv_path_pango_lib="$i/${gnash_pango_topdir}"
- break
- fi
fi
done
AC_MSG_RESULT($ac_cv_path_pango_lib)
@@ -145,7 +140,6 @@
fi
fi
-
if test x"${ac_cv_path_pango_incl}" != x; then
PANGO_CFLAGS="${ac_cv_path_pango_incl}"
else
Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- macros/pkg.m4 25 Jul 2006 03:13:17 -0000 1.1
+++ macros/pkg.m4 4 Nov 2006 03:07:25 -0000 1.1.2.1
@@ -27,10 +27,11 @@
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+if test x$cross_compling = xno; then
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
+ fi
+ if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -39,8 +40,11 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
+ fi
+else
+ PKG_CONFIG=""
fi[]dnl
+
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
Index: macros/png.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/png.m4,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- macros/png.m4 30 Oct 2006 14:28:47 -0000 1.16.2.1
+++ macros/png.m4 4 Nov 2006 03:07:25 -0000 1.16.2.2
@@ -14,10 +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
-dnl
-
-dnl $Id: png.m4,v 1.16.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: png.m4,v 1.16.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PNG],
[
@@ -50,7 +47,7 @@
if test x"${ac_cv_path_png_incl}" = x; then
AC_CHECK_HEADERS(png.h, [ac_cv_path_png_incl=""],[
if test x"${ac_cv_path_png_incl}" = x; then
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/png.h; then
@@ -109,7 +106,7 @@
if test x"${ac_cv_path_png_lib}" = x; then
AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib=""],[
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/opt/local/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/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: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- macros/pthreads.m4 30 Oct 2006 14:28:47 -0000 1.18.2.1
+++ macros/pthreads.m4 4 Nov 2006 03:07:25 -0000 1.18.2.2
@@ -14,11 +14,8 @@
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
-dnl
-
dnl Copyright © 2006 Steven G. Johnson <address@hidden>.
-dnl $Id: pthreads.m4,v 1.18.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: pthreads.m4,v 1.18.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -b -r1.31.2.1 -r1.31.2.2
--- macros/sdl.m4 30 Oct 2006 14:28:47 -0000 1.31.2.1
+++ macros/sdl.m4 4 Nov 2006 03:07:25 -0000 1.31.2.2
@@ -14,10 +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
-dnl
-
-dnl $Id: sdl.m4,v 1.31.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.31.2.2 2006/11/04 03:07:25 rsavoye Exp $
AC_DEFUN([GNASH_PATH_SDL],
[dnl
@@ -44,7 +41,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the SDL Version])
if test x"${ac_cv_path_sdl_incl}" = x; then
- pathlist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include /sw/include /usr/local/include
/opt/local/include /home/latest/include /opt/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
gnash_sdl_topdir=""
gnash_sdl_version=""
@@ -70,7 +67,7 @@
AC_MSG_CHECKING([for SDL header])
if test x"${ac_cv_path_sdl_incl}" = x; then
- incllist="${prefix} /usr /usr/pkg /sw /opt/local /opt/local/include
/usr/local /home/latest /opt /usr .. ../.."
+ incllist="${prefix}/${target_alias} ${prefix} /usr /usr/pkg /sw /opt/local
/opt/local/include /usr/local /home/latest /opt /usr .. ../.."
for i in $incllist; do
if test -f $i/include/SDL/SDL.h; then
@@ -129,7 +126,7 @@
if test x"${ac_cv_path_sdl_lib}" = x ; then
AC_CHECK_LIB(SDL, SDL_Init, [ac_cv_path_sdl_lib="-lSDL"],[
- liblist="${prefix}/lib64 ${prefix}/lib /opt/local/lib /usr/lib64
/usr/lib /usr/pkg/lib /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib
/opt/lib.. ../.."
+ liblist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/opt/local/lib /usr/lib64 /usr/lib /usr/pkg/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib.. ../.."
for i in $liblist; do
if test -f $i/libSDL.a -o -f $i/libSDL.so; then
if test x"$i" != x"/usr/lib"; then
Index: macros/xft.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/xft.m4,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- macros/xft.m4 30 Oct 2006 14:28:47 -0000 1.3.2.1
+++ macros/xft.m4 4 Nov 2006 03:07:25 -0000 1.3.2.2
@@ -14,9 +14,6 @@
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
-dnl
-
AC_DEFUN([GNASH_PATH_XFT],
[
if test x"$fltk" = x"yes"; then
Index: macros/zlib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/zlib.m4,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- macros/zlib.m4 30 Oct 2006 14:28:47 -0000 1.11.2.1
+++ macros/zlib.m4 4 Nov 2006 03:07:25 -0000 1.11.2.2
@@ -14,9 +14,6 @@
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
-dnl
-
AC_DEFUN([GNASH_PATH_ZLIB],
[
dnl Lool for the header
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash backend/Makefile.am gui/Makefile.am serve... [release_0_7_2],
Rob Savoye <=