[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/macros agg.m4 atk.m4 boost.m4 cairo.m4 cu...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash/macros agg.m4 atk.m4 boost.m4 cairo.m4 cu... |
|
Date: |
Mon, 09 Oct 2006 04:39:07 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/10/09 04:39:07
Modified files:
macros : agg.m4 atk.m4 boost.m4 cairo.m4 curl.m4
ffmpeg.m4 gstreamer.m4 gtk2.m4 gtkglext.m4
libXML.m4 mad.m4 ogg.m4 pango.m4 png.m4 sdl.m4
zlib.m4
Log message:
* macros/agg.m4, boost.m4, cairo.m4, curl.m, ffmpeg.m4,
gstreamer.m4, gtkglext.m4, libXML.m4, mad.m4,
pango.m4, png.m4, sdl.m4, zlib.m4: Add /opt/local/include to all
include paths, and /opt/local/lib for opendarwin.
* macros/atk.m4, gtk2.m4, ogg.m4: Add /opt/local/include to all
include paths, and /opt/local/lib for opendarwin. Use pkg-config
if it exists.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&r1=1.7&r2=1.8
Patches:
Index: agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- agg.m4 7 Oct 2006 17:36:49 -0000 1.5
+++ agg.m4 9 Oct 2006 04:39:06 -0000 1.6
@@ -55,7 +55,7 @@
if test x"${ac_cv_path_agg_incl}" = x ; then
AC_MSG_CHECKING([for AGG headers])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
@@ -96,7 +96,7 @@
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=""],[
AC_MSG_CHECKING([for libagg library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/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
Index: atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- atk.m4 7 Oct 2006 22:32:52 -0000 1.12
+++ atk.m4 9 Oct 2006 04:39:06 -0000 1.13
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.12 2006/10/07 22:32:52 nihilus Exp $
+dnl $Id: atk.m4,v 1.13 2006/10/09 04:39:06 rsavoye Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
@@ -50,13 +50,17 @@
fi
fi])
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_incl}" = x; then
+ ac_cv_path_atk_incl=`$PKG_CONFIG --cflags atk`
+ pkg=yes
+ fi
dnl Attempt to find the top level directory, which unfortunately has a
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
if test x"${ac_cv_path_atk_incl}" = x; then
AC_MSG_CHECKING([for the Atk Version])
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /usr/include
/usr/pkg/include .. ../.."
+ 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 .. ../.."
gnash_atk_topdir=""
gnash_atk_version=""
@@ -82,7 +86,7 @@
AC_CHECK_HEADERS(atk/atk.h, [ac_cv_path_atk_incl=""],[
if test x"${ac_cv_path_atk_incl}" = x; then
AC_MSG_CHECKING([for libatk header])
- incllist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /usr/X11R6/include /opt/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="/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
@@ -109,19 +113,24 @@
AC_CACHE_VAL(ac_cv_path_atk_lib,[
if test x"${with_atk_lib}" != x ; then
if test -f ${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.a -o -f
${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.so; then
- ac_cv_path_atk_lib=`(cd ${with_atk_incl}; pwd)`
+ ac_cv_path_atk_lib=`(cd ${with_atk_lib}; pwd)`
else
AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.])
fi
fi
])
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_lib}" = x; then
+ ac_cv_path_atk_lib=`$PKG_CONFIG --libs atk`
+ pkg=yes
+ fi
+
dnl If the header doesn't exist, there is no point looking for
dnl the library.
if test x"${ac_cv_path_atk_incl}" != x; then
AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
AC_MSG_CHECKING([for libatk library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib ..
../.."
+ 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 .. ../.."
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
@@ -152,7 +161,7 @@
fi
if test x"${ac_cv_path_atk_incl}" != x ; then
- ATK_CFLAGS="-I${ac_cv_path_atk_incl}"
+ ATK_CFLAGS="${ac_cv_path_atk_incl}"
else
ATK_CFLAGS=""
fi
Index: boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- boost.m4 5 Oct 2006 20:44:57 -0000 1.6
+++ boost.m4 9 Oct 2006 04:39:06 -0000 1.7
@@ -57,7 +57,7 @@
if test x"${ac_cv_path_boost_incl}" = x ; then
AC_MSG_CHECKING([for boost header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/boost/thread/mutex.hpp; then
@@ -85,24 +85,18 @@
dnl Look for the library
AC_ARG_WITH(boost_lib, [ --with-boost-lib directory where boost
libraries are], with_boost_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_boost_lib,[
if test x"${with_boost_lib}" != x ; then
- if test -f ${with_boost_lib}/libboost_thread.a -o -f
${with_boost_lib}/libboost_thread.so; then
ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)`
- else
- AC_MSG_ERROR([${with_boost_lib} directory doesn't contain boost
libraries.])
- fi
fi
- ])
- boostnames="boost_thread boost-thread boost_thread-mt boost_thread-gcc-mt"
+ boostnames="boost_thread boost-thread boost_thread-mt boost_thread-gcc-mt
boost-thread-gcc-m"
for j in $boostnames; do
if test x"${ac_cv_path_boost_lib}" = x; then
AC_CHECK_LIB(${j}, cleanup_slots, [ac_cv_path_boost_lib="-l${j}"],[
AC_MSG_CHECKING([for libboost library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
- if test -f $i/${j}.a -o -f $i/${j}.so; then
+ if test -f $i/lib${j}.a -o -f $i/lib${j}.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_boost_lib="-L$i -l${j}"
AC_MSG_RESULT(${ac_cv_path_boost_lib})
@@ -114,9 +108,11 @@
fi
fi
done])
+ if test x"${ac_cv_path_boost_lib}" != x ; then
+ break;
+ fi
else
- if test -f ${ac_cv_path_boost_lib}/${j}.a -o -f
${ac_cv_path_boost_lib}/${j}.so; then
-
+ if test -f ${ac_cv_path_boost_lib}/lib${j}.a -o -f
${ac_cv_path_boost_lib}/lib${j}.so; 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${j}"
else
Index: cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cairo.m4 7 Oct 2006 02:54:24 -0000 1.7
+++ cairo.m4 9 Oct 2006 04:39:06 -0000 1.8
@@ -57,7 +57,7 @@
AC_CHECK_HEADERS(cairo/cairo.h, [ac_cv_path_cairo_incl=""],[
if test x"${ac_cv_path_cairo_incl}" = x; then
AC_MSG_CHECKING([for Cairo header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="/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/cairo/cairo.h; then
@@ -96,7 +96,7 @@
if test x"${ac_cv_path_cairo_lib}" = x; then
AC_CHECK_LIB(cairo, cairo_status, [ac_cv_path_cairo_lib="-lcairo"],[
AC_MSG_CHECKING([for libcairo library])
- libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="/usr/lib64 /usr/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/libcairo.a -o -f $i/libcairo.so; then
if test x"$i" != x"/usr/lib"; then
Index: curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- curl.m4 18 Sep 2006 13:07:09 -0000 1.4
+++ curl.m4 9 Oct 2006 04:39:06 -0000 1.5
@@ -72,7 +72,7 @@
else
- incllist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="/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
@@ -117,7 +117,7 @@
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 /usr/pkg/lib .. ../.."
+ libslist="/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 # {
Index: ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ffmpeg.m4 7 Oct 2006 22:32:52 -0000 1.6
+++ ffmpeg.m4 9 Oct 2006 04:39:06 -0000 1.7
@@ -39,7 +39,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.6 2006/10/07 22:32:52 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.7 2006/10/09 04:39:06 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -65,7 +65,7 @@
if test x"${ac_cv_path_ffmpeg_incl}" = x ; then
AC_MSG_CHECKING([for ffmpeg header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/ffmpeg/avcodec.h; then
@@ -102,9 +102,9 @@
libn="no"
if test x"${ac_cv_path_ffmpeg_lib}" = x -a x"$FFMPEG_LIBS" = x ; then
- AC_CHECK_LIB(avcodec, cleanup_slots, [FFMPEG_LIBS="-lavcodec -lavutil"],[
+ AC_CHECK_LIB(avcodec, ff_eval, [FFMPEG_LIBS="-lavcodec -lavutil"],[
AC_MSG_CHECKING([for libffmpeg library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libavcodec.a -o -f $i/libavcodec.so; then
if test x"$i" != x"/usr/lib"; then
@@ -127,7 +127,7 @@
else
if test -f ${ac_cv_path_ffmpeg_lib}/libavcodec.a -o -f
${ac_cv_path_ffmpeg_lib}/libavcodec.so; then
if test x"${ac_cv_path_ffmpeg_lib}" != x"/usr/lib"; then
- ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib}"
+ ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
else
ac_cv_path_ffmpeg_lib=""
FFMPEG_LIBS="-lavcodec -lavutil"
Index: gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gstreamer.m4 7 Oct 2006 21:10:20 -0000 1.16
+++ gstreamer.m4 9 Oct 2006 04:39:06 -0000 1.17
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: gstreamer.m4,v 1.16 2006/10/07 21:10:20 nihilus Exp $
+dnl $Id: gstreamer.m4,v 1.17 2006/10/09 04:39:06 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GSTREAMER],
[
@@ -59,7 +59,7 @@
if test x"${ac_cv_path_gstreamer_incl}" = x; then
AC_MSG_CHECKING([for libgstreamer header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="/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/gstr/gst.h; then
@@ -109,7 +109,7 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_gstreamer_lib}" = x; then
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/gstreamer-0.10/libgstreamer-0.10.so; then
Index: gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gtk2.m4 9 Aug 2006 01:59:07 -0000 1.23
+++ gtk2.m4 9 Oct 2006 04:39:06 -0000 1.24
@@ -53,12 +53,19 @@
fi
])
+
+ pkg=no
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; then
+ ac_cv_path_gtk2_incl=`$PKG_CONFIG --cflags gtk+-2.0`
+ pkg=yes
+ fi
+
dnl Attempt to find the top level directory, which unfortunately has a
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
if test x"${gnash_gtk2_version}" = x; then
AC_MSG_CHECKING([for the Gtk Version])
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/usr/include /usr/pkg/include .. ../.."
+ 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 .. ../.."
gnash_gtk2_topdir=""
gnash_gtk2_version=""
@@ -85,7 +92,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
/usr/include /usr/pkg/include .. ../.."
+ 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 .. ../.."
for i in $incllist; do
if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then
@@ -115,12 +122,17 @@
AC_CACHE_VAL(ac_cv_path_gtk2_lib, [ ac_cv_path_gtk2_lib=${with_gtk2_lib}])
+
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
+ ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs gtk+-2.0`
+ fi
+
dnl If the header doesn't exist, there is no point looking for
dnl the library.
if test x"${ac_cv_path_gtk2_incl}" != x; then
AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0
-lgdk-x11-2.0"],[
AC_MSG_CHECKING([for libgtk2 library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/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/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
@@ -149,7 +161,7 @@
fi
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 /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ 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 .. ../.."
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: gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkglext.m4 7 Oct 2006 02:54:24 -0000 1.21
+++ gtkglext.m4 9 Oct 2006 04:39:06 -0000 1.22
@@ -64,19 +64,19 @@
])
pkg=no
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
- ac_cv_path_glext_incl=`$PKG_CONFIG --cflags gtkglext-1.0`
- gnash_glext_version="1.0"
- gnash_glext_topdir="gtkglext-${gnash_glext_version}"
- pkg=yes
- fi
+dnl if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
+dnl ac_cv_path_glext_incl=`$PKG_CONFIG --cflags gtkglext-1.0`
+dnl gnash_glext_version="1.0"
+dnl gnash_glext_topdir="gtkglext-${gnash_glext_version}"
+dnl pkg=yes
+dnl fi
dnl Attempt to find the top level directory, which unfortunately has a
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
if test x"${gnash_glext_version}" = x ; then
AC_MSG_CHECKING([for the Gtk GL Extensions Version])
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/usr/include /usr/pkg/include .. ../.."
+ 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 .. ../.."
gnash_glext_topdir=""
gnash_glext_version=""
@@ -100,7 +100,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
/usr/include /usr/pkg/include .. ../.."
+ 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 .. ../.."
ac_cv_path_glext_incl=""
for i in $incllist; do
@@ -144,7 +144,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}"],[
AC_MSG_CHECKING([for libglext library])
- libslist="${prefix}/lib64 ${prefix}/lib /opt/local/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ 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 .. ../.."
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
@@ -175,7 +175,7 @@
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 /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 .. ../.."
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: libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libXML.m4 9 Aug 2006 01:59:07 -0000 1.19
+++ libXML.m4 9 Oct 2006 04:39:06 -0000 1.20
@@ -91,7 +91,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 /home/latest"
+ dirlist="${prefix} /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: mad.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mad.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- mad.m4 7 Oct 2006 14:20:27 -0000 1.11
+++ mad.m4 9 Oct 2006 04:39:06 -0000 1.12
@@ -62,7 +62,7 @@
AC_CHECK_HEADERS(mad.h, [ac_cv_path_mad_incl=""],[
if test x"${ac_cv_path_mad_incl}" = x; then
AC_MSG_CHECKING([for libmad header])
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /opt/local/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/mad.h; then
@@ -108,7 +108,7 @@
if test x"${ac_cv_path_mad_lib}" = x; then
AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
AC_MSG_CHECKING([for libmad library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /opt/local/lib
/usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /opt/local/lib
/usr/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/libmad.a -o -f $i/libmad.so; then
if test x"$i" != x"/usr/lib"; then
Index: ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ogg.m4 24 Apr 2006 23:05:55 -0000 1.8
+++ ogg.m4 9 Oct 2006 04:39:06 -0000 1.9
@@ -57,12 +57,18 @@
fi
])
+ pkg=no
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_incl}" = x; then
+ ac_cv_path_ogg_incl=`$PKG_CONFIG --cflags ogg`
+ pkg=yes
+ fi
+
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_ogg_incl}" = x; then
AC_CHECK_HEADERS(ogg.h, [ac_cv_path_ogg_incl=""],[
if test x"${ac_cv_path_ogg_incl}" = x; then
AC_MSG_CHECKING([for libogg header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include
/usr/include/usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/ogg/ogg.h; then
@@ -79,7 +85,7 @@
else
AC_MSG_RESULT(-I${ac_cv_path_ogg_incl})
if test x"${ac_cv_path_ogg_incl}" != x"/usr/include"; then
- ac_cv_path_ogg_incl="-I${ac_cv_path_ogg_incl}"
+ ac_cv_path_ogg_incl="${ac_cv_path_ogg_incl}"
else
ac_cv_path_ogg_incl=""
fi
@@ -104,11 +110,15 @@
fi
])
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_lib}" = x; then
+ ac_cv_path_ogg_lib=`$PKG_CONFIG --libs ogg`
+ fi
+
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"${ac_cv_path_ogg_lib}" = x; then
AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
AC_MSG_CHECKING([for libogg library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libogg.a -o -f $i/libogg.so; then
if test x"$i" != x"/usr/lib"; then
Index: pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- pango.m4 7 Oct 2006 22:32:52 -0000 1.15
+++ pango.m4 9 Oct 2006 04:39:06 -0000 1.16
@@ -57,7 +57,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 /usr/include
/usr/pkg/include .. ../.."
+ 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 .. ../.."
gnash_pango_topdir=""
gnash_pango_version=""
@@ -82,7 +82,7 @@
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 /usr/include
/usr/pkg/include .. ../.."
+ 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 .. ../.."
for i in $incllist; do
if test -f $i/pango/pango.h; then
Index: png.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/png.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- png.m4 24 Apr 2006 23:05:55 -0000 1.12
+++ png.m4 9 Oct 2006 04:39:06 -0000 1.13
@@ -66,7 +66,7 @@
AC_CHECK_HEADERS(png.h, [ac_cv_path_png_incl=""],[
if test x"${ac_cv_path_png_incl}" = x; then
AC_MSG_CHECKING([for libpng header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/png.h; then
@@ -120,7 +120,7 @@
if test x"${ac_cv_path_png_lib}" = x; then
AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib=""],[
AC_MSG_CHECKING([for libpng library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /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: sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- sdl.m4 7 Oct 2006 11:35:37 -0000 1.21
+++ sdl.m4 9 Oct 2006 04:39:06 -0000 1.22
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: sdl.m4,v 1.21 2006/10/07 11:35:37 nihilus Exp $
+dnl $Id: sdl.m4,v 1.22 2006/10/09 04:39:06 rsavoye Exp $
AC_DEFUN([GNASH_PATH_SDL],
[dnl
@@ -57,7 +57,7 @@
dnl doesn't seem to get a directory that is unversioned.
if test x"${ac_cv_path_sdl_incl}" = x; then
AC_MSG_CHECKING([for the SDL Version])
- pathlist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="/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=""
@@ -82,7 +82,7 @@
if test x"${ac_cv_path_sdl_incl}" = x ; then
AC_MSG_CHECKING([for SDL header])
- incllist="${prefix} /usr /usr/pkg /sw /opt/local /usr/local /home/latest
/opt /usr .. ../.."
+ incllist="${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/SDL/include/SDL.h; then
@@ -135,7 +135,7 @@
if test x"${ac_cv_path_sdl_lib}" = x ; then
AC_CHECK_LIB(SDL, SDL_Init, [ac_cv_path_sdl_lib="-lSDL"],[
AC_MSG_CHECKING([for SDL library])
- liblist="${prefix}/lib64 ${prefix}/lib /opt/local/lib /usr/lib64
/usr/lib /usr/pkg/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
+ 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.. ../.."
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: zlib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/zlib.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- zlib.m4 24 Apr 2006 23:05:55 -0000 1.7
+++ zlib.m4 9 Oct 2006 04:39:06 -0000 1.8
@@ -53,7 +53,7 @@
if test x"${ac_cv_path_zlib_incl}" = x ; then
AC_MSG_CHECKING([for zlib header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/zlib.h; then
@@ -96,7 +96,7 @@
])
if test x"${ac_cv_path_zlib_lib}" = x ; then
- liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib .. ../.."
+ liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib .. ../.."
for i in $liblist; do
if test -f $i/libz.a -o -f $i/libz.so -o -f $i/libz.dylib; then
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/macros agg.m4 atk.m4 boost.m4 cairo.m4 cu...,
Rob Savoye <=