Index: sdl.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/sdl.m4,v retrieving revision 1.17 diff -u -3 -p -r1.17 sdl.m4 --- sdl.m4 24 Apr 2006 23:05:55 -0000 1.17 +++ sdl.m4 24 May 2006 11:04:36 -0000 @@ -57,21 +57,21 @@ AC_DEFUN([GNASH_PATH_SDL], AC_MSG_CHECKING([for the SDL Version]) pathlist="/sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_sdl_topdir="" + gnash_sdl_version="" for i in $pathlist; do for j in `ls -dr $i/SDL-[[0-9]].[[0-9]] 2>/dev/null`; do if test -f $j/SDL.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:SDL-::'` + gnash_sdl_topdir=`basename $j` + gnash_sdl_version=`echo ${gnash_sdl_topdir} | sed -e 's:SDL-::'` break fi done dnl This is a special caze for FreeBSD, that uses SDL11 instead of SDL-1.1. for j in `ls -dr $i/SDL[[0-9]][[0-9]] 2>/dev/null`; do if test -f $j/SDL.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:SDL::'` + gnash_sdl_topdir=`basename $j` + gnash_sdl_version=`echo ${gnash_sdl_topdir} | sed -e 's:SDL::'` break fi done @@ -87,12 +87,12 @@ AC_DEFUN([GNASH_PATH_SDL], ac_cv_path_sdl_incl=$i/SDL/include break fi - if test -f $i/include/SDL-${version}/SDL.h; then - ac_cv_path_sdl_incl=$i/include/SDL-${version} + if test -f $i/include/SDL-${gnash_sdl_version}/SDL.h; then + ac_cv_path_sdl_incl=$i/include/SDL-${gnash_sdl_version} break else - if test -f $i/include/SDL${version}/SDL.h; then - ac_cv_path_sdl_incl=$i/include/SDL${version} + if test -f $i/include/SDL${gnash_sdl_version}/SDL.h; then + ac_cv_path_sdl_incl=$i/include/SDL${gnash_sdl_version} break fi fi Index: atk.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/atk.m4,v retrieving revision 1.7 diff -u -3 -p -r1.7 atk.m4 --- atk.m4 10 May 2006 01:10:06 -0000 1.7 +++ atk.m4 24 May 2006 11:04:36 -0000 @@ -56,23 +56,23 @@ AC_DEFUN([GNASH_PATH_ATK], AC_MSG_CHECKING([for the Atk Version]) pathlist="${prefix}/include /sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_atk_topdir="" + gnash_atk_version="" for i in $pathlist; do for j in `ls -dr $i/atk-[[0-9]].[[0-9]] 2>/dev/null`; do if test -f $j/atk/atk.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:atk-::'` + gnash_atk_topdir=`basename $j` + gnash_atk_version=`echo ${gnash_atk_topdir} | sed -e 's:atk-::'` break fi done done fi - if test x"${topdir}" = x; then + if test x"${gnash_atk_topdir}" = x; then AC_MSG_RESULT(none) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_atk_version}]) fi dnl If the path hasn't been specified, go look for it. @@ -87,8 +87,8 @@ AC_DEFUN([GNASH_PATH_ATK], ac_cv_path_atk_incl="$i" break else - if test -f $i/${topdir}/atk/atk.h; then - ac_cv_path_atk_incl="$i/${topdir}" + if test -f $i/${gnash_atk_topdir}/atk/atk.h; then + ac_cv_path_atk_incl="$i/${gnash_atk_topdir}" break fi fi @@ -106,7 +106,7 @@ AC_DEFUN([GNASH_PATH_ATK], AC_ARG_WITH(atk_lib, [ --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 - if test -f ${with_atk_lib}/libatkatk-x11-${version}.a -o -f ${with_atk_lib}/libatkatk-x11-${version}.so; then + if test -f ${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.a -o -f ${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.so; then ac_cv_path_atk_lib=`(cd ${with_atk_incl}; pwd)` else AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.]) @@ -117,27 +117,27 @@ AC_DEFUN([GNASH_PATH_ATK], dnl If the header doesn't exist, there is no point looking for dnl the library. if test x"${ac_cv_path_atk_incl}" != x; then - AC_CHECK_LIB(atk-${version}, atk_focus_tracker_init, [ac_cv_path_atk_lib="-latk-${version}"],[ + AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init, [ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[ AC_MSG_CHECKING([for libatk library]) libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/libatk-${version}.a -o -f $i/libatk-${version}.so; then + 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 - ac_cv_path_atk_lib="-L$i -latk-${version}" + ac_cv_path_atk_lib="-L$i -latk-${gnash_atk_version}" break else ac_cv_path_atk_lib="" break fi else - if test -f $i/libatk-${version}.a -o -f $i/libatk-${version}.so; then - ac_cv_path_atk_lib="$i/${topdir}" + if test -f $i/libatk-${gnash_atk_version}.a -o -f $i/libatk-${gnash_atk_version}.so; then + ac_cv_path_atk_lib="$i/${gnash_atk_topdir}" break fi fi done]) else - if test -f $i/libatk-${version}.a -o -f $i/libatk-${version}.so; then + if test -f $i/libatk-${gnash_atk_version}.a -o -f $i/libatk-${gnash_atk_version}.so; then if test x"${ac_cv_path_atk_lib}" != x"/usr/lib"; then ac_cv_path_atk_lib="-L${ac_cv_path_atk_lib}" else Index: pango.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/pango.m4,v retrieving revision 1.10 diff -u -3 -p -r1.10 pango.m4 --- pango.m4 10 May 2006 01:10:06 -0000 1.10 +++ pango.m4 24 May 2006 11:04:36 -0000 @@ -56,23 +56,23 @@ AC_DEFUN([GNASH_PATH_PANGO], AC_MSG_CHECKING([for the Pango Version]) pathlist="/sw/include /usr/local/include /usr/X11R6/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_pango_topdir="" + gnash_pango_version="" for i in $pathlist; do for j in `ls -dr $i/pango-[[0-9]].[[0-9]] 2>/dev/null`; do if test -f $j/pango/pango.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:pango-::'` + gnash_pango_topdir=`basename $j` + gnash_pango_version=`echo ${gnash_pango_topdir} | sed -e 's:pango-::'` break fi done done fi dnl if pango_incl - if test x"${topdir}" = x; then + if test x"${gnash_pango_topdir}" = x; then AC_MSG_RESULT(none) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_pango_version}]) fi dnl If the path hasn't been specified, go look for it. @@ -87,8 +87,8 @@ AC_DEFUN([GNASH_PATH_PANGO], ac_cv_path_pango_incl="$i" break else - if test -f $i/${topdir}/pango/pango.h; then - ac_cv_path_pango_incl="$i/${topdir}" + if test -f $i/${gnash_pango_topdir}/pango/pango.h; then + ac_cv_path_pango_incl="$i/${gnash_pango_topdir}" break fi fi @@ -107,7 +107,7 @@ AC_DEFUN([GNASH_PATH_PANGO], AC_ARG_WITH(pango_lib, [ --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-${version}.a -o -f ${with_pango_lib}/libpangopango-x11-${version}.so; 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)` else AC_MSG_ERROR([${with_pango_lib} directory doesn't contain libpangopango.]) @@ -118,32 +118,32 @@ AC_DEFUN([GNASH_PATH_PANGO], dnl If the header doesn't exist, there is no point looking for dnl the library. if test x"${ac_cv_path_pango_incl}" != x; then - AC_CHECK_LIB(pango-${version}, pango_engine_shape_class_init, [ac_cv_path_pango_lib="-lpango-${version}"],[ + 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 /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-${version}.a -o -f $i/libpango-${version}.so; then + 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 - ac_cv_path_pango_lib="-L$i -lpango-${version}" + ac_cv_path_pango_lib="-L$i -lpango-${gnash_pango_version}" break else - ac_cv_path_pango_lib="-lpango-${version}" + ac_cv_path_pango_lib="-lpango-${gnash_pango_version}" break fi else - if test -f $i/libpango-${version}.a -o -f $i/libpango-${version}.so; then - ac_cv_path_pango_lib="$i/${topdir}" + 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 ]) else - if test -f $i/libpango-${version}.a -o -f $i/libpango-${version}.so; then + 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-${version}" + ac_cv_path_pango_lib="-L${ac_cv_path_pango_lib} -lpango-${gnash_pango_version}" else - ac_cv_path_pango_lib="-lpango-${version}" + ac_cv_path_pango_lib="-lpango-${gnash_pango_version}" fi fi fi Index: gstreamer.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v retrieving revision 1.5 diff -u -3 -p -r1.5 gstreamer.m4 --- gstreamer.m4 24 Apr 2006 23:05:55 -0000 1.5 +++ gstreamer.m4 24 May 2006 11:04:36 -0000 @@ -55,23 +55,23 @@ AC_DEFUN([GNASH_PATH_GSTREAMER], AC_MSG_CHECKING([for the Gstreamer Version]) pathlist="${prefix}/include /sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_gstreamer_topdir="" + gnash_gstreamer_version="" for i in $pathlist; do for j in `ls -dr $i/gstreamer-[[0-9]].[[0-9]][[0-9]] 2>/dev/null`; do if test -f $j/gst/gst.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:gstreamer-::'` + gnash_gstreamer_topdir=`basename $j` + gnash_gstreamer_version=`echo ${gnash_gstreamer_topdir} | sed -e 's:gstreamer-::'` break fi done done fi - if test x"${topdir}" = x; then + if test x"${gnash_gstreamer_topdir}" = x; then AC_MSG_RESULT(none) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_gstreamer_version}]) fi dnl If the path hasn't been specified, go look for it. @@ -86,8 +86,8 @@ AC_DEFUN([GNASH_PATH_GSTREAMER], ac_cv_path_gstreamer_incl="-I$i" break; else - if test -f $i/${topdir}/gst/gst.h; then - ac_cv_path_gstreamer_incl="-I$i/${topdir}" + if test -f $i/${gnash_gstreamer_topdir}/gst/gst.h; then + ac_cv_path_gstreamer_incl="-I$i/${gnash_gstreamer_topdir}" break fi fi @@ -105,7 +105,7 @@ dnl fi AC_ARG_WITH(gstreamer_lib, [ --with-gstreamer-lib directory where gstreamer library is], with_gstreamer_lib=${withval}) AC_CACHE_VAL(ac_cv_path_gstreamer_lib,[ if test x"${with_gstreamer_lib}" != x ; then - if test -f ${with_gstreamer_lib}/libgstreamergstreamer-x11-${version}.a -o -f ${with_gstreamer_lib}/libgstreamergstreamer-x11-${version}.so; then + if test -f ${with_gstreamer_lib}/libgstreamergstreamer-x11-${gnash_gstreamer_version}.a -o -f ${with_gstreamer_lib}/libgstreamergstreamer-x11-${gnash_gstreamer_version}.so; then ac_cv_path_gstreamer_lib=`(cd ${with_gstreamer_incl}; pwd)` else AC_MSG_ERROR([${with_gstreamer_lib} directory doesn't contain libgstreamergstreamer.]) @@ -116,11 +116,11 @@ dnl fi dnl If the header doesn't exist, there is no point looking for dnl the library. if test x"${ac_cv_path_gstreamer_incl}" != x; then - AC_CHECK_LIB(gstreamer-${version}, gst_plugin_init, [ac_cv_path_gstreamer_lib="-lgstreamer-${version}"],[ + AC_CHECK_LIB(gstreamer-${gnash_gstreamer_version}, gst_plugin_init, [ac_cv_path_gstreamer_lib="-lgstreamer-${gnash_gstreamer_version}"],[ AC_MSG_CHECKING([for libgstreamer library]) libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/libgstreamer-${version}.a -o -f $i/libgstreamer-${version}.so; then + if test -f $i/libgstreamer-${gnash_gstreamer_version}.a -o -f $i/libgstreamer-${gnash_gstreamer_version}.so; then if test x"$i" != x"/usr/lib"; then ac_cv_path_gstreamer_lib="-L$i -lgstreamer" break @@ -129,18 +129,18 @@ dnl the library. break fi else - if test -f $i/libgstreamer-${version}.a -o -f $i/libgstreamer-${version}.so; then - ac_cv_path_gstreamer_lib="-L$i/${topdir} -lgstreamer-${version}" + if test -f $i/libgstreamer-${gnash_gstreamer_version}.a -o -f $i/libgstreamer-${gnash_gstreamer_version}.so; then + ac_cv_path_gstreamer_lib="-L$i/${gnash_gstreamer_topdir} -lgstreamer-${gnash_gstreamer_version}" break fi fi done]) else - if test -f $i/libgstreamer-${version}.a -o -f $i/libgstreamer-${version}.so; then + if test -f $i/libgstreamer-${gnash_gstreamer_version}.a -o -f $i/libgstreamer-${gnash_gstreamer_version}.so; then if test x"${ac_cv_path_gstreamer_lib}" != x"/usr/lib"; then - ac_cv_path_gstreamer_lib="-L${ac_cv_path_gstreamer_lib} -lgstreamer-${version}" + ac_cv_path_gstreamer_lib="-L${ac_cv_path_gstreamer_lib} -lgstreamer-${gnash_gstreamer_version}" else - ac_cv_path_gstreamer_lib="-lgstreamer-${version}" + ac_cv_path_gstreamer_lib="-lgstreamer-${gnash_gstreamer_version}" fi fi fi Index: glib.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/glib.m4,v retrieving revision 1.9 diff -u -3 -p -r1.9 glib.m4 --- glib.m4 16 May 2006 14:00:31 -0000 1.9 +++ glib.m4 24 May 2006 11:04:36 -0000 @@ -56,23 +56,23 @@ AC_DEFUN([GNASH_PATH_GLIB], AC_MSG_CHECKING([for the Glib Version]) pathlist="${prefix}/include /sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_glib_topdir="" + gnash_glib_version="" for i in $pathlist; do for j in `ls -dr $i/glib-[[0-9]].[[0-9]] 2>/dev/null`; do if test -f $j/glib.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:glib-::'` + gnash_glib_topdir=`basename $j` + gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'` break fi done done fi - if test x"${topdir}" = x; then + if test x"${gnash_glib_topdir}" = x; then AC_MSG_RESULT(none) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_glib_version}]) fi dnl If the path hasn't been specified, go look for it. @@ -87,8 +87,8 @@ AC_DEFUN([GNASH_PATH_GLIB], ac_cv_path_glib_incl="$i" break else - if test -f $i/${topdir}/glib.h; then - ac_cv_path_glib_incl="$i/${topdir}" + if test -f $i/${gnash_glib_topdir}/glib.h; then + ac_cv_path_glib_incl="$i/${gnash_glib_topdir}" break fi fi @@ -101,8 +101,8 @@ AC_DEFUN([GNASH_PATH_GLIB], AC_MSG_RESULT(yes) libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/glib-${version}/include/glibconfig.h; then - ac_cv_path_glib_incl="-I${ac_cv_path_glib_incl} -I${i}/glib-${version}/include" + if test -f $i/glib-${gnash_glib_version}/include/glibconfig.h; then + ac_cv_path_glib_incl="-I${ac_cv_path_glib_incl} -I${i}/glib-${gnash_glib_version}/include" break fi done @@ -116,7 +116,7 @@ AC_DEFUN([GNASH_PATH_GLIB], AC_ARG_WITH(glib_lib, [ --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-${version}.a -o -f ${with_glib_lib}/libglib-${version}.so; 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=`(cd ${with_glib_incl}; pwd)` else AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.]) @@ -127,28 +127,28 @@ AC_DEFUN([GNASH_PATH_GLIB], dnl If the header doesn't exist, there is no point looking for dnl the library. if test x"${ac_cv_path_glib_incl}" != x; then - AC_CHECK_LIB(glib-${version}, g_io_channel_init, [ac_cv_path_glib_lib="-lglib-${version}"],[ + AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init, [ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[ AC_MSG_CHECKING([for libglib library]) libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/libglib-${version}.a -o -f $i/libglib-${version}.so; then + 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-${version}" + ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}" break else ac_cv_path_glib_lib="" break fi else - if test -f $i/libglib-${version}.a -o -f $i/libglib-${version}.so; then - ac_cv_path_glib_lib="$i/${topdir}" + if test -f $i/libglib-${gnash_glib_version}.a -o -f $i/libglib-${gnash_glib_version}.so; then + ac_cv_path_glib_lib="$i/${gnash_glib_topdir}" break fi fi done ]) else - if test -f $i/libglib-${version}.a -o -f $i/libglib-${version}.so; then + if test -f $i/libglib-${gnash_glib_version}.a -o -f $i/libglib-${gnash_glib_version}.so; then if test x"${ac_cv_path_glib_lib}" != x"/usr/lib"; then ac_cv_path_glib_lib="-L${ac_cv_path_glib_lib}" else Index: gtk2.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/gtk2.m4,v retrieving revision 1.20 diff -u -3 -p -r1.20 gtk2.m4 --- gtk2.m4 16 May 2006 22:22:45 -0000 1.20 +++ gtk2.m4 24 May 2006 11:04:36 -0000 @@ -37,16 +37,16 @@ dnl AC_DEFUN([GNASH_PATH_GTK2], [ - version="" - topdir="" + gnash_gtk2_version="" + gnash_gtk2_topdir="" dnl Look for the header AC_ARG_WITH(gtk2_incl, [ --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)` - topdir=`basename ${with_gtk2_incl}` - version=`echo ${topdir} | sed -e 's:gtk-::'` + 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 @@ -56,26 +56,26 @@ AC_DEFUN([GNASH_PATH_GTK2], dnl Attempt to find the top level directory, which unfortunately has a dnl version number attached. At least on Debain based systems, this dnl doesn't seem to get a directory that is unversioned. - if test x"${version}" = x; then + if test x"${gnash_gtk2_version}" = x; then AC_MSG_CHECKING([for the Gtk Version]) pathlist="${prefix}/include /sw/include /usr/local/include /usr/X11R6/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_gtk2_topdir="" + gnash_gtk2_version="" for i in $pathlist; do for j in `ls -dr $i/gtk-[[2-9]].[[0-9]] 2>/dev/null`; do if test -f $j/gtk/gtk.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:gtk-::'` + gnash_gtk2_topdir=`basename $j` + gnash_gtk2_version=`echo ${gnash_gtk2_topdir} | sed -e 's:gtk-::'` break fi done done - if test x"${topdir}" = x; then + if test x"${gnash_gtk2_topdir}" = x; then AC_MSG_RESULT(none) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_gtk2_version}]) fi fi @@ -88,8 +88,8 @@ AC_DEFUN([GNASH_PATH_GTK2], incllist="${prefix}/include /sw/include /usr/local/include /usr/X11R6/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." for i in $incllist; do - if test -f $i/${topdir}/gtk/gtk.h; then - ac_cv_path_gtk2_incl="-I$i/${topdir}" + if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then + ac_cv_path_gtk2_incl="-I$i/${gnash_gtk2_topdir}" break else if test -f $i/gtk/gtk.h; then @@ -132,7 +132,7 @@ dnl the library. 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/${topdir}" + ac_cv_path_gtk2_lib="$i/${gnash_gtk2_topdir}" break fi fi @@ -151,8 +151,8 @@ dnl the library. if test x"${ac_cv_path_gtk2_incl}" != x; then libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/gtk-${version}/include/gdkconfig.h; then - GTK2_CFLAGS="-I${i}/gtk-${version}/include" + if test -f $i/gtk-${gnash_gtk2_version}/include/gdkconfig.h; then + GTK2_CFLAGS="-I${i}/gtk-${gnash_gtk2_version}/include" break fi done Index: gtkglext.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v retrieving revision 1.16 diff -u -3 -p -r1.16 gtkglext.m4 --- gtkglext.m4 23 May 2006 20:33:19 -0000 1.16 +++ gtkglext.m4 24 May 2006 11:04:36 -0000 @@ -56,8 +56,8 @@ dnl fi if test x"${with_glext_incl}" != x ; then if test -f ${with_glext_incl}/gtk/gtkgl.h ; then ac_cv_path_glext_incl=`(cd ${with_glext_incl}; pwd)` - topdir=`basename ${with_glext_incl}` - version=`echo ${topdir} | sed -e 's:gtkglext-::'` + 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 @@ -66,26 +66,26 @@ dnl fi dnl Attempt to find the top level directory, which unfortunately has a dnl version number attached. At least on Debain based systems, this dnl doesn't seem to get a directory that is unversioned. - if test x"${version}" = x ; then + if test x"${gnash_glext_version}" = x ; then AC_MSG_CHECKING([for the Gtk GL Extensions Version]) pathlist="${prefix}/include /sw/include /usr/local/include /usr/X11R6/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.." - topdir="" - version="" + gnash_glext_topdir="" + gnash_glext_version="" for i in $pathlist; do for j in `ls -dr $i/gtkglext-[[0-9]].[[0-9]] 2>/dev/null`; do if test -f $j/gtk/gtkgl.h; then - topdir=`basename $j` - version=`echo ${topdir} | sed -e 's:gtkglext-::'` + gnash_glext_topdir=`basename $j` + gnash_glext_version=`echo ${gnash_glext_topdir} | sed -e 's:gtkglext-::'` break fi done done - if test x"${topdir}" = x; then + if test x"${gnash_glext_topdir}" = x; then AC_MSG_RESULT([none]) else - AC_MSG_RESULT([${version}]) + AC_MSG_RESULT([${gnash_glext_version}]) fi fi @@ -105,8 +105,8 @@ dnl doesn't seem to get a directory that break fi else - if test -f $i/${topdir}/gtk/gtkgl.h; then - ac_cv_path_glext_incl="$i/${topdir}" + if test -f $i/${gnash_glext_topdir}/gtk/gtkgl.h; then + ac_cv_path_glext_incl="$i/${gnash_glext_topdir}" break fi fi @@ -124,10 +124,10 @@ dnl doesn't seem to get a directory that AC_ARG_WITH(glext_lib, [ --with-glext-lib directory where glext 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-${version}.a -o -f ${with_glext_lib}/libgtkglext-x11-${version}.so; 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=`(cd ${with_glext_lib}; pwd)` else - AC_MSG_ERROR([${with_glext_lib} directory doesn't contain libgtkglext-x11-${version}.[a|so]]) + AC_MSG_ERROR([${with_glext_lib} directory doesn't contain libgtkglext-x11-${gnash_glext_version}.[a|so]]) fi fi ]) @@ -135,26 +135,26 @@ dnl doesn't seem to get a directory that dnl If the header doesn't exist, there is no point looking for dnl the library. if test x"${ac_cv_path_glext_incl}" != x; then - AC_CHECK_LIB(gtkglext-x11-${version}, gtk_gl_init, [ac_cv_path_glext_lib="-lgtkglext-x11-${version} -lgdkglext-x11-${version}"],[ + AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init, [ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"],[ AC_MSG_CHECKING([for libglext library]) libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." for i in $libslist; do - if test -f $i/libgtkglext-x11-${version}.a -o -f $i/libgtkglext-x11-${version}.so; then + 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 - ac_cv_path_glext_lib="-L$i -lgtkglext-x11-${version} -lgdkglext-x11-${version}" + ac_cv_path_glext_lib="-L$i -lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}" break fi else - if test -f $i/libgtkglext-x11-${version}.a -o -f $i/libgtkglext-x11-${version}.so; then - ac_cv_path_glext_lib="-L$i/${topdir} -lgtkglext-x11-${version} -lgdkglext-x11-${version}" + if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f $i/libgtkglext-x11-${gnash_glext_version}.so; then + ac_cv_path_glext_lib="-L$i/${gnash_glext_topdir} -lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}" break fi fi done]) else - if test -f $i/libgtkglext-x11-${version}.a -o -f $i/libgtkglext-x11-${version}.so; then + 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-${version} -lgdkglext-x11-${version}" + 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 @@ -171,8 +171,8 @@ dnl the library. libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.." ac_cv_path_glext_incl="-I${ac_cv_path_glext_incl}" for i in $libslist; do - if test -f $i/gtkglext-${version}/include/gdkglext-config.h; then - ac_cv_path_glext_incl="${ac_cv_path_glext_incl} -I${i}/gtkglext-${version}/include" + 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}"