[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash autogen.sh ChangeLog macros/agg.m4 macros...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash autogen.sh ChangeLog macros/agg.m4 macros... |
|
Date: |
Sat, 04 Nov 2006 00:00:30 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/11/04 00:00:30
Modified files:
. : autogen.sh ChangeLog
macros : agg.m4 atk.m4 boost.m4 curl.m4 glib.m4 gtk2.m4
gtkglext.m4 jpeg.m4 kde.m4 libXML.m4 pango.m4
pkg.m4 png.m4 sdl.m4
Log message:
* autogen.sh: Don't pass -I macro if the directory doesn't
exist. This is useful for nested configure scripts.
* macros/agg.m4, atk.m4, boost.m4, curl.m4, glib.m4, gtk2.m4,
gtkglext.m4, jpeg.m4, kde.m4, libXML.m4, pango.m4, png.m4,
sdl.m4:
Look in the $prefix path for includes and libraries. This lets
specifying --prefix become the default path to search in for
cross
compiling.
* macros/pkg.m4: When cross compiling, don't use pkg-config, as
it
only gets host values.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/autogen.sh?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1501&r2=1.1502
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: autogen.sh
===================================================================
RCS file: /sources/gnash/gnash/autogen.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- autogen.sh 29 Oct 2006 18:34:10 -0000 1.15
+++ autogen.sh 4 Nov 2006 00:00:30 -0000 1.16
@@ -24,7 +24,7 @@
DIE=0
#Always use our macros
-ACLOCAL_FLAGS="-I macros $ACLOCAL_FLAGS"
+#ACLOCAL_FLAGS="-I macros $ACLOCAL_FLAGS"
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -115,7 +115,11 @@
echo processing $dr
( cd $dr
+ if test -d macros; then
+ aclocalinclude="-I macros $ACLOCAL_FLAGS"
+ else
aclocalinclude="$ACLOCAL_FLAGS"
+ fi
if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -b -r1.1501 -r1.1502
--- ChangeLog 3 Nov 2006 22:57:43 -0000 1.1501
+++ ChangeLog 4 Nov 2006 00:00:30 -0000 1.1502
@@ -1,3 +1,15 @@
+2006-11-03 Rob Savoye <address@hidden>
+
+ * autogen.sh: Don't pass -I macro if the directory doesn't
+ exist. This is useful for nested configure scripts.
+ * macros/agg.m4, atk.m4, boost.m4, curl.m4, glib.m4, gtk2.m4,
+ gtkglext.m4, jpeg.m4, kde.m4, libXML.m4, pango.m4, png.m4, sdl.m4:
+ Look in the $prefix path for includes and libraries. This lets
+ specifying --prefix become the default path to search in for cross
+ compiling.
+ * macros/pkg.m4: When cross compiling, don't use pkg-config, as it
+ only gets host values.
+
2006-11-03 Sandro Santilli <address@hidden>
* server/as_function.cpp (ctor): always increment refcount on
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/agg.m4 29 Oct 2006 18:34:10 -0000 1.17
+++ macros/agg.m4 4 Nov 2006 00:00:30 -0000 1.18
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: agg.m4,v 1.17 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: agg.m4,v 1.18 2006/11/04 00:00:30 rsavoye Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
@@ -47,7 +47,7 @@
AC_MSG_CHECKING([for AGG headers])
if test x"${ac_cv_path_agg_incl}" = x ; then
- incllist="${includedir} /sw/include /usr/pkg/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
${includedir} /sw/include /usr/pkg/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
for i in $incllist; do
if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
ac_cv_path_agg_incl="-I$i/agg2"
@@ -96,7 +96,7 @@
AC_LANG_PUSH(C++)
if test x"${ac_cv_path_agg_lib}" = x; then
AC_CHECK_LIB(agg, agg::gamma_ctrl_impl::calc_points,
[ac_cv_path_agg_lib=""],[
- libslist="${prefix}/lib32 ${prefix}/lib64 ${prefix}/lib /usr/lib32
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/local/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib ${prefix}/lib32
${prefix}/lib64 ${prefix}/lib /usr/lib32 /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/local/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libagg.a -o -f $i/libagg.so; then
if test x"$i" != x"/usr/lib"; then
@@ -125,18 +125,18 @@
fi
fi
- AC_EGREP_HEADER(render_scanlines_compound_layered,
- ${agg_include_dir}/agg_renderer_scanline.h,
- [ agg_need_compatibility_layer="no" ],
- [ agg_need_compatibility_layer="yes" ] )
-
- AC_SUBST(agg_need_compatibility_layer)
-
- if test x"${agg_need_compatibility_layer}" = xyes; then
- AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers
include the render_scanlines_compound_layered templated function])
- else
- AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [1], [AGG headers
include the render_scanlines_compound_layered templated function])
- fi
+dnl AC_EGREP_HEADER(render_scanlines_compound_layered,
+dnl ${agg_include_dir}/agg_renderer_scanline.h,
+dnl [ agg_need_compatibility_layer="no" ],
+dnl [ agg_need_compatibility_layer="yes" ] )
+
+dnl AC_SUBST(agg_need_compatibility_layer)
+
+dnl if test x"${agg_need_compatibility_layer}" = xyes; then
+dnl AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers
include the render_scanlines_compound_layered templated function])
+dnl else
+dnl AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [1], [AGG headers
include the render_scanlines_compound_layered templated function])
+dnl fi
AC_SUBST(AGG_LIBS)
Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/atk.m4 30 Oct 2006 16:31:13 -0000 1.23
+++ macros/atk.m4 4 Nov 2006 00:00:30 -0000 1.24
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.23 2006/10/30 16:31:13 nihilus Exp $
+dnl $Id: atk.m4,v 1.24 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
@@ -46,7 +46,7 @@
$PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
fi
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/local/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/opt/local/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_atk_topdir=""
gnash_atk_version=""
for i in $pathlist; do
@@ -57,6 +57,9 @@
break
fi
done
+ if test x$gnash_atk_version != x; then
+ break;
+ fi
done
if test x"${gnash_atk_version}" = x; then
@@ -74,7 +77,7 @@
AC_MSG_CHECKING([for libatk header])
- incllist="${prefix}/include /sw/include /usr/local/include
/opt/local/include /home/latest/include /usr/X11R6/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/usr/X11R6/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
for i in $incllist; do #{
if test -f $i/atk/atk.h; then #{
@@ -122,7 +125,7 @@
if test x"${ac_cv_path_atk_incl}" != x -a x"${ac_cv_path_atk_lib}" = x ;
then #{
AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/lib64 /usr/lib /opt/local/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libatk-${gnash_atk_version}.a -o -f
$i/libatk-${gnash_atk_version}.so; then #{
if test x"$i" != x"/usr/lib"; then #{
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/boost.m4 30 Oct 2006 16:01:21 -0000 1.24
+++ macros/boost.m4 4 Nov 2006 00:00:30 -0000 1.25
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: boost.m4,v 1.24 2006/10/30 16:01:21 nihilus Exp $
+dnl $Id: boost.m4,v 1.25 2006/11/04 00:00:30 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -46,7 +46,7 @@
$PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $1".0"}'`
fi
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/nekoware/include /usr/freeware/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/nekoware/include /usr/freeware/include
/usr/local/include /home/latest/include /opt/include /opt/local/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_boost_topdir=""
gnash_boost_version=""
for i in $pathlist; do
@@ -57,6 +57,9 @@
break
fi
done
+ if test x$gnash_boost_version != x; then
+ break;
+ fi
done
if test x"${gnash_boost_version}" = x; then
@@ -69,7 +72,7 @@
if test x"${ac_cv_path_boost_incl}" = x ; then
AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp,
[ac_cv_path_boost_incl="-I/usr/include"],[
if test x"${ac_cv_path_boost_incl}" = x; then
- incllist="/usr/local/include /sw/include /opt/local/include
/usr/local/include /usr/nekoware/include /usr/freeware/include
/home/latest/include /opt/include /opt/local/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/usr/local/include /sw/include /opt/local/include /usr/local/include
/usr/nekoware/include /usr/freeware/include /home/latest/include /opt/include
/opt/local/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/boost/detail/lightweight_mutex.hpp; then
ac_cv_path_boost_incl="-I$i"
@@ -107,7 +110,7 @@
if test x"${ac_cv_path_boost_lib}" = x; then
AC_SEARCH_LIBS(cleanup_slots, ${boostnames},
[ac_cv_path_boost_lib="${LIBS}"],[
AC_MSG_CHECKING([for Boost thread library])
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib32
${prefix}/lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib
/usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
boostnames=`ls -dr $i/libboost?thread*.so 2>/dev/null`
for libname in ${boostnames}; do
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/curl.m4 29 Oct 2006 18:34:10 -0000 1.9
+++ macros/curl.m4 4 Nov 2006 00:00:30 -0000 1.10
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: curl.m4,v 1.9 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: curl.m4,v 1.10 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -53,7 +53,7 @@
if test x"${curlconfig}" != "x" ; then
ac_cv_path_curl_incl=`${curlconfig} --cflags`
else
- incllist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/curl/curl.h; then
ac_cv_path_curl_incl="-I$i"
@@ -95,7 +95,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 /opt/local/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib /usr/lib64
/usr/lib /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib /opt/lib
/opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do # {
if test -f $i/libcurl.a -o -f $i/libcurl.so; then # {
if test x"$i" != x"/usr/lib"; then # {
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/glib.m4 30 Oct 2006 16:11:48 -0000 1.19
+++ macros/glib.m4 4 Nov 2006 00:00:30 -0000 1.20
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: glib.m4,v 1.19 2006/10/30 16:11:48 nihilus Exp $
+dnl $Id: glib.m4,v 1.20 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -46,7 +46,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Glib Version])
if test x"${gnash_glib_version}" = x; then
- pathlist="${with_glib_incl} ${prefix}/include /sw/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${with_glib_incl} ${prefix}/${target_alias}/include
${prefix}/include /sw/include /opt/local/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
gnash_glib_topdir=""
gnash_glib_version=""
@@ -58,6 +58,9 @@
break
fi
done
+ if test x$gnash_glib_version != x; then
+ break;
+ fi
done
fi
@@ -67,7 +70,7 @@
if test x"${ac_cv_path_glib_incl}" = x; then
AC_CHECK_HEADERS(glib.h, [ac_cv_path_glib_incl=""],[
if test x"${ac_cv_path_glib_incl}" = x; then
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /usr/include /opt/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /home/latest/include
/usr/include /opt/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/glib.h; then
@@ -105,7 +108,7 @@
if test x"${ac_cv_path_glib_lib}" = x; then
AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init,
[ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[
- libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib
/usr/lib64 /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${ac_cv_path_glib_lib}
${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libglib-${gnash_glib_version}.a -o -f
$i/libglib-${gnash_glib_version}.so; then
if test x"$i" != x"/usr/lib"; then
@@ -146,13 +149,23 @@
fi
if test x"${ac_cv_path_glib_incl}" != x; then
- GLIB_CFLAGS="${ac_cv_path_glib_incl}"
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/glib-${gnash_glib_version}/include/glibconfig.h; then
+ GLIB_CFLAGS="-I${i}/glib-${gnash_glib_version}/include"
+ break
+ fi
+ done
+ if test x"${ac_cv_path_glib_incl}" = x"yes"; then
+ GLIB_CFLAGS="$GLIB_CFLAGS"
+ else
+ GLIB_CFLAGS="${ac_cv_path_glib_incl} $GLIB_CFLAGS"
+ fi
+ AC_DEFINE([HAVE_GLIB], [1], [Has GLIB library installed])
else
GLIB_CFLAGS=""
fi
-
-
if test x"${ac_cv_path_glib_lib}" != x ; then
GLIB_LIBS="${ac_cv_path_glib_lib}"
else
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/gtk2.m4 29 Oct 2006 18:34:10 -0000 1.30
+++ macros/gtk2.m4 4 Nov 2006 00:00:30 -0000 1.31
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.30 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.31 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -48,7 +48,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Gtk Version])
if test x"${gnash_gtk2_version}" = x; then
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include /sw/include
/opt/local/include /usr/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_gtk2_topdir=""
gnash_gtk2_version=""
@@ -60,6 +60,9 @@
break
fi
done
+ if test x$gnash_gtk2_version != x; then
+ break;
+ fi
done
fi
AC_MSG_RESULT(${gnash_gtk2_version})
@@ -70,7 +73,7 @@
AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
if test x"${ac_cv_path_gtk2_incl}" = x; then
AC_MSG_CHECKING([for libgtk2 header])
- incllist="${prefix}/include /sw/include /opt/local/lib
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/lib /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then
@@ -112,7 +115,7 @@
dnl the library.
if test x"${ac_cv_path_gtk2_incl}" != x -a x"$ac_cv_path_gtk2_lib" = x; then
AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0
-lgdk-x11-2.0"],[
- libslist="${with_gtk2_lib} ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${with_gtk2_lib} ${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
if test x"$i" != x"/usr/lib"; then
@@ -122,11 +125,6 @@
ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2.0"
break
fi
- else
- if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
- ac_cv_path_gtk2_lib="$i/${gnash_gtk2_topdir}"
- break
- fi
fi
done
])
@@ -143,7 +141,7 @@
AC_MSG_RESULT($ac_cv_path_gtk2_lib)
if test x"${ac_cv_path_gtk2_incl}" != x; then
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/gtk-${gnash_gtk2_version}/include/gdkconfig.h; then
GTK2_CFLAGS="-I${i}/gtk-${gnash_gtk2_version}/include"
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/gtkglext.m4 29 Oct 2006 18:34:10 -0000 1.27
+++ macros/gtkglext.m4 4 Nov 2006 00:00:30 -0000 1.28
@@ -17,7 +17,7 @@
dnl
dnl
-dnl: $Id: gtkglext.m4,v 1.27 2006/10/29 18:34:10 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.28 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -58,7 +58,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Gtk GL Extensions Version])
if test x"${gnash_glext_version}" = x ; then
- pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
gnash_glext_topdir=""
gnash_glext_version=""
@@ -70,6 +70,9 @@
break
fi
done
+ if test x$gnash_glext_version != x; then
+ break;
+ fi
done
fi
@@ -78,7 +81,7 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_glext_incl}" = x; then
AC_MSG_CHECKING([for gtk/gtkgl.h])
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
ac_cv_path_glext_incl=""
for i in $incllist; do
@@ -121,7 +124,7 @@
if test x"${ac_cv_path_glext_lib}" = x; then
AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init,
[ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version}
-lgdkglext-x11-${gnash_glext_version}"],[
- libslist="${prefix}/lib64 ${prefix}/lib /opt/local/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /opt/local/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib /opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib
/usr/lib64 /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.so; then
if test x"$i" != x"/usr/lib"; then
@@ -150,9 +153,7 @@
if test x"${ac_cv_path_glext_incl}" != x ; then
AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /opt/local/lib
/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
-
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib /usr/lib64 /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /opt/local/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
ac_cv_path_glext_incl="${ac_cv_path_glext_incl}"
for i in $libslist; do
if test -f $i/gtkglext-${gnash_glext_version}/include/gdkglext-config.h;
then
Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/jpeg.m4 29 Oct 2006 18:34:10 -0000 1.19
+++ macros/jpeg.m4 4 Nov 2006 00:00:30 -0000 1.20
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: jpeg.m4,v 1.19 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: jpeg.m4,v 1.20 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_JPEG],
[
@@ -45,7 +45,7 @@
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""],[
if test x"${ac_cv_path_jpeg_incl}" = x; then
- incllist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/include /usr/local/include /home/latest/include
/opt/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/jpeglib.h; then
@@ -92,7 +92,7 @@
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"${ac_cv_path_jpeg_incl}" = x; then
AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib=""],[
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libjpeg.a -o -f $i/libjpeg.so; then
if test x"$i" != x"/usr/lib"; then
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/kde.m4 29 Oct 2006 18:34:10 -0000 1.21
+++ macros/kde.m4 4 Nov 2006 00:00:30 -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: kde.m4,v 1.21 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: kde.m4,v 1.22 2006/11/04 00:00:30 rsavoye Exp $
dnl ------------------------------------------------------------------------
dnl Find a file (or one of more files in a list of dirs)
@@ -389,6 +386,7 @@
AC_DEFUN([KDE_MISSING_PROG_ERROR],
[
AC_MSG_NOTICE([$1 not found])
+ AC_MSG_NOTICE([WARNING: klash disabled due to this])
klash=no
])
@@ -1014,10 +1012,10 @@
fi
if test $kde_qtver = 4; then
- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt-3.3 /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib64/qt-3.3 /usr/lib/qt-3.3 /usr/lib/qt3
/usr/lib/qt /usr/share/qt3"
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1239,7 +1237,7 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt
/usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt
/usr/X11R6/include/qt2 /usr/include/qt3 $x_includes "
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
fi
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/libXML.m4 29 Oct 2006 18:34:10 -0000 1.23
+++ macros/libXML.m4 4 Nov 2006 00:00:30 -0000 1.24
@@ -54,6 +54,7 @@
dnl -L/usr/lib, which I really want to avoid!
dnl
#no_libxml=""
+ if test x$cross_compling = xno; then
AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
if test "x$XML2_CONFIG" != "x" ; then
if test "x$LIBXML_CFLAGS" = "x" ; then
@@ -66,6 +67,7 @@
else
AC_MSG_RESULT(no)
fi
+ fi
AC_MSG_CHECKING(for libxml2)
@@ -73,7 +75,7 @@
dnl Try finding out yourself
dnl
if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
- dirlist="${prefix} /lib64 /usr/lib64 /opt/local/lib /lib /usr/lib /usr/pkg
/usr /usr/local /opt /opt/local /home/latest"
+ dirlist="${prefix}/${target_alias} /lib64 /usr/lib64 /opt/local/lib /lib
/usr/lib /usr/pkg /usr /usr/local /opt /opt/local /home/latest"
for i in $dirlist; do
if test "x$LIBXML_CFLAGS" = "x"; then
for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/pango.m4 30 Oct 2006 16:31:13 -0000 1.20
+++ macros/pango.m4 4 Nov 2006 00:00:30 -0000 1.21
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: pango.m4,v 1.20 2006/10/30 16:31:13 nihilus Exp $
+dnl $Id: pango.m4,v 1.21 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
@@ -41,7 +41,7 @@
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Pango Version])
- pathlist="/sw/include /usr/local/include /opt/local/include
/usr/X11R6/include /home/latest/include /opt/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include /sw/include
/usr/local/include /opt/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_pango_topdir=""
gnash_pango_version=""
@@ -53,6 +53,9 @@
break
fi
done
+ if test x$gnash_pango_version != x; then
+ break;
+ fi
done
if test x"${gnash_pango_topdir}" = x; then
@@ -66,27 +69,27 @@
AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
if test x"${ac_cv_path_pango_incl}" = x; then
AC_MSG_CHECKING([for libpango header])
- incllist="/sw/include /usr/local/include /opt/local/include
/usr/X11R6/include /home/latest/include /opt/include /opt/local/lib
/usr/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include /sw/include
/usr/local/include /opt/local/include /usr/X11R6/include /home/latest/include
/opt/include /opt/local/lib /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/pango/pango.h; then
- ac_cv_path_pango_incl="$i"
+ ac_cv_path_pango_incl="-I$i"
break
else
if test -f $i/${gnash_pango_topdir}/pango/pango.h; then
- ac_cv_path_pango_incl="$i/${gnash_pango_topdir}"
+ ac_cv_path_pango_incl="-I$i/${gnash_pango_topdir}"
break
fi
fi
done
+ fi])
+ fi
+
if test x"${ac_cv_path_pango_incl}" = x; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
- fi])
- fi
-
dnl Look for the library
AC_ARG_WITH(pango_lib, AC_HELP_STRING([--with-pango-lib], [directory where
pango library is]), with_pango_lib=${withval})
AC_CACHE_VAL(ac_cv_path_pango_lib,[
@@ -116,7 +119,7 @@
if test x"${ac_cv_path_pango_lib}" = x; then
AC_CHECK_LIB(pango-${gnash_pango_version}, pango_engine_shape_class_init,
[ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"],[
AC_MSG_CHECKING([for libpango library])
- libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/X11R6/lib64
/usr/X11R6/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib /usr/lib64 /usr/lib /sw/lib
/opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.so; then
if test x"$i" != x"/usr/lib"; then
@@ -126,11 +129,6 @@
ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"
break
fi
- else
- if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.so; then
- ac_cv_path_pango_lib="$i/${gnash_pango_topdir}"
- break
- fi
fi
done
AC_MSG_RESULT($ac_cv_path_pango_lib)
@@ -145,7 +143,6 @@
fi
fi
-
if test x"${ac_cv_path_pango_incl}" != x; then
PANGO_CFLAGS="${ac_cv_path_pango_incl}"
else
Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/pkg.m4 25 Jul 2006 03:13:17 -0000 1.1
+++ macros/pkg.m4 4 Nov 2006 00:00:30 -0000 1.2
@@ -27,10 +27,11 @@
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+if test x$cross_compling = xno; then
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
+ fi
+ if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -39,8 +40,11 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
+ fi
+else
+ PKG_CONFIG=""
fi[]dnl
+
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
Index: macros/png.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/png.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/png.m4 29 Oct 2006 18:34:11 -0000 1.17
+++ macros/png.m4 4 Nov 2006 00:00:30 -0000 1.18
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: png.m4,v 1.17 2006/10/29 18:34:11 rsavoye Exp $
+dnl $Id: png.m4,v 1.18 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PNG],
[
@@ -50,7 +50,7 @@
if test x"${ac_cv_path_png_incl}" = x; then
AC_CHECK_HEADERS(png.h, [ac_cv_path_png_incl=""],[
if test x"${ac_cv_path_png_incl}" = x; then
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /home/latest/include /opt/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/png.h; then
@@ -109,7 +109,7 @@
if test x"${ac_cv_path_png_lib}" = x; then
AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib=""],[
- libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/opt/local/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib .. ../.."
for i in $libslist; do
if test -f $i/libpng.a -o -f $i/libpng.so; then
if test x"$i" != x"/usr/lib"; then
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/sdl.m4 29 Oct 2006 18:34:11 -0000 1.32
+++ macros/sdl.m4 4 Nov 2006 00:00:30 -0000 1.33
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: sdl.m4,v 1.32 2006/10/29 18:34:11 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.33 2006/11/04 00:00:30 rsavoye Exp $
AC_DEFUN([GNASH_PATH_SDL],
[dnl
@@ -44,7 +44,7 @@
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the SDL Version])
if test x"${ac_cv_path_sdl_incl}" = x; then
- pathlist="/sw/include /usr/local/include /opt/local/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ pathlist="${prefix}/${target_alias}/include /sw/include /usr/local/include
/opt/local/include /home/latest/include /opt/include /opt/local/include
/usr/include /usr/pkg/include .. ../.."
gnash_sdl_topdir=""
gnash_sdl_version=""
@@ -70,7 +70,7 @@
AC_MSG_CHECKING([for SDL header])
if test x"${ac_cv_path_sdl_incl}" = x; then
- incllist="${prefix} /usr /usr/pkg /sw /opt/local /opt/local/include
/usr/local /home/latest /opt /usr .. ../.."
+ incllist="${prefix}/${target_alias} ${prefix} /usr /usr/pkg /sw /opt/local
/opt/local/include /usr/local /home/latest /opt /usr .. ../.."
for i in $incllist; do
if test -f $i/include/SDL/SDL.h; then
@@ -129,7 +129,7 @@
if test x"${ac_cv_path_sdl_lib}" = x ; then
AC_CHECK_LIB(SDL, SDL_Init, [ac_cv_path_sdl_lib="-lSDL"],[
- liblist="${prefix}/lib64 ${prefix}/lib /opt/local/lib /usr/lib64
/usr/lib /usr/pkg/lib /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib
/opt/lib.. ../.."
+ liblist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/opt/local/lib /usr/lib64 /usr/lib /usr/pkg/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib.. ../.."
for i in $liblist; do
if test -f $i/libSDL.a -o -f $i/libSDL.so; then
if test x"$i" != x"/usr/lib"; then
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash autogen.sh ChangeLog macros/agg.m4 macros...,
Rob Savoye <=