[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash utilities/Makefile.am cygnal/Makefile.am ...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash utilities/Makefile.am cygnal/Makefile.am ... |
|
Date: |
Tue, 09 Jan 2007 00:43:43 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/01/09 00:43:43
Modified files:
utilities : Makefile.am
cygnal : Makefile.am
gui : Makefile.am
. : configure.ac Makefile.am
macros : agg.m4 archflag.m4 boost.m4 curl.m4 docbook.m4
ffmpeg.m4 firefox.m4 gnashpkgtool.m4 gtk2.m4
gtkglext.m4 kde.m4 libXML.m4 libexe.m4 ming.m4
mysql.m4 opengl.m4 pango.m4 pkg.m4 pthreads.m4
Added files:
macros : glib.m4 incllist jpeg.m4 libslist
Log message:
* Makefile.am: Change ZLIB_ to Z_, so it works with
gnashpkgtool.
* configure.ac: Autoconf isn't correctly determining when we
are cross compiling, so do our own test. Set $incllist and
$libslist to the output of a text file listing all the paths.
Use
GNASH_PATH_JPEG, GNASH_PATH_SDL, and GNASH_PATH_GLIB again.Use
GNASH_PATH_LIBXML again so we can be cross configured.
* macros/jpeg.m4: Add this back in as the name munging leaves
gnashpktool with the wrong setting.
* macros/sdl.m4: Add this back in so we correctly determine the
SDL version regardless of the format.
* cygnal/Makefile.am: Add LIBLTDL to LDFLAGS.
* gui/Makefile.am: Add GTK_ for GTK specific CFLAGS and
LDFLAGS. Link in libgnashamf too.
* gnash/libamf/Makefile.am: Remove a bunch of libraries we don't
actually need.
* macros/agg.m4: Use global incllist and libslist. Drop test for
version 2.3.
* macros/boost.m4: Use global incllist instead of pathlist. Move
AC_CHECK_HEADERS and AC_CHECK_LIB to after directory search.
* macros/curl.m4: Don't use pkg-config when cross compiling. Use
global incllist and libslist.
* macros/ffmpeg.m4: Use global incllist instead of pathlist.
Move
AC_CHECK_HEADERS and AC_CHECK_LIB to after directory search.
Don't
use pkg-config when cross compiling.
* gnashpkgtool.m4: Don't use pkg-config when cross compiling.
Use
global incllist and libslist. Add additional test for header
file
without the package name as the top level directory.
* macros/gtk2.m4, pango.m4: Don't use pkg-config when cross
compiling. Use global incllist and libslist.
* macros/gtkglext.m4, mysql.m4, opengl.m4: Use global incllist
and
libslist.
* macros/libXML.m4: Change --with option names to incl and libs
to
match everything else. Only traverse header paths once.
* macros/ming.m4: If we don't have ming-config, find stuff our
usual way.
* macros/mysql.m4: Use global incllist and libslist.
* macros/opengl.m4: Use global incllist and libslist.
* utilities/Makefile.am: Add Boost and PTHREAD libs, along with
gnashamf. These are needed when cross compiling.
* macros/incllist: List of directories to use for header file
searches.
* macros/libslist: List of directories to use for library
searches.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/archflag.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/docbook.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libexe.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&rev=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&rev=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&rev=1.1
Patches:
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- utilities/Makefile.am 18 Dec 2006 09:13:32 -0000 1.44
+++ utilities/Makefile.am 9 Jan 2007 00:43:42 -0000 1.45
@@ -26,7 +26,8 @@
GNASH_LIBS = \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/server/vm/libgnashvm.la \
- $(top_builddir)/libbase/libgnashbase.la
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libamf/libgnashamf.la
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
@@ -35,9 +36,9 @@
$(LIBADD_DL) \
$(LIBLTDL) \
$(MYSQL_LIBS) \
+ $(BOOST_LIBS) \
+ $(PTHREAD_LIBS) \
$(NULL)
-# $(GLIB_LIBS) \
-# $(PTHREAD_LIBS)
#AM_CPPFLAGS = # -Wall
AM_CPPFLAGS = -I.. \
Index: cygnal/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cygnal/Makefile.am 3 Jan 2007 02:09:11 -0000 1.2
+++ cygnal/Makefile.am 9 Jan 2007 00:43:42 -0000 1.3
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.2 2007/01/03 02:09:11 nihilus Exp $
+# $Id: Makefile.am,v 1.3 2007/01/09 00:43:42 rsavoye Exp $
## Process this file with automake to generate Makefile.in
@@ -29,6 +29,7 @@
AM_LDFLAGS = \
../libbase/libgnashbase.la \
../libamf/libgnashamf.la \
+ $(LIBLTDL) \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
$(CURL_LIBS) \
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gui/Makefile.am 17 Dec 2006 20:24:57 -0000 1.53
+++ gui/Makefile.am 9 Jan 2007 00:43:42 -0000 1.54
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.53 2006/12/17 20:24:57 rsavoye Exp $
+# $Id: Makefile.am,v 1.54 2007/01/09 00:43:42 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -34,24 +34,33 @@
$(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS)
-
-# $(GLIB_CFLAGS) \
-# $(PANGO_CFLAGS) \
-# $(ATK_CFLAGS) \
# $(PNG_CFLAGS) \
# $(JPEG_CFLAGS) \
# $(MP3_CFLAGS) \
-# $(OGG_CFLAGS) \
-#
+# $(OGG_CFLAGS)
+
+GTK_CFLAGS = \
+ $(GTK2_CFLAGS) \
+ $(GLEXT_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(ATK_CFLAGS) \
+ $(CAIRO_CFLAGS)
+
+GTK_LIBS = \
+ $(GTK2_LIBS) \
+ $(GLEXT_LIBS) \
+ $(PANGO_LIBS) \
+ $(ATK_LIBS) \
+ $(GLIB_LIBS) \
+ $(CAIRO_LIBS)
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
- $(GLIB_LIBS) \
$(CURL_LIBS) \
- $(PANGO_LIBS) \
- $(PTHREAD_LIBS) \
$(LIBLTDL) \
+ $(PTHREAD_LIBS) \
$(NULL)
@@ -106,8 +115,8 @@
if USE_GUI_GTK
AM_LDFLAGS += $(CAIRO_LIBS)
GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
- AM_LDFLAGS += $(GTK2_LIBS)
- AM_CPPFLAGS += $(GTK2_CFLAGS)
+ AM_LDFLAGS += $(GTK_LIBS)
+ AM_CPPFLAGS += $(GTK_CFLAGS)
else
GTK_SRCS =
endif
@@ -187,6 +196,7 @@
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
+ $(top_builddir)/libamf/libgnashamf.la \
$(AM_LDFLAGS)
if USE_GUI_KDE
@@ -201,6 +211,7 @@
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/server/vm/libgnashvm.la \
+ $(top_builddir)/server/asobj/libgnashasobjs.la \
$(top_builddir)/libgeometry/libgnashgeo.la \
$(top_builddir)/libbase/libgnashbase.la \
libgnashplayer.la
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- configure.ac 2 Jan 2007 15:10:02 -0000 1.227
+++ configure.ac 9 Jan 2007 00:43:43 -0000 1.228
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.227 2007/01/02 15:10:02 strk Exp $
+dnl $Id: configure.ac,v 1.228 2007/01/09 00:43:43 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -147,7 +147,7 @@
AC_ARG_ENABLE(
gui,
- AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FLTK,
RISCOS, FB (framebuffer), KDE or SDL [[GTK]] ]),
+ AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FLTK,
RISCOS, FB (framebuffer), KDE or SDL[[GTK]] ]),
[case "${enableval}" in
gtk|GTK) gui=gtk ;;
sdl|SDL) gui=sdl ;;
@@ -236,7 +236,7 @@
)
if test x"$sound_handler" != xsdl -a x"$mp3_decoder" != xnone; then
- mp3_decoder=none;
+mp3_decoder=none;
dnl AC_MSG_ERROR([--with-mp3-decoder is only valid with
--enable-sound=sdl])
fi
@@ -278,6 +278,28 @@
AC_EXEEXT
AC_PROG_INSTALL
AM_COMPILER_LIB
+
+dnl autoconf doesn't always get whether we're cross compiling or not,
+dnl so we try to figure this out on out own.
+if test ${host} != ${target} ; then
+ cross_compiling=yes
+fi
+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
+dnl these same settings rather than duplicating them like we used to.
+dnl To override thise, use the --with-*-incl= and --with-*-libs=
+dnl options to configure.
+if test x$cross_compiling = xyes; then
+ AC_MSG_NOTICE([Configuring Gnash for cross compilation])
+ export incllist="${prefix}/${target_alias}/include ${prefix}/include"
+ export libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib"
+else
+ AC_MSG_NOTICE([Configuring Gnash for native compilation])
+ export incllist=`cat ${srcdir}/macros/incllist`
+ export libslist=`cat ${srcdir}/macros/libslist`
+fi
+
GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)
AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
@@ -440,7 +462,8 @@
dnl AC_CHECK_LIB(c, mremap)
GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
-GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
+dnl GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
+GNASH_PATH_JPEG
dnl if we're not building the extensions, then the _FLAGS and _LIBS settings
dnl found in these tests are blank. This way they can be used in
@@ -464,13 +487,13 @@
dnl GNASH_PKG_FIND(ogg, [ogg.h], [jpeg images], jpeg_mem_init)
if test x$gui = xsdl -o x$sound_handler = xsdl; then
- GNASH_PKG_FIND(SDL, [SDL.h], [SDL], SDL_Init, [1.1])
+ GNASH_PATH_SDL
fi
AM_CONDITIONAL(HAS_SDL, [ test x$has_SDL = xyes ])
GNASH_PATH_BOOST
-AM_PATH_LIBXML2
+GNASH_PATH_LIBXML
dnl
dnl NOTE: make sure to check for GLIB and LIBXML2
@@ -524,7 +547,7 @@
dnl Need GLIB for both GTK and GST
if test x${gui} = "xgtk" -o x${sound_handler} = "xgst"; then
- GNASH_PKG_FIND(glib, [glib.h], [], g_io_channel_init, [2.0])
+ GNASH_PATH_GLIB
fi
AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
@@ -535,7 +558,7 @@
fi
GNASH_PATH_GTK2
GNASH_PATH_PANGO
- GNASH_PKG_FIND(atk, [atk.h], [atk library], atk_focus_tracker_init,
[1.0])
+ GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
if test x"$fltk" = x"yes"; then
GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
@@ -653,7 +676,7 @@
if test x$renderer = xagg; then
-GNASH_PATH_AGG
+ GNASH_PATH_AGG
fi
if test x$renderer = xcairo -o x$gui = xgtk; then
@@ -1057,8 +1080,8 @@
fi
echo " GTK2 libs are: $GTK2_LIBS"
else
- echo "ERROR: No GTK2 development package installed!\
-You need to have the GTK2 development package installed\
+ echo "ERROR: No GTK2 development package installed! \
+You need to have the GTK2 development package installed \
to compile this project or install libgtk2.0-dev \
(using apt-get) or gtk2-devel (using yum)."
dnl nogo=true
@@ -1087,8 +1110,8 @@
fi
echo " GLib libs are: $GLIB_LIBS"
else
- echo "ERROR: No GLib development package installed!\
-You need to have the GLib development package installed\
+ echo "ERROR: No GLib development package installed! \
+You need to have the GLib development package installed \
to compile this project or install libglib2.0-dev \
(using apt-get) or glib2-devel (using yum)."
dnl nogo=true
@@ -1102,8 +1125,8 @@
fi
echo " ATK libs are: $ATK_LIBS"
else
- echo "ERROR: No ATK development package installed!\
- You need to have the ATK development package installed\
+ echo "ERROR: No ATK development package installed! \
+ You need to have the ATK development package installed \
to compile this project or install libatk1.0-dev \
(using apt-get) or atk-devel (using yum)."
dnl nogo=true
@@ -1127,7 +1150,7 @@
if test "$sound_handler" = "sdl"; then
if test x"$mp3_decoder" = x"mad"; then
- echo " MP3 support enabled trough libmad"
+ echo " MP3 support enabled through libmad"
if test x"$MAD_LIBS" != x; then
if test x"$MAD_CFLAGS" != x; then
echo " MAD flags are: $MAD_CFLAGS"
@@ -1146,7 +1169,7 @@
else
if test x"$mp3_decoder" = x"ffmpeg"; then
if test x"$FFMPEG_LIBS" != x; then
- echo " MP3 support enabled trough ffmpeg"
+ echo " MP3 support enabled through ffmpeg"
if test x"$FFMPEG_CFLAGS" != x; then
echo " ffmpeg flags are: $FFMPEG_CFLAGS"
else
@@ -1352,3 +1375,8 @@
AC_MSG_ERROR([Currently only forking the standalone player works!])
fi
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Makefile.am 2 Jan 2007 15:10:02 -0000 1.56
+++ Makefile.am 9 Jan 2007 00:43:43 -0000 1.57
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.56 2007/01/02 15:10:02 strk Exp $
+# $Id: Makefile.am,v 1.57 2007/01/09 00:43:43 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -144,8 +144,8 @@
@echo "PNG_LIBS is $(PNG_LIBS)"
@echo "OGG_CFLAGS is $(OGG_CFLAGS)"
@echo "OGG_LIBS is $(OGG_LIBS)"
- @echo "ZLIB_CFLAGS is $(ZLIB_CFLAGS)"
- @echo "ZLIB_LIBS is $(ZLIB_LIBS)"
+ @echo "Z_CFLAGS is $(Z_CFLAGS)"
+ @echo "Z_LIBS is $(Z_LIBS)"
@echo "LIBXML_CFLAGS is $(LIBXML_CFLAGS)"
@echo "LIBXML_LIBS is $(LIBXML_LIBS)"
@echo "SDL_CFLAGS is $(SDL_CFLAGS)"
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/agg.m4 16 Nov 2006 08:54:52 -0000 1.21
+++ macros/agg.m4 9 Jan 2007 00:43:43 -0000 1.22
@@ -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: agg.m4,v 1.21 2006/11/16 08:54:52 strk Exp $
+dnl $Id: agg.m4,v 1.22 2007/01/09 00:43:43 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
@@ -25,61 +22,47 @@
[
dnl Lool for the header
AC_ARG_WITH(agg_incl, AC_HELP_STRING([--with-agg-incl], [directory where AGG
headers are]), with_agg_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_agg_incl,[
+ AC_CACHE_VAL(ac_cv_path_agg_incl, [
if test x"${with_agg_incl}" != x ; then
if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
ac_cv_path_agg_incl="-I`(cd ${with_agg_incl}; pwd)`"
agg_include_dir="`(cd ${with_agg_incl}; pwd)`"
- agg24=yes
+ agg25=yes
else
AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
- agg24=no
+ agg25=no
fi
fi
])
+ if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_incl}" = x; then
$PKG_CONFIG --exists libagg && ac_cv_path_agg_incl=`$PKG_CONFIG --cflags
libagg`
- $PKG_CONFIG --exists libagg && $PKG_CONFIG --atleast-version 2.4.0 libagg
&& agg24=yes
+ $PKG_CONFIG --exists libagg && $PKG_CONFIG --atleast-version 2.5.0
libagg && agg25=yes
dnl I think this setting of agg_include_dir is too error prone!
$PKG_CONFIG --exists libagg && agg_include_dir=`$PKG_CONFIG
--cflags-only-I libagg | cut -d " " -f 1 | sed -e 's/-I//g'`
fi
+ fi
+ if test x"${ac_cv_path_agg_incl}" = x; then
AC_MSG_CHECKING([for AGG headers])
- if test x"${ac_cv_path_agg_incl}" = x ; then
- 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
+ if test -f $i/agg2/agg_gradient_lut.h; then
ac_cv_path_agg_incl="-I$i/agg2"
agg_include_dir=$i/agg2
- agg24=yes
+ agg25=yes
break
fi
done
- if test x"${ac_cv_path_agg_incl}" = x ; then
- for i in $incllist; do
- if test -f $i/agg2/agg_math.h; then
- AC_MSG_WARN([You appear to have AGG 2.3 installed, version 2.4 or
greater is required])
- agg24=no
- break
- fi
- done
- fi
fi
-AC_MSG_RESULT(${ac_cv_path_agg_incl})
-
-dnl Check for agg_gradient_lut.h.
-if test -f "$agg_include_dir/agg_gradient_lut.h"; then
- break
-else
- AC_MSG_ERROR([agg_gradient_lut.h not found, please install or upgrade
to AGG 2.5!])
-fi
+ AC_MSG_RESULT(${ac_cv_path_agg_incl})
-if test x"${ac_cv_path_agg_incl}" != x ; then
+ if test x"${ac_cv_path_agg_incl}" != x ; then
AGG_CFLAGS="${ac_cv_path_agg_incl}"
-fi
-AC_SUBST(AGG_CFLAGS)
+ fi
+
+ AC_SUBST(AGG_CFLAGS)
dnl Look for the library
@@ -95,15 +78,15 @@
])
pkg=no
+ if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_lib}" = x; then
$PKG_CONFIG --exists libagg && ac_cv_path_agg_lib=`$PKG_CONFIG --libs
libagg`
$PKG_CONFIG --exists libagg && pkg=yes
fi
+ fi
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}/${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
@@ -114,18 +97,20 @@
break
fi
fi
- done])
+ done
fi
+ 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=""])
+ fi
AC_MSG_CHECKING([for libagg library])
AC_MSG_RESULT(${ac_cv_path_agg_lib})
AC_LANG_POP(C++)
-
if test x"${ac_cv_path_agg_lib}" != x -a x"$pkg" = x"yes"; then
AGG_LIBS="${ac_cv_path_agg_lib}"
else
- if test x"$agg24" = x"yes"; then
+ if test x"$agg25" = x"yes"; then
AGG_LIBS="${ac_cv_path_agg_lib} -lagg"
else
AGG_LIBS=""
@@ -146,5 +131,10 @@
dnl fi
AC_SUBST(AGG_LIBS)
-
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/archflag.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/archflag.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/archflag.m4 29 Oct 2006 18:34:10 -0000 1.2
+++ macros/archflag.m4 9 Jan 2007 00:43:43 -0000 1.3
@@ -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
-
dnl Copyright © 2006 Steven G. Johnson <address@hidden> and Matteo Frigo.
AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
@@ -216,3 +213,9 @@
m4_default([$2], [CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
fi
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/boost.m4 30 Dec 2006 09:08:32 -0000 1.27
+++ macros/boost.m4 9 Jan 2007 00:43:43 -0000 1.28
@@ -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: boost.m4,v 1.27 2006/12/30 09:08:32 bjacques Exp $
+dnl $Id: boost.m4,v 1.28 2007/01/09 00:43:43 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -34,24 +31,23 @@
else
AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
fi
- fi
- ])
+ 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.
-AC_MSG_CHECKING([for the Boost Version])
-
-if test x"$PKG_CONFIG" != x; then
+ AC_MSG_CHECKING([for the Boost Version])
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x; then
$PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $'0'".0"}'`
-fi
+ fi
+ fi
-if test x"${gnash_boost_version}" = x; then
- 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 .. ../.."
+ if test x"${gnash_boost_version}" = x; then
gnash_boost_topdir=""
gnash_boost_version=""
- for i in $pathlist; do
+ for i in $incllist; do
for j in `ls -dr $i/boost* 2>/dev/null`; do
if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
gnash_boost_topdir=`basename $j`
@@ -63,7 +59,7 @@
break;
fi
done
-fi
+ fi
if test x"${gnash_boost_version}" = x; then
AC_MSG_RESULT([no version needed])
@@ -73,9 +69,7 @@
AC_LANG_PUSH(C++)
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="${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"
@@ -88,7 +82,10 @@
fi
done
done
- fi])
+ fi
+ fi
+ 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"])
fi
AC_LANG_POP(C++)
AC_MSG_CHECKING([for boost header])
@@ -111,9 +108,7 @@
save_LIBS="$LIBS"
AC_LANG_PUSH(C++)
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}/${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
@@ -133,7 +128,6 @@
fi
done
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
@@ -145,6 +139,9 @@
fi
done
fi
+ if test x"${ac_cv_path_boost_lib}" = x; then
+ AC_SEARCH_LIBS(cleanup_slots, ${boostnames},
[ac_cv_path_boost_lib="${LIBS}"])
+ fi
AC_LANG_POP(C++)
dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.
@@ -155,3 +152,9 @@
AM_CONDITIONAL(HAVE_BOOST, [test x${ac_cv_path_boost_incl} != x])
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/curl.m4 6 Nov 2006 19:35:05 -0000 1.11
+++ macros/curl.m4 9 Jan 2007 00:43:43 -0000 1.12
@@ -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: curl.m4,v 1.11 2006/11/06 19:35:05 rsavoye Exp $
+dnl $Id: curl.m4,v 1.12 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -34,7 +31,7 @@
])
curlconfig=""
- if test x$cross_compling = xno; then
+ if test x$cross_compiling = xno; then
AC_CHECK_PROG(curlconfig, [echo], [curl-config])
if test x"${curlconfig}" != "x" ; then
AC_MSG_CHECKING([for RTMP support])
@@ -53,10 +50,9 @@
if test x"${ac_cv_path_curl_incl}" = x; then
AC_MSG_CHECKING([for libcurl header])
- if test x"${curlconfig}" != "x" -a x$cross_compling = xno; then
+ if test x"${curlconfig}" != "x" -a x$cross_compiling = xno; then
ac_cv_path_curl_incl=`${curlconfig} --cflags`
else
- 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"
@@ -94,12 +90,10 @@
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" -a x$cross_compling = xno; then # {
+ if test x"${curlconfig}" != "x" -a x$cross_compiling = xno; then # {
ac_cv_path_curl_lib=`${curlconfig} --libs`
else # }{
AC_MSG_CHECKING([for libcurl library])
-
- 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 # {
@@ -168,3 +162,9 @@
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/docbook.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/docbook.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/docbook.m4 29 Oct 2006 18:34:10 -0000 1.20
+++ macros/docbook.m4 9 Jan 2007 00:43:43 -0000 1.21
@@ -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_DOCBOOK], [
AC_ARG_ENABLE(docbook, AC_HELP_STRING([--disable-docbook], [Disable support
for building documentation]),
@@ -149,3 +146,8 @@
AC_SUBST(FOP)
])
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/ffmpeg.m4 8 Jan 2007 15:30:57 -0000 1.26
+++ macros/ffmpeg.m4 9 Jan 2007 00:43:43 -0000 1.27
@@ -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 $Id: ffmpeg.m4,v 1.26 2007/01/08 15:30:57 bjacques Exp $
-
-dnl struct AVFormatParameters' has no member named 'prealloced_context'
+dnl $Id: ffmpeg.m4,v 1.27 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -33,14 +30,15 @@
fi
])
+ AC_MSG_CHECKING([for ffmpeg header])
+ if test x${cross_compiling} = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
$PKG_CONFIG --exists libavcodec && ac_cv_path_ffmpeg_incl=`$PKG_CONFIG
--cflags libavcodec`
fi
+ fi
+ dnl incllist is inherited from configure.ac.
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 /opt/local/include /usr/include .. ../.."
-
for i in $incllist; do
if test -f $i/ffmpeg/avcodec.h; then
ac_cv_path_ffmpeg_incl="-I$i/ffmpeg"
@@ -49,17 +47,24 @@
done
fi
+ if test x"${ac_cv_path_ffmpeg_incl}" = x; then
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h, [ac_cv_path_ffmpeg_incl=""])
+ fi
+ else
+ AC_MSG_RESULT(${ac_cv_path_ffmpeg_incl})
+ fi
+
if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
- AC_MSG_RESULT(yes)
else
FFMPEG_CFLAGS=""
- AC_MSG_RESULT(no)
fi
dnl Look for the library
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,[
+ 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
ac_cv_path_ffmpeg_lib="-L`(cd ${with_ffmpeg_lib}; pwd)`"
@@ -70,19 +75,19 @@
])
dnl Try with pkg-config
+ if test x${cross_compiling} = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
$PKG_CONFIG --exists libavcodec && ac_cv_path_ffmpeg_lib=`$PKG_CONFIG
--libs libavcodec`
fi
+ fi
- if test x"${ac_cv_path_ffmpeg_lib}" = x; then #{
-
+ if test x"${ac_cv_path_ffmpeg_lib}" = x; then
+ AC_MSG_CHECKING([for libavcodec library])
topdir=""
-
- AC_CHECK_LIB(avcodec, ff_eval, [ac_cv_path_ffmpeg_lib="-lavcodec"], [
- 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
topdir=$i
+ AC_MSG_RESULT(${topdir}/libavcodec)
if test x"$i" != x"/usr/lib"; then
ac_cv_path_ffmpeg_lib="-L$i -lavcodec"
break
@@ -92,152 +97,152 @@
fi
fi
done
- ])
- AC_MSG_CHECKING([for libavcodec library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
- fi #}
+
+ if test x"${ac_cv_path_ffmpeg_lib}" = x; then
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(avcodec, ff_eval, [ac_cv_path_ffmpeg_lib="-lavcodec"])
+ fi
+ fi
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" != x; then
$PKG_CONFIG --exists libavcodec && topdir=`$PKG_CONFIG --libs-only-L
libavcodec | sed -e 's/-L//' | cut -d ' ' -f 1`
fi
+ fi
+ dnl Look for the DTS library, which is required on some systems.
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
- if test x"$PKG_CONFIG" != x; then
+ AC_MSG_CHECKING([for libdts library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
$PKG_CONFIG --exists libdts && libdts=`$PKG_CONFIG --libs libdts`
else
libdts=""
fi
-
if test x"${libdts}" = x; then
- AC_CHECK_LIB(dts, dts_init,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"],
- [
- if test -f $topdir/libdts.a -o -f $topdir/libdts.so; then
+ if test -f ${topdir}/libdts.a -o -f ${topdir}/libdts.so; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
+ AC_MSG_RESULT(${topdir}/libdts)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(dts, dts_init,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"])
+ fi
fi
- ])
else
+ AC_MSG_RESULT(${libdts})
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"
fi
- AC_MSG_CHECKING([for libdts library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
- if test x"$PKG_CONFIG" != x; then
+ 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
- AC_CHECK_LIB(avutil, av_log,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"],
- [
- if test -f $topdir/libavutil.a -o -f $topdir/libavutil.so; 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
- AC_MSG_CHECKING([for libavutil library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
- if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists vorbisenc && vorbisenc=`$PKG_CONFIG --libs
vorbisenc`
+ 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
+ $PKG_CONFIG --exists vorbisenc && libvorbisenc=`$PKG_CONFIG --libs
vorbisenc`
else
- vorbisenc=""
+ libvorbisenc=""
fi
-
if test x"${libvorbisenc}" = x; then
- AC_CHECK_LIB(vorbisenc, vorbis_encode_init,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"],
- [
- if test -f $topdir/libvorbis.so; then
+ if test -f ${topdir}/libvorbisenc.a -o -f ${topdir}/libvorbisenc.so; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"
- fi
- ])
+ AC_MSG_RESULT(${topdir}/libvorbisenc)
else
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${vorbisenc}"
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(vorbisenc, vorbis_encode_init,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"])
fi
- AC_MSG_CHECKING([for libvorbisenc library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
-
- AC_CHECK_LIB(gsm, gsm_encode,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"],
- [
- AC_MSG_CHECKING([for libgsm library])
- if test -f $topdir/libgsm.so; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
fi
- ])
+ else
+ AC_MSG_RESULT(${libvorbisenc})
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libvorbisenc}"
+ fi
- if test x"$PKG_CONFIG" != x; then
+ dnl Look for the AVFORMAT library, which is required on some systems.
+ AC_MSG_CHECKING([for libavformat library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
$PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG --libs
libavformat`
else
libavformat=""
fi
-
if test x"${libavformat}" = x; then
- AC_CHECK_LIB(avformat, av_open_input_file,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"],
- [
- if test -f $topdir/libavformat.so; then
+ if test -f ${topdir}/libavformat.a -o -f ${topdir}/libavformat.so; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"
+ AC_MSG_RESULT(${topdir}/libavformat)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(libavformat, av_open_input_file,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"])
+ fi
fi
- ])
else
+ AC_MSG_RESULT(${libavformat})
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavformat}"
fi
- AC_MSG_CHECKING([for libavformat library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
-
- if test x"$PKG_CONFIG" != x; then
+ 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
$PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs theora`
else
libtheora=""
fi
-
if test x"${libtheora}" = x; then
- AC_CHECK_LIB(theora, theora_encode_init,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"],
- [
- if test -f $topdir/libtheora.so; then
+ if test -f ${topdir}/libtheora.a -o -f ${topdir}/libtheora.so; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"
+ AC_MSG_RESULT(${topdir}/libtheora)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(theora, theora_encode_init,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"])
+ fi
fi
- ])
else
+ AC_MSG_RESULT(${libtheora})
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libtheora}"
fi
- AC_MSG_CHECKING([for libtheora library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
-
- AC_MSG_CHECKING([for dc1394 library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
- if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists libdc1394 && libtheora=`$PKG_CONFIG --libs
libdc1394`
+ dnl Look for the DC1394 library, which is required on some systems.
+ AC_MSG_CHECKING([for libdc1394 library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+ $PKG_CONFIG --exists libdc && libdc=`$PKG_CONFIG --libs libdc1394`
+ else
+ libtdc=""
+ fi
+ if test x"${libdc}" = x; then
+ if test -f ${topdir}/libdc1394.a -o -f ${topdir}/libdc1394.so; then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394"
+ AC_MSG_RESULT(${topdir}/libdc1394)
else
- libtdc1394=""
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(dc1394_control, dc1394_is_camera,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394_control"])
fi
-
- if test x"${libdc1394}" = x; then
- AC_CHECK_LIB(dc1394_control, dc1394_is_camera,
- [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394_control"],
- [
- if test -f $topdir/libdc1394_control.so; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394_control"
fi
- ])
else
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdc1394_control}"
- fi
- AC_MSG_CHECKING([for the dc1394_control library])
- AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
-
+ AC_MSG_RESULT(${libdc})
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdc}"
fi
+ fi dnl end of all optional library tests
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib}"
@@ -248,3 +253,9 @@
AC_SUBST(FFMPEG_CFLAGS)
AC_SUBST(FFMPEG_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/firefox.m4 29 Oct 2006 18:34:10 -0000 1.19
+++ macros/firefox.m4 9 Jan 2007 00:43:43 -0000 1.20
@@ -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
-
dnl Configure paths for Firefox. We used to run firefox-config, but that
dnl got too messy. Then with a little experimentation we determined
dnl most of the options weren't actually needed... so now the handful
@@ -155,3 +152,9 @@
AC_SUBST(FIREFOX_PLUGINS)
])
dnl end of GNASH_PATH_FIREFO
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/gnashpkgtool.m4 26 Nov 2006 11:46:30 -0000 1.32
+++ macros/gnashpkgtool.m4 9 Jan 2007 00:43:43 -0000 1.33
@@ -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.32 2006/11/26 11:46:30 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.33 2007/01/09 00:43:43 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().
@@ -24,29 +24,28 @@
dnl up with correct information about what's available and what not
dnl and every provided info is verified before acceptance.
-AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg
images])
+AC_DEFUN([GNASH_PKG_INCLUDES],
[
-pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
-pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
+ pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
+ pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
-AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]),
-[case "${enableval}" in
+ AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]), [
+ case "${enableval}" in
yes) $1=yes ;;
no) $1=no ;;
- *)
- AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
-esac], $1=yes)
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
+ esac], $1=yes)
-if test x$4 = x; then
+ if test x$4 = x; then
name=$1
-else
+ else
name=$1-$4
-fi
+ fi
-dnl Look for the header
-if test x"${$1}" = x"yes"; then
+ dnl Look for the header
+ if test x"${$1}" = x"yes"; then
AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl],
[directory where $2 is]), with_$1_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_$1_incl,[
+ AC_CACHE_VAL(ac_cv_path_$1_incl, [
if test x"${with_$1_incl}" != x ; then
if test -f ${with_$1_incl}/$2 ; then
ac_cv_path_$1_incl=-I`(cd ${with_$1_incl}; pwd)`
@@ -56,6 +55,7 @@
fi
])
+ if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
$PKG_CONFIG --exists libDOWN[] &&
ac_cv_path_$1_lib=`$PKG_CONFIG --cflags libDOWN[]`
$PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl=`$PKG_CONFIG
--cflags DOWN[]`
@@ -64,12 +64,15 @@
AC_MSG_CHECKING([for $2 header])
AC_MSG_RESULT(${ac_cv_path_$1_incl})
fi
+ fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_$1_incl}" = x; then
- AC_CHECK_HEADER($2,
[ac_cv_path_$1_incl=""],[AC_CHECK_HEADER($1/$2,
[ac_cv_path_$1_incl="-I/usr/include/$1"],[AC_CHECK_HEADER($name/$2,
[ac_cv_path_$1_incl="-I/usr/include/$name"],[
+ AC_CHECK_HEADER($2, [ac_cv_path_$1_incl=""], [
+ AC_CHECK_HEADER($1/$2, [ac_cv_path_$1_incl="-I/usr/include/$1"], [
+ AC_CHECK_HEADER($name/$2,
[ac_cv_path_$1_incl="-I/usr/include/$name"], [
+ AC_CHECK_HEADER($2, [ac_cv_path_$1_incl="-I/usr/include/$2"], [
if test x"${ac_cv_path_$1_incl}" = x; then
- incllist="${prefix}/${target_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/include /usr/pkg/include
.. ../.."
for i in $incllist; do
if test -f $i/$name; then
if test x"$i" != x"/usr/include"; then
@@ -83,6 +86,11 @@
if test -f $i/$name/$2; then
ac_cv_path_$1_incl="-I$i/$name"
break
+ else
+ if test -f $i/$2; then
+ ac_cv_path_$1_incl="-I$i"
+ break
+ fi
fi
fi
done
@@ -90,6 +98,7 @@
])
])
])
+ ])
fi
if test x"${ac_cv_path_$1_incl}" != x ; then
@@ -97,11 +106,11 @@
else
UP[]_CFLAGS=""
fi
-fi
+ fi
AC_SUBST(UP[]_CFLAGS)
-popdef([UP])
-popdef([DOWN])
+ popdef([UP])
+ popdef([DOWN])
])
AC_DEFUN([GNASH_PKG_LIBS], dnl GNASH_PKG_LIBS(cairo, cairo_status, [cairo
render library.])
@@ -156,7 +165,6 @@
ac_save_LIBS=$LIBS
LIBS=""
AC_SEARCH_LIBS($2, $1 $name, [ac_cv_path_$1_lib="$LIBS $5"],[
- 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
/pkg/lib /opt/local/lib /usr/pkg/lib /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 $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
@@ -202,3 +210,9 @@
GNASH_PKG_INCLUDES($1, $2, $3, $5)
GNASH_PKG_LIBS($1, $4, $3, $5, $6)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- macros/gtk2.m4 17 Dec 2006 22:48:49 -0000 1.37
+++ macros/gtk2.m4 9 Jan 2007 00:43:43 -0000 1.38
@@ -14,10 +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 $Id: gtk2.m4,v 1.37 2006/12/17 22:48:49 nihilus Exp $
+dnl $Id: gtk2.m4,v 1.38 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -34,30 +32,27 @@
])
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; then
$PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_incl=`$PKG_CONFIG
--cflags gtk+-2.0`
-fi
+ $PKG_CONFIG --exists gtk+-2.0 && gnash_gtk2_version=`$PKG_CONFIG
--modversion gtk+-2.0`
+ fi
+ 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.
-AC_MSG_CHECKING([for the Gtk Version])
-
-if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists gtk+-2.0 && gnash_gtk2_version=`$PKG_CONFIG
--modversion gtk+-2.0`
-fi
-
+ AC_MSG_CHECKING([for the gtk2 header])
if test x"${gnash_gtk2_version}" = x; then
- 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=""
- for i in $pathlist; do
+ for i in $incllist; do
for j in `ls -dr $i/gtk-[[2-9]].[[0-9]] 2>/dev/null`; do
if test -f $j/gtk/gtk.h; then
gnash_gtk2_topdir=`basename $j`
gnash_gtk2_version=`echo ${gnash_gtk2_topdir} | sed -e 's:gtk-::'`
+ ac_cv_path_gtk2_incl="-I$i/${gnash_gtk2_topdir}"
break
fi
done
@@ -66,31 +61,11 @@
fi
done
fi
- AC_MSG_RESULT(${gnash_gtk2_version})
-
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_gtk2_incl}" = x; then
- AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
if test x"${ac_cv_path_gtk2_incl}" = x; then
- 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 /usr/nekoware/include /usr/freeware/include /usr/ .. ../.."
-
- for i in $incllist; do
- if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then
- ac_cv_path_gtk2_incl="-I$i/${gnash_gtk2_topdir}"
- break
+ AC_CHECK_HEADERS(gtk/gtk.h)
else
- if test -f $i/gtk/gtk.h; then
- ac_cv_path_gtk2_incl="-I$i"
- break
- fi
- fi
- done
- fi
- ])
- fi
- AC_MSG_CHECKING([for libgtk2 header])
AC_MSG_RESULT($ac_cv_path_gtk2_incl)
+ fi
dnl Look for the library
AC_ARG_WITH(gtk2_lib,
@@ -111,15 +86,16 @@
fi
])
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
$PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG
--libs gtk+-2.0`
-fi
+ fi
+ fi
dnl If the header doesn't exist, there is no point looking for
dnl the library.
+ AC_MSG_CHECKING([for libgtk2 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}/${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
@@ -131,14 +107,14 @@
fi
fi
done
- ])
fi
- AC_MSG_CHECKING([for libgtk2 library])
+ if test 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"])
+ fi
AC_MSG_RESULT($ac_cv_path_gtk2_lib)
if test x"${ac_cv_path_gtk2_incl}" != x; then
- 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 /usr/nekoware/lib /usr/freeware/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"
@@ -166,3 +142,9 @@
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/gtkglext.m4 13 Nov 2006 19:55:48 -0000 1.32
+++ macros/gtkglext.m4 9 Jan 2007 00:43:43 -0000 1.33
@@ -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: gtkglext.m4,v 1.32 2006/11/13 19:55:48 nihilus Exp $
+dnl: $Id: gtkglext.m4,v 1.33 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -60,10 +57,9 @@
fi
if test x"${gnash_glext_version}" = x ; then
- 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=""
- for i in $pathlist; do
+ for i in $incllist; do
for j in `ls -dr $i/gtkglext-[[0-9]].[[0-9]] 2>/dev/null`; do
if test -f $j/gtk/gtkgl.h; then
gnash_glext_topdir=`basename $j`
@@ -81,7 +77,6 @@
dnl If the path hasnt been specified, go look for it.
if test x"${ac_cv_path_glext_incl}" = x; then
- 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
if test -f $i/gtk/gtkgl.h; then
@@ -119,7 +114,6 @@
ac_cv_path_glext_incl_config=""
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}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib32
${prefix}/lib /opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64
/usr/lib32 /usr/lib /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
ac_cv_path_glext_incl_config="-I$i/gtkglext-${gnash_glext_version}/include"
@@ -159,3 +153,8 @@
AC_SUBST(GLEXT_LIBS)
])
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/kde.m4 29 Nov 2006 21:11:06 -0000 1.23
+++ macros/kde.m4 9 Jan 2007 00:43:43 -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: kde.m4,v 1.23 2006/11/29 21:11:06 rsavoye Exp $
+dnl $Id: kde.m4,v 1.24 2007/01/09 00:43:43 rsavoye Exp $
dnl ------------------------------------------------------------------------
dnl Find a file (or one of more files in a list of dirs)
@@ -2781,3 +2781,9 @@
])
AC_SUBST(PERL)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/libXML.m4 4 Nov 2006 10:14:20 -0000 1.25
+++ macros/libXML.m4 9 Jan 2007 00:43:43 -0000 1.26
@@ -14,104 +14,108 @@
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 $Id: libXML.m4,v 1.25 2006/11/04 10:14:20 nihilus Exp $
+dnl $Id: libXML.m4,v 1.26 2007/01/09 00:43:43 rsavoye Exp $
-AC_DEFUN([AM_PATH_LIBXML2],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(libxml, AC_HELP_STRING([--with-libxml=PFX], [Prefix where libxml
is installed (optional)]), libxml_prefix="$withval", libxml_prefix="")
-AC_ARG_WITH(libxml-libraries, AC_HELP_STRING([--with-libxml-libraries=DIR],
[Directory where libxml library is installed (optional)]),
libxml_libraries="$withval", libxml_libraries="")
-AC_ARG_WITH(libxml-includes, AC_HELP_STRING([--with-libxml-includes=DIR],
[Directory where libxml header files are installed (optional)]),
libxml_includes="$withval", libxml_includes="")
-dnl AC_ARG_ENABLE(libxmltest, [ --disable-libxmltest Do not try to
compile and run a test libxml program],, enable_libxmltest=yes)
-
- if test "x$libxml_libraries" != "x" ; then
- if test x"$libxml_libraries" != x"/usr/lib"; then
- LIBXML_LIBS="-L$libxml_libraries -lxml2"
+AC_DEFUN([GNASH_PATH_LIBXML], [
+ has_xml=no
+ dnl Lool for the header
+ AC_ARG_WITH(libxml-incl, AC_HELP_STRING([--with-libxml-incl], [directory
where libxml2 header is]), with_libxml_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_libxml_incl, [
+ if test x"${with_libxml_incl}" != x ; then
+ if test -f ${with_libxml_incl}/xmlmemory.h ; then
+ ac_cv_path_libxml_incl=-I`(cd ${with_libxml_incl}; pwd)`
else
- LIBXML_LIBS="-lxml2"
- fi
- elif test "x$libxml_prefix" != "x" ; then
- if test x"$libxml_prefix" != x"/usr"; then
- LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
- else
- LIBXML_LIBS="-lxml2"
+ AC_MSG_ERROR([${with_libxml_incl} directory doesn't contain
xmlmemory.h])
fi
fi
+ ])
- if test "x$libxml_includes" != "x" ; then
- LIBXML_CFLAGS="-I$libxml_includes"
- elif test "x$libxml_prefix" != "x" ; then
- LIBXML_CFLAGS="-I$libxml_prefix/include"
- fi
-
- if test x"${xml}" = x"yes"; then
- dnl
- dnl Give xml2-config a chance
- dnl
- dnl NOTE: LIBXML_LIBS might end up containing
- dnl -L/usr/lib, which I really want to avoid!
- dnl
- #no_libxml=""
- if test x$cross_compiling = xno; then
- AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
+ if test x${cross_compiling} = xno; then
+ AC_PATH_PROG(XML2_CONFIG, xml2-config, ,
,[${prefix}:${prefix}/${target_alias}:$PATH])
if test "x$XML2_CONFIG" != "x" ; then
- if test "x$LIBXML_CFLAGS" = "x" ; then
- LIBXML_CFLAGS=`$XML2_CONFIG --cflags`
+ if test "x$XML2_CFLAGS" = "x" ; then
+ ac_cv_path_libxml_incl=`$XML2_CONFIG --cflags`
fi
-
- if test "x$LIBXML_LIBS" = "x" ; then
- LIBXML_LIBS=`$XML2_CONFIG --libs | sed -e 's:-L/usr/lib::'`
+ if test "x$XML2_LIBS" = "x" ; then
+ ac_cv_path_libxml_lib =`$XML2_CONFIG --libs | sed -e 's:-L/usr/lib::'`
fi
else
AC_MSG_RESULT(no)
fi
fi
- AC_MSG_CHECKING(for libxml2)
-
- dnl
- dnl Try finding out yourself
- dnl
- if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
- 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
- if test -f $j/libxml/parser.h; then
- LIBXML_CFLAGS="-I`(cd $j; pwd)`"
+ gnash_libxml2_topdir=""
+ gnash_libxml2_version=""
+ AC_MSG_CHECKING([for libxml2 header])
+ if test x"${ac_cv_path_libxml_incl}" = x; then
+ for i in ${incllist}; do
+ for j in `ls -dr $i/libxml2 2>/dev/null`; do
+ if test -f $j/libxml/xmlmemory.h; then
+ gnash_libxml_topdir=`basename $j`
+ gnash_libxml_version=`echo ${gnash_libxml2_topdir} | sed -e
's:libxml2::' -e 's:-::'`
+ ac_cv_path_libxml_incl="-I$j"
+ AC_MSG_RESULT(${ac_cv_path_libxml_incl})
break
fi
done
+ done
fi
- if test "x$LIBXML_LIBS" = "x"; then
- for j in `ls -dr $i/lib 2>/dev/null ` ; do
- if test -f $j/libxml2.so; then
- if test x"$j" != x"/usr/lib"; then
- LIBXML_LIBS="-L`(cd $j; pwd)` -lxml2"
+
+ if test x"${ac_cv_path_libxml_incl}" = x ; then
+ AC_MSG_RESULT(no)
+ AC_CHECK_HEADERS(libxml/xmlmemory.h, [ac_cv_path_libxml_incl=""])
+ fi
+
+ dnl Look for the library
+ 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
+ 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 x"$i" != x"/usr/lib"; then
+ ac_cv_path_libxml_lib="-L$i -lxml2"
break
else
- LIBXML_LIBS="-lxml2"
+ ac_cv_path_libxml_lib="-lxml2"
+ has_xml=yes
break
fi
fi
done
+ AC_MSG_RESULT(${ac_cv_path_libxml_lib})
fi
- done
+ if test x"${ac_cv_path_libxml_lib}" = x ; then
+ AC_CHECK_LIB(libxml2, libxml_Init, [ac_cv_path_libxml_lib="-lxml2"])
fi
+ AC_MSG_CHECKING([for libxml2 library])
+ AC_MSG_RESULT(${ac_cv_path_libxml_lib})
+ if test x"${ac_cv_path_libxml_incl}" != x ; then
+ LIBXML_CFLAGS="${ac_cv_path_libxml_incl}"
else
- LIBXML_CFLAGS=
- LIBXML_LIBS=
+ LIBXML_CFLAGS=""
fi
-
- if test "x$LIBXML_CFLAGS" != "x" -a "x$LIBXML_LIBS" != "x"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_LIBXML,1,[Define this if you have libxml2 support
available])
+ if test x"${ac_cv_path_libxml_lib}" != x ; then
+ LIBXML_LIBS="${ac_cv_path_libxml_lib}"
+ has_xml=yes
+ AC_DEFINE(HAVE_LIBXML_H, [1], [We have libxml2 support])
else
- AC_MSG_RESULT(no)
+ has_xml=no
+ LIBXML_LIBS=""
fi
-
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/libexe.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libexe.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/libexe.m4 29 Oct 2006 18:34:10 -0000 1.6
+++ macros/libexe.m4 9 Jan 2007 00:43:43 -0000 1.7
@@ -15,9 +15,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
-
dnl FIXME: This should really do tests for this data, and not
dnl just hardcode it based on the OS. This currently depends on
dnl AC_EXEEXT being called first.
@@ -50,3 +47,9 @@
AC_SUBST(LIBPRE)
AC_SUBST(LIBEXT)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/ming.m4 2 Jan 2007 15:10:02 -0000 1.9
+++ macros/ming.m4 9 Jan 2007 00:43:43 -0000 1.10
@@ -14,7 +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
# Author: Sandro Santilli <address@hidden>
@@ -35,18 +34,15 @@
# MAKESWF
#
-AC_DEFUN([AC_PATH_MING],
-[
+AC_DEFUN([AC_PATH_MING], [
MING_CFLAGS=""
MING_LIBS=""
- AC_ARG_WITH(ming,[ --with-ming=[<ming-config>] Path to the
ming-config command],
- [
+ if test x$cross_compiling = xno; then
+ AC_ARG_WITH(ming,[ --with-ming=[<ming-config>] Path to the ming-config
command], [
case "${withval}" in
- yes|no)
- ;;
- *) MING_CONFIG=${withval}
- ;;
+ yes|no) ;;
+ *) MING_CONFIG=${withval} ;;
esac
], MING_CONFIG="")
@@ -56,12 +52,9 @@
if test x"$MING_CONFIG" != "x"; then
MING_VERSION=`$MING_CONFIG --version`
- major=`echo $MING_VERSION | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- minor=`echo $MING_VERSION | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- micro=`echo $MING_VERSION | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ major=`echo $MING_VERSION | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ minor=`echo $MING_VERSION | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ micro=`echo $MING_VERSION | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
beta=`echo $MING_VERSION | sed -e 's/.*beta\([[0-9]]*\).*/\1/'`
MING_VERSION_CODE=`printf %2.2d%2.2d%2.2d%2.2d $major $minor
$micro $beta`
MING_CFLAGS=`$MING_CONFIG --cflags`
@@ -69,7 +62,85 @@
MING_PATH=`$MING_CONFIG --bindir`
AC_PATH_PROG([MAKESWF], [makeswf], , [$PATH:$MING_PATH])
fi
+ else
+ AC_ARG_WITH(ming_incl, AC_HELP_STRING([--with-ming-incl], [Directory where
Ming header is]), with_ming_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_ming_incl, [
+ if test x"${with_ming_incl}" != x ; then
+ if test -f ${with_ming_incl}/ming.h ; then
+ ac_cv_path_ming_incl=-I`(cd ${with_ming_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_ming_incl} directory doesn't contain minglib.h])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_ming_incl}" = x; then
+ for i in $incllist; do
+ if test -f $i/ming.h; then
+ if test x"$i" != x"/usr/include"; then
+ ac_cv_path_ming_incl="-I$i"
+ break
+ else
+ ac_cv_path_ming_incl=""
+ break
+ fi
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_ming_incl}" = x; then
+ AC_CHECK_HEADERS(ming.h, [ac_cv_path_ming_incl=""])
+ fi
+
+ AC_MSG_CHECKING([for Ming header])
+ AC_MSG_RESULT(${ac_cv_path_ming_incl})
+
+ dnl Look for the library
+ 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
+ ac_cv_path_ming_lib=`(cd ${with_ming_lib}; pwd)`
+ else
+ AC_MSG_ERROR([${with_ming_lib} directory doesn't contain libming.])
+ fi
+ fi
+ ])
+ 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 x"$i" != x"/usr/lib"; then
+ ac_cv_path_ming_lib="-L$i -lming"
+ break
+ else
+ ac_cv_path_ming_lib="-lming"
+ break
+ fi
+ fi
+ done
+ if test x"${ac_cv_path_ming_incl}" = x; then
+ AC_CHECK_LIB(ming, ming_init_io, [ac_cv_path_ming_lib=""])
+ fi
+ AC_MSG_CHECKING([for libming library])
+ AC_MSG_RESULT(${ac_cv_path_ming_lib})
+ fi
+
+ if test x"${ac_cv_path_ming_incl}" != x ; then
+ MING_CFLAGS="${ac_cv_path_ming_incl}"
+ AC_MSG_RESULT(${ac_cv_path_ming_incl})
+ else
+ MING_CFLAGS=""
+ fi
+
+ if test x"${ac_cv_path_ming_lib}" != x ; then
+ MING_LIBS="${ac_cv_path_ming_lib}"
+ AC_MSG_RESULT(${ac_cv_path_ming_lib})
+ else
+ MING_LIBS=""
+ fi
+ fi
AC_SUBST(MING_VERSION_CODE)
AC_SUBST(MING_VERSION)
@@ -77,3 +148,9 @@
AC_SUBST(MING_LIBS)
AC_SUBST(MAKESWF)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/mysql.m4 17 Dec 2006 20:24:57 -0000 1.1
+++ macros/mysql.m4 9 Jan 2007 00:43:43 -0000 1.2
@@ -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.1 2006/12/17 20:24:57 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.2 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MYSQL],
[
@@ -45,8 +45,6 @@
AC_MSG_CHECKING([for MySQL headers])
if test x"${ac_cv_path_mysql_incl}" = x ; then
AC_MSG_CHECKING([for mysql header])
- 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/mysql/mysql.h; then
ac_cv_path_mysql_incl="-I$i/mysql"
@@ -85,7 +83,6 @@
topdir=""
AC_CHECK_LIB(mysqlclient, mysql_init,
[ac_cv_path_mysql_lib="-lmysqlclient"], [
- 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/libmysqlclient.a -o -f $i/libmysqlclient.so; then
topdir=$i
@@ -116,3 +113,9 @@
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/opengl.m4 29 Oct 2006 18:34:10 -0000 1.27
+++ macros/opengl.m4 9 Jan 2007 00:43:43 -0000 1.28
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: opengl.m4,v 1.27 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.28 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
@@ -45,9 +45,9 @@
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])
- incllist="${prefix}/include /usr/include /usr/local/include
/opt/mesa/include /opt/include /usr/X11R6/include /usr/pkg/include .. ../.."
+ newincllist="${incllist} /usr/X11R6/include"
- for i in $incllist; do
+ for i in $newincllist; do
if test -f $i/GL/gl.h; then
if test x"$i" != x"/usr/include"; then
ac_cv_path_opengl_includes="-I$i"
@@ -95,8 +95,8 @@
if test x"${ac_cv_path_opengl_lib}" = x; then
AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
- libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib32
${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib /usr/local/lib /opt/lib
/usr/pkg/lib /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 $libslist; do
+ 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
if test x"$i" != x"/usr/lib"; then
ac_cv_path_opengl_lib="-L$i -lGL -lGLU"
@@ -136,3 +136,9 @@
AC_SUBST(OPENGL_CFLAGS)
AC_SUBST(OPENGL_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/pango.m4 9 Nov 2006 18:28:15 -0000 1.22
+++ macros/pango.m4 9 Jan 2007 00:43:43 -0000 1.23
@@ -14,46 +14,50 @@
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.22 2006/11/09 18:28:15 nihilus Exp $
+dnl $Id: pango.m4,v 1.23 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
-dnl Look for the header
-AC_ARG_WITH(pango_incl, AC_HELP_STRING([--with-pango-incl], [directory where
libpango header is]), with_pango_incl=${withval})
-AC_CACHE_VAL(ac_cv_path_pango_incl,[
-if test x"${with_pango_incl}" != x ; then
+ dnl Look for the header
+ AC_ARG_WITH(pango_incl, AC_HELP_STRING([--with-pango-incl], [directory where
libpango header is]), with_pango_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_pango_incl,[
+ if test x"${with_pango_incl}" != x ; then
if test -f ${with_pango_incl}/pango/pango.h ; then
ac_cv_path_pango_incl=-I`(cd ${with_pango_incl}; pwd)`
else
AC_MSG_ERROR([${with_pango_incl} directory doesn't contain
pango/pango.h])
fi
-fi
-])
+ fi
+ ])
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_incl}" = x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_incl}" = x; then
$PKG_CONFIG --exists pangox && ac_cv_path_pango_incl=`$PKG_CONFIG
--cflags pangox`
-fi
+ fi
+ 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.
-AC_MSG_CHECKING([for the Pango Version])
+ AC_MSG_CHECKING([for the Pango Version])
-if test x"$PKG_CONFIG" != x; then
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x; then
$PKG_CONFIG --exists pangox && gnash_pango_version=`$PKG_CONFIG
--modversion pangox | cut -d "." -f 1 | awk '{print $'0'".0"}'`
-fi
+ fi
+ fi
-if test x"${gnash_pango_version}" = x; then
- 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 .. ../.."
+ if test x"${gnash_pango_version}" = x; then
gnash_pango_topdir=""
gnash_pango_version=""
- for i in $pathlist; do
+ for i in $incllist; do
for j in `ls -dr $i/pango-[[0-9]].[[0-9]] 2>/dev/null`; do
if test -f $j/pango/pango.h; then
gnash_pango_topdir=`basename $j`
gnash_pango_version=`echo ${gnash_pango_topdir}
| sed -e 's:pango-::'`
+ ac_cv_path_pango_incl="-I$i/${gnash_pango_topdir}"
break
fi
done
@@ -61,36 +65,16 @@
break;
fi
done
-fi
+ fi
-if test x"${gnash_pango_version}" = x; then
+ if test x"${gnash_pango_version}" = x; then
AC_MSG_RESULT(none)
-else
- AC_MSG_RESULT([${gnash_pango_version}])
-fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_pango_incl}" = x; then
- AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
- if test x"${ac_cv_path_pango_incl}" = x; then
- 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$i"
- break
else
- if test -f
$i/${gnash_pango_topdir}/pango/pango.h; then
-
ac_cv_path_pango_incl="-I$i/${gnash_pango_topdir}"
- break
- fi
- fi
- done
- fi
- ])
+ AC_MSG_RESULT([${gnash_pango_version}])
fi
-AC_MSG_CHECKING([for libpango header])
-AC_MSG_RESULT(${ac_cv_path_pango_incl})
+ AC_MSG_CHECKING([for libpango header])
+ AC_MSG_RESULT(${ac_cv_path_pango_incl})
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})
@@ -104,13 +88,13 @@
fi
])
+ if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
$PKG_CONFIG --exists pangox &&
ac_cv_path_pango_lib=`$PKG_CONFIG --libs pangox`
fi
+ fi
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}"],[
- 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
@@ -122,24 +106,33 @@
fi
fi
done
- ])
fi
-AC_MSG_CHECKING([for libpango library])
-AC_MSG_RESULT(${ac_cv_path_pango_lib})
+ AC_MSG_CHECKING([for libpango library])
+ AC_MSG_RESULT(${ac_cv_path_pango_lib})
-if test x"${ac_cv_path_pango_incl}" != x; then
+ 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}"])
+ fi
+
+ if test x"${ac_cv_path_pango_incl}" != x; then
PANGO_CFLAGS="${ac_cv_path_pango_incl}"
-else
+ else
PANGO_CFLAGS=""
-fi
+ fi
-if test x"${ac_cv_path_pango_lib}" != x; then
+ if test x"${ac_cv_path_pango_lib}" != x; then
PANGO_LIBS="${ac_cv_path_pango_lib}"
-else
+ else
PANGO_LIBS=""
-fi
+ fi
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
+ AC_SUBST(PANGO_CFLAGS)
+ AC_SUBST(PANGO_LIBS)
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/pkg.m4 19 Nov 2006 17:39:01 -0000 1.5
+++ macros/pkg.m4 9 Jan 2007 00:43:43 -0000 1.6
@@ -21,7 +21,7 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# $Id: pkg.m4,v 1.5 2006/11/19 17:39:01 nihilus Exp $
+# $Id: pkg.m4,v 1.6 2007/01/09 00:43:43 rsavoye Exp $
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
@@ -135,3 +135,9 @@
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/pthreads.m4 5 Nov 2006 11:59:22 -0000 1.20
+++ macros/pthreads.m4 9 Jan 2007 00:43:43 -0000 1.21
@@ -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.20 2006/11/05 11:59:22 nihilus Exp $
+dnl $Id: pthreads.m4,v 1.21 2007/01/09 00:43:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
@@ -239,3 +239,9 @@
fi
AC_LANG_RESTORE
])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/glib.m4
===================================================================
RCS file: macros/glib.m4
diff -N macros/glib.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/glib.m4 9 Jan 2007 00:43:43 -0000 1.24
@@ -0,0 +1,123 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+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.24 2007/01/09 00:43:43 rsavoye Exp $
+
+AC_DEFUN([GNASH_PATH_GLIB],
+[
+ dnl Look for the header
+ AC_ARG_WITH(glib_incl, AC_HELP_STRING([--with-glib-incl], [directory where
libglib header is]), with_glib_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_glib_incl,[
+ if test x"${with_glib_incl}" != x ; then
+ if test -f ${with_glib_incl}/glib.h ; then
+ ac_cv_path_glib_incl="-I`(cd ${with_glib_incl}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib.h])
+ fi
+ fi
+ ])
+
+ dnl Try with pkg-config
+ if test x${cross_compiling} = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_incl}" = x; then
+ $PKG_CONFIG --exists glib-2.0 && gnash_glib_version=`$PKG_CONFIG
--modversion glib-2.0`
+ $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_incl=`$PKG_CONFIG
--cflags glib-2.0`
+ fi
+ 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.
+ AC_MSG_CHECKING([for libglib header])
+ if test x"${gnash_glib_version}" = x; then
+ gnash_glib_topdir=""
+ gnash_glib_version=""
+ for i in $incllist; do
+ for j in `ls -dr $i/glib-[[0-9]].[[0-9]] 2>/dev/null`; do
+ if test -f $j/glib.h; then
+ gnash_glib_topdir=`basename $j`
+ gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'`
+ ac_cv_path_glib_incl="-I$j"
+ AC_MSG_RESULT(${ac_cv_path_glib_incl})
+ break
+ fi
+ done
+ if test x$gnash_glib_version != x; then
+ AC_MSG_RESULT(no)
+ break;
+ fi
+ done
+ fi
+
+ dnl Look for the library
+ 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
+ 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.])
+ fi
+ fi
+ ])
+
+ if test x${cross_compiling} = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_lib}" = x; then
+ $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_lib=`$PKG_CONFIG --libs
glib-2.0`
+ fi
+ fi
+
+ 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 x"$i" != x"/usr/lib"; then
+ ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}"
+ break
+ else
+ ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"
+ break
+ fi
+ fi
+ done
+ if test -f $i/glib-${gnash_glib_version}/include/glibconfig.h; then
+ ac_cv_path_glib_incl="${ac_cv_path_glib_incl}
-I$i/glib-${gnash_glib_version}/include"
+ fi
+ fi
+ AC_MSG_RESULT(${ac_cv_path_glib_lib})
+
+ if test x"${ac_cv_path_glib_incl}" != x; then
+ GLIB_CFLAGS="${ac_cv_path_glib_incl} $GLIB_CFLAGS"
+ 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
+ GLIB_LIBS=""
+ fi
+
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/incllist
===================================================================
RCS file: macros/incllist
diff -N macros/incllist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/incllist 9 Jan 2007 00:43:43 -0000 1.1
@@ -0,0 +1 @@
+${prefix}/${target_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/include /usr/pkg/include .. ../..
Index: macros/jpeg.m4
===================================================================
RCS file: macros/jpeg.m4
diff -N macros/jpeg.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/jpeg.m4 9 Jan 2007 00:43:43 -0000 1.22
@@ -0,0 +1,128 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+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: jpeg.m4,v 1.22 2007/01/09 00:43:43 rsavoye Exp $
+
+AC_DEFUN([GNASH_PATH_JPEG],
+[
+ AC_ARG_ENABLE(jpeg, AC_HELP_STRING([--enable-jpeg], [Enable support for jpeg
images]),
+ [case "${enableval}" in
+ yes) jpeg=yes ;;
+ no) jpeg=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-jpeg option]) ;;
+ esac], jpeg=yes)
+
+ if test x"$jpeg" = x"yes"; then
+ dnl Look for the header
+ AC_ARG_WITH(jpeg_incl, AC_HELP_STRING([--with-jpeg-incl], [Directory where
libjpeg header is]), with_jpeg_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_jpeg_incl,[
+ if test x"${with_jpeg_incl}" != x ; then
+ if test -f ${with_jpeg_incl}/jpeglib.h ; then
+ ac_cv_path_jpeg_incl=-I`(cd ${with_jpeg_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_jpeg_incl} directory doesn't contain jpeglib.h])
+ fi
+ fi
+ ])
+
+ dnl If the path hasn't been specified, go look for it.
+ if test x"${ac_cv_path_jpeg_incl}" = x; then
+ AC_MSG_CHECKING([for libjpeg header])
+ for i in $incllist; do
+ if test -f $i/jpeglib.h; then
+ if test x"$i" != x"/usr/include"; then
+ ac_cv_path_jpeg_incl="-I$i"
+ break
+ else
+ ac_cv_path_jpeg_incl=""
+ break
+ fi
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_jpeg_incl}" = x; then
+ AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""])
+ fi
+
+ AC_MSG_RESULT(${ac_cv_path_jpeg_incl})
+
+ if test x"${ac_cv_path_jpeg_incl}" != x ; then
+ JPEG_CFLAGS="${ac_cv_path_jpeg_incl}"
+ AC_MSG_RESULT(${ac_cv_path_jpeg_incl})
+ else
+ JPEG_CFLAGS=""
+ fi
+
+ dnl Look for the library
+ 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
+ ac_cv_path_jpeg_lib=`(cd ${with_jpeg_lib}; pwd)`
+ else
+ AC_MSG_ERROR([${with_jpeg_lib} directory doesn't contain libjpeg.])
+ fi
+ fi
+ ])
+
+ 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_MSG_CHECKING([for libjpeg library])
+ 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
+ ac_cv_path_jpeg_lib="-L$i"
+ break
+ else
+ ac_cv_path_jpeg_lib=""
+ break
+ fi
+ AC_MSG_RESULT(yes)
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_jpeg_lib}" = x; then
+ AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib=""])
+ AC_MSG_RESULT(${ac_cv_path_jpeg_lib})
+ fi
+
+ if test x"${ac_cv_path_jpeg_lib}" != x ; then
+ JPEG_LIBS="${ac_cv_path_jpeg_lib}"
+ else
+ JPEG_LIBS=""
+ fi
+ fi
+
+ if test x"${ac_cv_path_jpeg_lib}" != x ; then
+ JPEG_LIBS="${ac_cv_path_jpeg_lib} -ljpeg"
+ else
+ JPEG_LIBS="-ljpeg"
+ fi
+
+ AM_CONDITIONAL(HAVE_JPEG, [test x$jpeg = xyes])
+
+ AC_SUBST(JPEG_CFLAGS)
+ AC_SUBST(JPEG_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/libslist
===================================================================
RCS file: macros/libslist
diff -N macros/libslist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/libslist 9 Jan 2007 00:43:43 -0000 1.1
@@ -0,0 +1 @@
+${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 /pkg/lib /opt/local/lib /usr/pkg/lib
/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 .. ../..
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash utilities/Makefile.am cygnal/Makefile.am ...,
Rob Savoye <=