[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/atk.m4 macros/boost.m4 m...
|
From: |
Markus Gothe |
|
Subject: |
[Gnash-commit] gnash ChangeLog macros/atk.m4 macros/boost.m4 m... |
|
Date: |
Thu, 09 Nov 2006 18:28:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/09 18:28:15
Modified files:
. : ChangeLog
macros : atk.m4 boost.m4 cairo.m4 glib.m4 gtk2.m4
gtkglext.m4 pango.m4 sdl.m4 xft.m4
Log message:
Fwd porting...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1578&r2=1.1579
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/xft.m4?cvsroot=gnash&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1578
retrieving revision 1.1579
diff -u -b -r1.1578 -r1.1579
--- ChangeLog 9 Nov 2006 17:08:47 -0000 1.1578
+++ ChangeLog 9 Nov 2006 18:28:15 -0000 1.1579
@@ -1,3 +1,9 @@
+2006-11-09 Markus Gothe <address@hidden>
+
+ * macros/atk.m4, macros/boost.m4, macros/cairo.m4,
+ macros/gnashpkgtool.m4, macros/gtk2.m4 macros/gtkglext.m4,
+ macros/pango.m4, macros/sdl.m4 macros/xft.m4: Bugs, typos, indentation
+
2006-11-09 Sandro Santilli <address@hidden>
* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/atk.m4 4 Nov 2006 00:00:30 -0000 1.24
+++ macros/atk.m4 9 Nov 2006 18:28:15 -0000 1.25
@@ -17,34 +17,38 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.24 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: atk.m4,v 1.25 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
+
dnl Look for the header
AC_ARG_WITH(atk_incl, AC_HELP_STRING([--with-atk-incl], [directory where
libatk header is]), with_atk_incl=${withval})
AC_CACHE_VAL(ac_cv_path_atk_incl,[
if test x"${with_atk_incl}" != x ; then
if test -f ${with_atk_incl}/atk/atk.h ; then
- ac_cv_path_atk_incl=`(cd ${with_atk_incl}; pwd)`
+ ac_cv_path_atk_incl=-I`(cd ${with_atk_incl}; pwd)`
else
AC_MSG_ERROR([${with_atk_incl} directory doesn't contain atk/atk.h])
fi
- fi])
+fi
+])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_incl}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_incl}" = x; then
$PKG_CONFIG --exists atk && ac_cv_path_atk_incl=`$PKG_CONFIG --cflags atk`
- $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk`
- 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 Atk Version])
- if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
- fi
+AC_MSG_CHECKING([for the Atk Version])
+
+if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $'0'".0"}'`
+fi
+
+if test x"${gnash_atk_version}" = x; then
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=""
@@ -61,12 +65,13 @@
break;
fi
done
+fi
- if test x"${gnash_atk_version}" = x; then
+if test x"${gnash_atk_version}" = x; then
AC_MSG_RESULT(none)
- else
+else
AC_MSG_RESULT(${gnash_atk_version})
- fi
+fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_atk_incl}" = x; then #{
@@ -75,10 +80,7 @@
if test x"${ac_cv_path_atk_incl}" = x; then #{
- AC_MSG_CHECKING([for libatk header])
-
incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/usr/X11R6/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
-
for i in $incllist; do #{
if test -f $i/atk/atk.h; then #{
ac_cv_path_atk_incl="-I$i"
@@ -90,35 +92,31 @@
fi #}
fi #}
done #}
-
- if test x"${ac_cv_path_atk_incl}" != x ; then #{
- AC_MSG_RESULT(yes)
- else # }{
- AC_MSG_RESULT(no)
- fi #}
-
fi #}
])
fi #}
+AC_MSG_CHECKING([for libatk header])
+AC_MSG_RESULT(${ac_cv_path_atk_incl})
+
dnl Look for the library
AC_ARG_WITH(atk_lib, AC_HELP_STRING([--with-atk-lib], [directory where atk
library is]), with_atk_lib=${withval})
AC_CACHE_VAL(ac_cv_path_atk_lib,[
if test x"${with_atk_lib}" != x ; then
libname=atkatk-x11-${gnash_atk_version}
if test -f ${with_atk_lib}/lib${libname}.a -o -f
${with_atk_lib}/lib${libname}.so; then
- ac_cv_path_atk_lib=`-L(cd ${with_atk_lib}; pwd)` -l${libname}
+ ac_cv_path_atk_lib="`-L(cd ${with_atk_lib}; pwd)` -l${libname}"
else
AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.])
fi
fi
])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_lib}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_lib}" = x; then
$PKG_CONFIG --exists atk && ac_cv_path_atk_lib=`$PKG_CONFIG --libs atk`
- fi
+fi
dnl If the header doesn't exist, there is no point looking for
dnl the library.
@@ -137,25 +135,22 @@
fi #}
done])
fi #}
- AC_MSG_CHECKING([for libatk library])
- if test x"${ac_cv_path_atk_lib}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- if test x"${ac_cv_path_atk_incl}" != x ; then
+AC_MSG_CHECKING([for libatk library])
+AC_MSG_RESULT(${ac_cv_path_atk_lib})
+
+if test x"${ac_cv_path_atk_incl}" != x ; then
ATK_CFLAGS="${ac_cv_path_atk_incl}"
- else
+else
ATK_CFLAGS=""
- fi
+fi
- if test x"${ac_cv_path_atk_lib}" != x ; then
+if test x"${ac_cv_path_atk_lib}" != x ; then
ATK_LIBS="${ac_cv_path_atk_lib}"
- else
+else
ATK_LIBS=""
- fi
+fi
- AC_SUBST(ATK_CFLAGS)
- AC_SUBST(ATK_LIBS)
+AC_SUBST(ATK_CFLAGS)
+AC_SUBST(ATK_LIBS)
])
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/boost.m4 4 Nov 2006 00:00:30 -0000 1.25
+++ macros/boost.m4 9 Nov 2006 18:28:15 -0000 1.26
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: boost.m4,v 1.25 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: boost.m4,v 1.26 2006/11/09 18:28:15 nihilus Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -40,12 +40,14 @@
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
- $PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $1".0"}'`
- fi
+AC_MSG_CHECKING([for the Boost Version])
+
+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
+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 .. ../.."
gnash_boost_topdir=""
gnash_boost_version=""
@@ -61,6 +63,7 @@
break;
fi
done
+fi
if test x"${gnash_boost_version}" = x; then
AC_MSG_RESULT([no version needed])
Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/cairo.m4 29 Oct 2006 18:34:10 -0000 1.11
+++ macros/cairo.m4 9 Nov 2006 18:28:15 -0000 1.12
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: cairo.m4,v 1.11 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: cairo.m4,v 1.12 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_CAIRO],
[
@@ -33,10 +33,9 @@
fi
])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_incl}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_incl}" = x; then
$PKG_CONFIG --exists cairo && ac_cv_path_cairo_incl=`$PKG_CONFIG --cflags
cairo`
- $PKG_CONFIG --exists cairo && gnash_cairo_version=`$PKG_CONFIG
--modversion cairo`
- fi
+fi
dnl we can use cairo even if no plugin is enabled
dnl if test x"$plugin" = x"yes"; then
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/glib.m4 4 Nov 2006 00:00:30 -0000 1.20
+++ macros/glib.m4 9 Nov 2006 18:28:15 -0000 1.21
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: glib.m4,v 1.20 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: glib.m4,v 1.21 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -27,8 +27,6 @@
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)`"
- gnash_glib_topdir=`basename $ac_cv_path_glib_incl`
- gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'`
else
AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib.h])
fi
@@ -36,15 +34,21 @@
])
dnl Try with pkg-config
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_incl}" = x; then
+
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_incl}" = x; then
$PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_incl=`$PKG_CONFIG
--cflags glib-2.0`
- $PKG_CONFIG --exists glib-2.0 && gnash_glib_version=`$PKG_CONFIG
--modversion 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 the Glib Version])
+
+AC_MSG_CHECKING([for the Glib Version])
+
+if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists glib-2.0 && gnash_glib_version=`$PKG_CONFIG
--modversion glib-2.0`
+fi
+
if test x"${gnash_glib_version}" = x; then
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 .. ../.."
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/gtk2.m4 4 Nov 2006 00:00:30 -0000 1.31
+++ macros/gtk2.m4 9 Nov 2006 18:28:15 -0000 1.32
@@ -17,20 +17,16 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.31 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.32 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
- gnash_gtk2_version=""
- gnash_gtk2_topdir=""
dnl Look for the header
AC_ARG_WITH(gtk2_incl, AC_HELP_STRING([--with-gtk2-incl], [directory where
libgtk2 header is]), with_gtk2_incl=${withval})
AC_CACHE_VAL(ac_cv_path_gtk2_incl,[
if test x"${with_gtk2_incl}" != x ; then
if test -f ${with_gtk2_incl}/gtk/gtk.h; then
ac_cv_path_gtk2_incl=-I`(cd ${with_gtk2_incl}; pwd)`
- gnash_gtk2_topdir=`basename ${with_gtk2_incl}`
- gnash_gtk2_version=`echo ${gnash_gtk2_topdir} | sed -e 's:gtk-::'`
else
AC_MSG_ERROR([${with_gtk2_incl} directory doesn't contain gtk/gtk.h])
fi
@@ -38,15 +34,20 @@
])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; 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`
- $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])
+
+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
+
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 .. ../.."
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/gtkglext.m4 4 Nov 2006 00:00:30 -0000 1.28
+++ macros/gtkglext.m4 9 Nov 2006 18:28:15 -0000 1.29
@@ -17,7 +17,7 @@
dnl
dnl
-dnl: $Id: gtkglext.m4,v 1.28 2006/11/04 00:00:30 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.29 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -32,34 +32,35 @@
dnl glext=no
dnl fi
- if test x"$glext" = x"yes"; then
- dnl Look for the header
- AC_ARG_WITH(glext_incl, AC_HELP_STRING([--with-glext-incl], [directory
where libglext header is]), with_glext_incl=${withval})
-
- AC_CACHE_VAL(ac_cv_path_glext_incl,[
+if test x"$glext" = x"yes"; then
+dnl Look for the header
+AC_ARG_WITH(glext_incl, AC_HELP_STRING([--with-glext-incl], [directory where
libglext header is]), with_glext_incl=${withval})
+AC_CACHE_VAL(ac_cv_path_glext_incl,[
if test x"${with_glext_incl}" != x ; then
if test -f ${with_glext_incl}/gtk/gtkgl.h ; then
ac_cv_path_glext_incl="-I`(cd ${with_glext_incl}; pwd)`"
- gnash_glext_topdir=`basename ${with_glext_incl}`
- gnash_glext_version=`echo ${gnash_glext_topdir} | sed -e
's:gtkglext-::'`
else
AC_MSG_ERROR([${with_glext_incl} directory doesn't contain gtk/gtkgl.h])
fi
- ])
+ fi
+])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
$PKG_CONFIG --exists gtkglext-1.0 &&
ac_cv_path_glext_incl=`$PKG_CONFIG --cflags gtkglext-1.0`
- $PKG_CONFIG --exists gtkglext-1.0 && gnash_glext_version=`$PKG_CONFIG
--modversion gtkglext-1.0 | cut -d "." -f 1,3`
- 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 GL Extensions Version])
- 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 .. ../.."
+AC_MSG_CHECKING([for the Gtk GL Extensions Version])
+
+if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists gtkglext-1.0 && gnash_glext_version=`$PKG_CONFIG
--modversion gtkglext-1.0 | cut -d "." -f 1,3`
+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
@@ -74,15 +75,13 @@
break;
fi
done
- fi
+fi
- AC_MSG_RESULT([${gnash_glext_version}])
+AC_MSG_RESULT([${gnash_glext_version}])
- 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])
+dnl If the path hasn't 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
@@ -97,34 +96,29 @@
fi
fi
done
-
- if test x"${ac_cv_path_glext_incl}" = x; then
- AC_MSG_RESULT([not found])
- else
- AC_MSG_RESULT([${ac_cv_path_glext_incl}])
- fi
- fi
-
- dnl Look for the library
- AC_ARG_WITH(glext_lib, AC_HELP_STRING([--with-glext-lib], [directory
where gtkglext library is]), with_glext_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_glext_lib,[
- if test x"${with_glext_lib}" != x ; then
+fi
+AC_MSG_CHECKING([for gtk/gtkgl.h])
+AC_MSG_RESULT([${ac_cv_path_glext_incl}])
+
+dnl Look for the library
+AC_ARG_WITH(glext_lib, AC_HELP_STRING([--with-glext-lib], [directory where
gtkglext library is]), with_glext_lib=${withval})
+AC_CACHE_VAL(ac_cv_path_glext_lib,[
+if test x"${with_glext_lib}" != x ; then
if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a
-o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.so; then
ac_cv_path_glext_lib=-L`(cd ${with_glext_lib}; pwd)`
else
AC_MSG_ERROR([${with_glext_lib} directory doesn't contain
libgtkglext-x11-${gnash_glext_version}.[a|so]])
fi
- fi
- ])
+fi
+])
- dnl Try with pkg-config
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_lib}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_lib}" = x; then
$PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib=`$PKG_CONFIG
--libs gtkglext-1.0`
- fi
+fi
- if test x"${ac_cv_path_glext_lib}" = x; then
+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}/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}/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
if test x"$i" != x"/usr/lib"; then
@@ -137,44 +131,28 @@
break
fi
fi
- done])
- else
- if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.so; then
- if test x"${ac_cv_path_glext_lib}" != x"/usr/lib"; then
- ac_cv_path_glext_lib="-L${ac_cv_path_glext_lib}
-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
- else
- ac_cv_path_glext_lib=""
- fi
- fi
- fi
- fi
- fi
+ done
+ ])
+fi
+AC_MSG_CHECKING([for GTK GL library])
+AC_MSG_RESULT([${ac_cv_path_glext_incl}])
+fi dnl glext=yes
- if test x"${ac_cv_path_glext_incl}" != x ; then
+if test x"${ac_cv_path_glext_incl}" != x ; then
AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
- 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
- ac_cv_path_glext_incl="${ac_cv_path_glext_incl}
-I${i}/gtkglext-${gnash_glext_version}/include"
- fi
- done
GLEXT_CFLAGS="${ac_cv_path_glext_incl}"
- else
+else
GLEXT_CFLAGS=""
- fi
+fi
- if test x"${ac_cv_path_glext_lib}" != x ; then
+if test x"${ac_cv_path_glext_lib}" != x ; then
AC_DEFINE(USE_GTKGLEXT,[1], [Use GtkGLExt extension])
GLEXT_LIBS="${ac_cv_path_glext_lib}"
- else
+else
GLEXT_LIBS=""
-dnl we can't build the plguin without GtkGlExt
- glext=no
- fi
- AC_SUBST(GLEXT_CFLAGS)
- AC_SUBST(GLEXT_LIBS)
+AC_SUBST(GLEXT_CFLAGS)
+AC_SUBST(GLEXT_LIBS)
])
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/pango.m4 4 Nov 2006 00:00:30 -0000 1.21
+++ macros/pango.m4 9 Nov 2006 18:28:15 -0000 1.22
@@ -14,35 +14,39 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
-dnl
-
-dnl $Id: pango.m4,v 1.21 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: pango.m4,v 1.22 2006/11/09 18:28:15 nihilus 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=`(cd ${with_pango_incl}; pwd)`
+ 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
- $PKG_CONFIG --exists pango && ac_cv_path_pango_incl=`$PKG_CONFIG --cflags
pango`
- fi
+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
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])
- 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 .. ../.."
+AC_MSG_CHECKING([for the Pango Version])
+
+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
+
+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 .. ../.."
gnash_pango_topdir=""
gnash_pango_version=""
for i in $pathlist; do
@@ -57,20 +61,19 @@
break;
fi
done
+fi
- if test x"${gnash_pango_topdir}" = x; then
+if test x"${gnash_pango_version}" = x; then
AC_MSG_RESULT(none)
- else
+else
AC_MSG_RESULT([${gnash_pango_version}])
- fi
+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
- AC_MSG_CHECKING([for libpango header])
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"
@@ -82,43 +85,31 @@
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
+
+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})
AC_CACHE_VAL(ac_cv_path_pango_lib,[
if test x"${with_pango_lib}" != x ; then
if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a
-o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.so; then
- ac_cv_path_pango_lib=`(cd ${with_pango_incl}; pwd)`
+ ac_cv_path_pango_lib=-L`(cd ${with_pango_lib}; pwd)`
else
AC_MSG_ERROR([${with_pango_lib} directory doesn't contain
libpangopango.])
fi
fi
])
- dnl Try with pkg-config. For PPC linux, at least with Yellow Dog, pkg-config
- dnl returns an incorrect libs line. Due to changes in the pango API,
- dnl and it's use by gtkglext, the pango font functions have changed,
- dnl but YDL 4.0.1 is out of date. Adding pangox solves the linkage
- dnl dependancy problem without breaking anything else, or requiring
- dnl a hugly complex configure test.
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
- $PKG_CONFIG --exists pango && ac_cv_path_pango_lib=`$PKG_CONFIG --libs
pango`
- if test x"$gnash_pango_version" = x; then
- gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' |
sed -e 's/-lpango-//'`
- fi
- ac_cv_path_pango_lib="${ac_cv_path_pango_lib}
-lpangox-${gnash_pango_version}"
+ $PKG_CONFIG --exists pangox &&
ac_cv_path_pango_lib=`$PKG_CONFIG --libs pangox`
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}"],[
- AC_MSG_CHECKING([for libpango library])
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
@@ -131,30 +122,24 @@
fi
fi
done
- AC_MSG_RESULT($ac_cv_path_pango_lib)
])
- else
- if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.so; then
- if test x"${ac_cv_path_pango_lib}" != x"/usr/lib"; then
- ac_cv_path_pango_lib="-L${ac_cv_path_pango_lib}
-lpango-${gnash_pango_version}"
- else
- ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"
- fi
- fi
fi
- if test x"${ac_cv_path_pango_incl}" != x; then
+AC_MSG_CHECKING([for libpango library])
+AC_MSG_RESULT(${ac_cv_path_pango_lib})
+
+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)
])
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/sdl.m4 4 Nov 2006 00:00:30 -0000 1.33
+++ macros/sdl.m4 9 Nov 2006 18:28:15 -0000 1.34
@@ -14,10 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
-dnl
-
-dnl $Id: sdl.m4,v 1.33 2006/11/04 00:00:30 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.34 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_SDL],
[dnl
@@ -34,16 +31,21 @@
fi
])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_incl}" = x; then
+if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_sdl_incl}" = x; then
$PKG_CONFIG --exists sdl && ac_cv_path_sdl_incl=`$PKG_CONFIG --cflags sdl`
- $PKG_CONFIG --exists sdl && gnash_sdl_version=`$PKG_CONFIG --modversion
sdl`
- 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 SDL Version])
- if test x"${ac_cv_path_sdl_incl}" = x; then
+
+AC_MSG_CHECKING([for the SDL Version])
+
+if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists sdl && gnash_sdl_version=`$PKG_CONFIG --modversion
sdl`
+fi
+
+ if test x"${gnash_sdl_version}" = x; then
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=""
Index: macros/xft.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/xft.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/xft.m4 29 Oct 2006 18:34:11 -0000 1.4
+++ macros/xft.m4 9 Nov 2006 18:28:15 -0000 1.5
@@ -14,19 +14,19 @@
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: xft.m4,v 1.5 2006/11/09 18:28:15 nihilus Exp $
AC_DEFUN([GNASH_PATH_XFT],
[
- if test x"$fltk" = x"yes"; then
- dnl Look for the header
- AC_ARG_WITH(xft_incl, AC_HELP_STRING([--with-xft-incl], [directory where
libxft header is]), with_xft_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_xft_incl, [
- AC_MSG_CHECKING([for xft.h header in specified directory])
+if test x"$fltk" = x"yes"; then
+
+dnl Look for the header
+AC_ARG_WITH(xft_incl, AC_HELP_STRING([--with-xft-incl], [directory where
libxft header is]), with_xft_incl=${withval})
+AC_CACHE_VAL(ac_cv_path_xft_incl, [
+AC_MSG_CHECKING([for xft.h header in specified directory])
if test x"${with_xft_incl}" != x ; then
if test -f ${with_xft_incl}/Xft/Xft.h; then
- ac_cv_path_xft_incl=`(cd ${with_xft_incl}; pwd)`
+ ac_cv_path_xft_incl="-I`(cd ${with_xft_incl}; pwd)`"
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([${with_xft_incl} directory doesn't contain Xft/Xft.h])
@@ -34,81 +34,90 @@
else
AC_MSG_RESULT([no])
fi
- ])
+])
+
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_xft_incl}" = x; then
+ $PKG_CONFIG --exists xft && ac_cv_path_xft_incl=`$PKG_CONFIG
--cflags xft`
+ fi
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_xft_incl}" = x; then
AC_CHECK_HEADERS(Xft/Xft.h, [ac_cv_path_xft_incl=""],[
if test x"${ac_cv_path_xft_incl}" = x; then
- AC_MSG_CHECKING([for libxft header])
incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
-
ac_cv_path_xft_incl=""
for i in $incllist; do
if test -f $i/X11/Xft/Xft.h; then
- ac_cv_path_xft_incl="$i/X11"
+ ac_cv_path_xft_incl="-I$i/X11"
break
fi
done
- fi])
- else
- if test x"${ac_cv_path_xft_incl}" != x"/usr/include"; then
- ac_cv_path_xft_incl="${ac_cv_path_xft_incl}"
fi
+ ])
fi
- if test x"${ac_cv_path_xft_incl}" != x ; then
- XFT_CFLAGS="-I${ac_cv_path_xft_incl}"
- else
+AC_MSG_CHECKING([for libxft header])
+AC_MSG_RESULT({ac_cv_path_xft_incl})
+
+if test x"${ac_cv_path_xft_incl}" != x ; then
+ XFT_CFLAGS="${ac_cv_path_xft_incl}"
+else
XFT_CFLAGS=""
- fi
+fi
- dnl Look for the library
- AC_ARG_WITH(xft_lib, AC_HELP_STRING([--with-xft-lib], [directory where
xft library is]), with_xft_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_xft_lib,[
+dnl Look for the library
+AC_ARG_WITH(xft_lib, AC_HELP_STRING([--with-xft-lib], [directory where xft
library is]), with_xft_lib=${withval})
+AC_CACHE_VAL(ac_cv_path_xft_lib,[
+AC_MSG_CHECKING([for libxft library in specified directory])
if test x"${with_xft_lib}" != x ; then
- AC_MSG_CHECKING([for libxft library in specified directory])
if test -f ${with_xft_lib}/libXft.a -o -f ${with_xft_lib}/libXft.so;
then
tmp=`(cd ${with_xft_lib}; pwd)`
ac_cv_path_xft_lib="-L${tmp} -lXft"
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([${with_xft_lib} directory doesn't contain libxft.])
+ fi
+ else
AC_MSG_RESULT([no])
fi
+])
+
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_xft_lib}" = x; then
+ $PKG_CONFIG --exists xft && ac_cv_path_xft_lib=`$PKG_CONFIG
--libs xft`
fi
- ])
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"${ac_cv_path_xft_lib}" = x; then
AC_CHECK_LIB(Xft, XftGlyphRender, [ac_cv_path_xft_lib="-lXft"],[
- AC_MSG_CHECKING([for libxft library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib
/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib ..
../.."
ac_cv_path_xft_lib=""
for i in $libslist; do
if test -f $i/libXft.a -o -f $i/libXft.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_xft_lib="-L$i -lXft"
- AC_MSG_RESULT(${ac_cv_path_xft_lib})
break
else
ac_cv_path_xft_lib="-lXft"
- AC_MSG_RESULT(yes)
break
fi
fi
- done])
- fi
+ done
+ ])
fi
- if test x"${ac_cv_path_xft_lib}" != x ; then
+ AC_MSG_CHECKING([for libxft library])
+ AC_MSG_RESULT(${ac_cv_path_xft_lib})
+
+fi
+
+if test x"${ac_cv_path_xft_lib}" != x ; then
XFT_LIBS="${ac_cv_path_xft_lib}"
has_xft=yes
- else
+else
has_xft=no
XFT_LIBS=""
- fi
+fi
- AC_SUBST(XFT_CFLAGS)
- AC_SUBST(XFT_LIBS)
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/atk.m4 macros/boost.m4 m...,
Markus Gothe <=