[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/atk.m4 ...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/atk.m4 ... |
|
Date: |
Wed, 10 May 2006 01:10:07 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Bastiaan Jacques <address@hidden> 06/05/10 01:10:06
Modified files:
. : ChangeLog configure.ac
macros : atk.m4 glib.m4 gtk2.m4 pango.m4
Log message:
* configure.ac: SDL is not a backend, so don't pretend it is one.
* configure.ac, macros/{atk,glib.gtk2,pango}.m4: We still want to know
if these packages are available if gtkglext isn't, so remove the
gtkglext checks, and fix the indentation to match.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.291&tr2=1.292&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/atk.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.291 gnash/ChangeLog:1.292
--- gnash/ChangeLog:1.291 Tue May 9 22:30:41 2006
+++ gnash/ChangeLog Wed May 10 01:10:06 2006
@@ -1,5 +1,12 @@
2006-05-10 Bastiaan Jacques <address@hidden>
+ * configure.ac: SDL is not a backend, so don't pretend it is one.
+ * configure.ac, macros/{atk,glib.gtk2,pango}.m4: We still want to know
+ if these packages are available if gtkglext isn't, so remove the
+ gtkglext checks, and fix the indentation to match.
+
+2006-05-10 Bastiaan Jacques <address@hidden>
+
* server/swf/tag_loaders.cpp: Struct swf_event is declared in namespace
gnash, not gnash::SWF::tag_loaders; move the implementation into
namespace gnash.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.68 gnash/configure.ac:1.69
--- gnash/configure.ac:1.68 Tue May 9 10:31:35 2006
+++ gnash/configure.ac Wed May 10 01:10:06 2006
@@ -137,8 +137,7 @@
renderer,
[ --enable-renderer=engine Specify rendering engine:
OpenGL (default)
- Cairo (experimental)
- SDL (unsupported)],
+ Cairo (experimental)],
[case "${enableval}" in
opengl|OpenGL) renderer=opengl ;;
cairo|Cairo) renderer=cairo ;;
@@ -384,6 +383,7 @@
testsuite/misc-ming.all/Makefile
plugin/Makefile
plugin/klash/Makefile
+gui/Makefile
)
dnl config.mk
dnl plugin/test/Makefile
@@ -576,98 +576,88 @@
echo " GtkGLext flags are: default include path"
fi
echo " GtkGLext libs are: $GLEXT_LIBS"
- else
- echo "ERROR: No GtkGLext development package installed!\
+ else
+ echo "ERROR: No GtkGLext development package installed!\
You need to have the GtkGLext development package installed\
to compile this project or install libgtkglext1-dev \
(using apt-get) or gtkglext-devel (using yum)."
-# nogo=true
+dnl nogo=true
fi
fi
-if test x"$plugin" = x"yes" -a x"$glext" = x"yes"; then
- if test x"$GTK2_LIBS" != x; then
- if test x"$GTK2_CFLAGS" != x; then
- echo " Gtk2 flags are: $GTK2_CFLAGS"
- else
- echo " Gtk2 flags are: default include path"
- fi
- echo " Gtk2 libs are: $GTK2_LIBS"
- else
- echo "ERROR: No Gtk2 development package installed!\
- You need to have the Gtk2 development package installed\
- to compile this project or install libgtk2.0-dev \
- (using apt-get) or gtk2-devel (using yum)."
-dnl nogo=true
+if test x"$GTK2_LIBS" != x; then
+ if test x"$GTK2_CFLAGS" != x; then
+ echo " Gtk2 flags are: $GTK2_CFLAGS"
+ else
+ echo " Gtk2 flags are: default include path"
fi
+ echo " Gtk2 libs are: $GTK2_LIBS"
+else
+ echo "ERROR: No Gtk2 development package installed!\
+You need to have the Gtk2 development package installed\
+to compile this project or install libgtk2.0-dev \
+(using apt-get) or gtk2-devel (using yum)."
+dnl nogo=true
fi
-if test x"$glext" = x"yes"; then
- if test x"$PANGO_LIBS" != x; then
- if test x"$PANGO_CFLAGS" != x; then
- echo " Pango flags are: $PANGO_CFLAGS"
- else
- echo " Pango flags are: default include path"
+if test x"$PANGO_LIBS" != x; then
+ if test x"$PANGO_CFLAGS" != x; then
+ echo " Pango flags are: $PANGO_CFLAGS"
+ else
+ echo " Pango flags are: default include path"
fi
- echo " Pango libs are: $PANGO_LIBS"
- else
- echo "ERROR: No Pango development package installed!\
- You need to have the Pango development package installed\
- to compile this project or install libpango1.0-dev \
- (using apt-get) or pango-devel (using yum)."
+ echo " Pango libs are: $PANGO_LIBS"
+else
+ echo "ERROR: No Pango development package installed!\
+You need to have the Pango development package installed\
+to compile this project or install libpango1.0-dev \
+(using apt-get) or pango-devel (using yum)."
dnl nogo=true
- fi
fi
-if test x"$glext" = x"yes"; then
- if test x"$GLIB_LIBS" != x; then
- if test x"$GLIB_CFLAGS" != x; then
- echo " Glib flags are: $GLIB_CFLAGS"
- else
- echo " Glib flags are: default include path"
- fi
- echo " Glib libs are: $GLIB_LIBS"
- else
- echo "ERROR: No Glib development package installed!\
- You need to have the Glib development package installed\
- to compile this project or install libglib2.0-dev \
+if test x"$GLIB_LIBS" != x; then
+ if test x"$GLIB_CFLAGS" != x; then
+ echo " Glib flags are: $GLIB_CFLAGS"
+ else
+ echo " Glib flags are: default include path"
+ fi
+ echo " Glib libs are: $GLIB_LIBS"
+else
+ echo "ERROR: No Glib development package installed!\
+You need to have the Glib development package installed\
+to compile this project or install libglib2.0-dev \
(using apt-get) or glib2-devel (using yum)."
dnl nogo=true
- fi
fi
-if test x"$glext" = x"yes"; then
- if test x"$CAIRO_LIBS" != x; then
- if test x"$CAIRO_CFLAGS" != x; then
- echo " Cairo flags are: $CAIRO_CFLAGS"
- else
- echo " Cairo flags are: default include path"
- fi
- echo " Cairo libs are: $CAIRO_LIBS"
- else
- echo "ERROR: No Cairo development package installed!\
+if test x"$CAIRO_LIBS" != x; then
+ if test x"$CAIRO_CFLAGS" != x; then
+ echo " Cairo flags are: $CAIRO_CFLAGS"
+ else
+ echo " Cairo flags are: default include path"
+ fi
+ echo " Cairo libs are: $CAIRO_LIBS"
+else
+ echo "ERROR: No Cairo development package installed!\
You need to have the Cairo development package installed\
to compile this project or install libcairo-dev \
(using apt-get) or cairo-devel (using yum)."
dnl nogo=true
- fi
fi
-if test x"$glext" = x"yes"; then
- if test x"$ATK_LIBS" != x; then
- if test x"$ATK_CFLAGS" != x; then
- echo " Atk flags are: $ATK_CFLAGS"
- else
- echo " Atk flags are: default include path"
- fi
- echo " Atk libs are: $ATK_LIBS"
- else
- echo "ERROR: No Atk development package installed!\
+if test x"$ATK_LIBS" != x; then
+ if test x"$ATK_CFLAGS" != x; then
+ echo " Atk flags are: $ATK_CFLAGS"
+ else
+ echo " Atk flags are: default include path"
+ fi
+ echo " Atk libs are: $ATK_LIBS"
+else
+ echo "ERROR: No Atk development package installed!\
You need to have the Atk development package installed\
to compile this project or install libatk1.0-dev \
(using apt-get) or atk-devel (using yum)."
dnl nogo=true
- fi
fi
if test x"$fltk" = x"yes"; then
Index: gnash/macros/atk.m4
diff -u gnash/macros/atk.m4:1.6 gnash/macros/atk.m4:1.7
--- gnash/macros/atk.m4:1.6 Mon Apr 24 23:05:55 2006
+++ gnash/macros/atk.m4 Wed May 10 01:10:06 2006
@@ -48,104 +48,103 @@
fi
fi])
- if test x"$glext" = x"yes"; then
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
- dnl doesn't seem to get a directory that is unversioned.
- if test x"${ac_cv_path_atk_incl}" = x; then
- AC_MSG_CHECKING([for the Atk Version])
- pathlist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
- topdir=""
- 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-::'`
- break
- fi
- done
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+ if test x"${ac_cv_path_atk_incl}" = x; then
+ AC_MSG_CHECKING([for the Atk Version])
+ pathlist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+
+ topdir=""
+ 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-::'`
+ break
+ fi
done
- fi
+ done
+ fi
- if test x"${topdir}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${version}])
- fi
+ if test x"${topdir}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${version}])
+ fi
- dnl If the path hasn't been specified, go look for it.
+ dnl If the path hasn't been specified, go look for it.
+ if test x"${ac_cv_path_atk_incl}" = x; then
+ AC_CHECK_HEADERS(atk/atkgl.h, [ac_cv_path_atk_incl=""],[
if test x"${ac_cv_path_atk_incl}" = x; then
- AC_CHECK_HEADERS(atk/atkgl.h, [ac_cv_path_atk_incl=""],[
- if test x"${ac_cv_path_atk_incl}" = x; then
- AC_MSG_CHECKING([for libatk header])
- incllist="/sw/include /usr/local/include /home/latest/include
/usr/X11R6/include /opt/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"
- break
- else
- if test -f $i/${topdir}/atk/atk.h; then
- ac_cv_path_atk_incl="$i/${topdir}"
- break
- fi
- fi
- done
- fi])
- fi
-
- if test x"${ac_cv_path_atk_incl}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ AC_MSG_CHECKING([for libatk header])
+ incllist="/sw/include /usr/local/include /home/latest/include
/usr/X11R6/include /opt/include /usr/include /usr/pkg/include .. ../.."
- dnl Look for the library
- 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
- ac_cv_path_atk_lib=`(cd ${with_atk_incl}; pwd)`
+ for i in $incllist; do
+ if test -f $i/atk/atk.h; then
+ ac_cv_path_atk_incl="$i"
+ break
else
- AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.])
+ if test -f $i/${topdir}/atk/atk.h; then
+ ac_cv_path_atk_incl="$i/${topdir}"
+ break
+ fi
fi
- fi
- ])
+ done
+ fi])
+ fi
-dnl If the header doesn't exist, there is no point looking for
-dnl the library.
- if test x"${ac_cv_path_atk_incl}" != x; then
- AC_CHECK_LIB(atk-${version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${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 x"$i" != x"/usr/lib"; then
- ac_cv_path_atk_lib="-L$i -latk-${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}"
- break
- fi
- fi
- done])
+ if test x"${ac_cv_path_atk_incl}" != x ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ dnl Look for the library
+ 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
+ ac_cv_path_atk_lib=`(cd ${with_atk_incl}; pwd)`
else
- if test -f $i/libatk-${version}.a -o -f $i/libatk-${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
- ac_cv_path_atk_lib=""
+ AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.])
+ fi
+ fi
+ ])
+
+ dnl If the header doesn't exist, there is no point looking for
+ dnl the library.
+ if test x"${ac_cv_path_atk_incl}" != x; then
+ AC_CHECK_LIB(atk-${version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${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 x"$i" != x"/usr/lib"; then
+ ac_cv_path_atk_lib="-L$i -latk-${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}"
+ break
fi
fi
+ done])
+ else
+ if test -f $i/libatk-${version}.a -o -f $i/libatk-${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
+ ac_cv_path_atk_lib=""
fi
fi
+ fi
if test x"${ac_cv_path_atk_incl}" != x ; then
ATK_CFLAGS="-I${ac_cv_path_atk_incl}"
Index: gnash/macros/glib.m4
diff -u gnash/macros/glib.m4:1.5 gnash/macros/glib.m4:1.6
--- gnash/macros/glib.m4:1.5 Mon Apr 24 23:05:55 2006
+++ gnash/macros/glib.m4 Wed May 10 01:10:06 2006
@@ -49,110 +49,109 @@
fi
])
- if test x"$glext" = x"yes"; then
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
- dnl doesn't seem to get a directory that is unversioned.
- if test x"${ac_cv_path_glib_incl}" = x; then
- 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=""
- 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-::'`
- break
- fi
- done
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+ if test x"${ac_cv_path_glib_incl}" = x; then
+ 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=""
+ 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-::'`
+ break
+ fi
done
- fi
+ done
+ fi
- if test x"${topdir}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${version}])
- fi
+ if test x"${topdir}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${version}])
+ fi
- dnl If the path hasn't been specified, go look for it.
- 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
- AC_MSG_CHECKING([for libglib header])
- incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
-
- for i in $incllist; do
- if test -f $i/glib.h; then
- ac_cv_path_glib_incl="$i"
- break
- else
- if test -f $i/${topdir}/glib.h; then
- ac_cv_path_glib_incl="$i/${topdir}"
- break
- fi
- fi
- done
- fi
- ])
- fi
+ dnl If the path hasn't been specified, go look for it.
+ 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
+ AC_MSG_CHECKING([for libglib header])
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+
+ for i in $incllist; do
+ if test -f $i/glib.h; then
+ ac_cv_path_glib_incl="$i"
+ break
+ else
+ if test -f $i/${topdir}/glib.h; then
+ ac_cv_path_glib_incl="$i/${topdir}"
+ break
+ fi
+ fi
+ done
+ fi
+ ])
+ fi
- if test x"${ac_cv_path_glib_incl}" != x ; then
- libincl=`echo ${ac_cv_path_glib_incl} | sed -e 's/include/lib/'`
- GLIB_CFLAGS="-I${ac_cv_path_glib_incl} -I${libincl}/include"
- AC_MSG_RESULT(yes)
- else
- GLIB_CFLAGS=""
- AC_MSG_RESULT(no)
- fi
+ if test x"${ac_cv_path_glib_incl}" != x ; then
+ libincl=`echo ${ac_cv_path_glib_incl} | sed -e 's/include/lib/'`
+ GLIB_CFLAGS="-I${ac_cv_path_glib_incl} -I${libincl}/include"
+ AC_MSG_RESULT(yes)
+ else
+ GLIB_CFLAGS=""
+ AC_MSG_RESULT(no)
+ fi
- dnl Look for the library
- 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
- ac_cv_path_glib_lib=`(cd ${with_glib_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.])
- fi
+ dnl Look for the library
+ 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
+ ac_cv_path_glib_lib=`(cd ${with_glib_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.])
fi
- ])
+ fi
+ ])
- 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_MSG_CHECKING([for libglib 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/libglib-${version}.a -o -f $i/libglib-${version}.so;
then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_glib_lib="-L$i -lglib-${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}"
- break
- fi
- fi
- done
- ])
- else
- if test -f $i/libglib-${version}.a -o -f $i/libglib-${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}"
+ 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_MSG_CHECKING([for libglib 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/libglib-${version}.a -o -f $i/libglib-${version}.so; then
+ if test x"$i" != x"/usr/lib"; then
+ ac_cv_path_glib_lib="-L$i -lglib-${version}"
+ break
+ else
+ ac_cv_path_glib_lib=""
+ break
+ fi
else
- ac_cv_path_glib_lib=""
+ if test -f $i/libglib-${version}.a -o -f $i/libglib-${version}.so;
then
+ ac_cv_path_glib_lib="$i/${topdir}"
+ break
+ fi
fi
+ done
+ ])
+ else
+ if test -f $i/libglib-${version}.a -o -f $i/libglib-${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
+ ac_cv_path_glib_lib=""
fi
fi
fi
+
if test x"${ac_cv_path_glib_lib}" != x ; then
GLIB_LIBS="${ac_cv_path_glib_lib}"
else
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.9 gnash/macros/gtk2.m4:1.10
--- gnash/macros/gtk2.m4:1.9 Mon Apr 24 23:05:55 2006
+++ gnash/macros/gtk2.m4 Wed May 10 01:10:06 2006
@@ -49,26 +49,25 @@
fi
])
- if test x"$plugin" = x"yes" -a x"$glext" = x"yes"; then
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
- dnl doesn't seem to get a directory that is unversioned.
- if test x"${ac_cv_path_gtk2_incl}" = 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=""
- for i in $pathlist; do
- for j in `ls -dr $i/gtk-[[0-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-::'`
- break
- fi
- done
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+ if test x"${ac_cv_path_gtk2_incl}" = 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=""
+ for i in $pathlist; do
+ for j in `ls -dr $i/gtk-[[0-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-::'`
+ break
+ fi
done
- fi
+ done
+ fi
dnl if test x"${topdir}" = x; then
dnl AC_MSG_RESULT(none)
@@ -76,75 +75,74 @@
dnl AC_MSG_RESULT([${version}])
dnl fi
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_gtk2_incl}" = x; then
- AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
- if test x"${ac_cv_path_gtk2_incl}" = x; then
- AC_MSG_CHECKING([for libgtk2 header])
- 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/${topdir}"
- else
- if test -f $i/gtk/gtk.h; then
- ac_cv_path_gtk2_incl="-I$i"
- break
- fi
- fi
- done
- fi
- ])
- fi
-
- if test x"${ac_cv_path_gtk2_incl}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- dnl Look for the library
- AC_ARG_WITH(gtk2_lib, [ --with-gtk2-lib directory where gtk2
library is], with_gtk2_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_gtk2_lib,[
- if test x"${with_gtk2_lib}" != x ; then
- if test -f ${with_gtk2_lib}/libgtkgtk2-x11-${version}.a -o -f
${with_gtk2_lib}/libgtkgtk2-x11-${version}.so; then
- ac_cv_path_gtk2_lib=`(cd ${with_gtk2_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgtk2.])
- fi
+ dnl If the path hasn't been specified, go look for it.
+ if test x"${ac_cv_path_gtk2_incl}" = x; then
+ AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
+ if test x"${ac_cv_path_gtk2_incl}" = x; then
+ AC_MSG_CHECKING([for libgtk2 header])
+ 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/${topdir}"
+ else
+ if test -f $i/gtk/gtk.h; then
+ ac_cv_path_gtk2_incl="-I$i"
+ break
+ fi
+ fi
+ done
fi
])
+ fi
+
+ if test x"${ac_cv_path_gtk2_incl}" != x ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ dnl Look for the library
+ AC_ARG_WITH(gtk2_lib, [ --with-gtk2-lib directory where gtk2
library is], with_gtk2_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_gtk2_lib,[
+ if test x"${with_gtk2_lib}" != x ; then
+ if test -f ${with_gtk2_lib}/libgtkgtk2-x11-${version}.a -o -f
${with_gtk2_lib}/libgtkgtk2-x11-${version}.so; then
+ ac_cv_path_gtk2_lib=`(cd ${with_gtk2_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgtk2.])
+ fi
+ fi
+ ])
dnl If the header doesn't exist, there is no point looking for
dnl the library.
- if test x"${ac_cv_path_gtk2_incl}" != x; then
- AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0
-lgdk-x11-2.0"],[
- AC_MSG_CHECKING([for libgtk2 library])
- libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64
/usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
- 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
- ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0"
- break
- else
- ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2."
- 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/${topdir}"
- break
- fi
- fi
- done
- ])
- else
- if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
- if test x"${ac_cv_path_gtk2_lib}" != x"/usr/lib"; then
- ac_cv_path_gtk2_lib="-L${ac_cv_path_gtk2_lib} -lgtk-x11-2.0
-lgdk-x11-2.0"
- else
- ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2.0"
+ if test x"${ac_cv_path_gtk2_incl}" != x; then
+ AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0
-lgdk-x11-2.0"],[
+ AC_MSG_CHECKING([for libgtk2 library])
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ 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
+ ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0"
+ break
+ else
+ ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2."
+ 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/${topdir}"
+ break
+ fi
fi
+ done
+ ])
+ else
+ if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
+ if test x"${ac_cv_path_gtk2_lib}" != x"/usr/lib"; then
+ ac_cv_path_gtk2_lib="-L${ac_cv_path_gtk2_lib} -lgtk-x11-2.0
-lgdk-x11-2.0"
+ else
+ ac_cv_path_gtk2_lib="-lgtk-x11-2.0 -lgdk-x11-2.0"
fi
fi
fi
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.9 gnash/macros/pango.m4:1.10
--- gnash/macros/pango.m4:1.9 Mon Apr 24 23:05:55 2006
+++ gnash/macros/pango.m4 Wed May 10 01:10:06 2006
@@ -49,106 +49,105 @@
fi
])
- if test x"$glext" = x"yes"; then
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
- dnl doesn't seem to get a directory that is unversioned.
- if test x"${ac_cv_path_pango_incl}" = x; then
- 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=""
- 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-::'`
- break
- fi
- done
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+ if test x"${ac_cv_path_pango_incl}" = x; then
+ 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=""
+ 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-::'`
+ break
+ fi
done
- fi dnl if pango_incl
+ done
+ fi dnl if pango_incl
- if test x"${topdir}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${version}])
- fi
+ if test x"${topdir}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${version}])
+ fi
- dnl If the path hasn't been specified, go look for it.
+ 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_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 /usr/X11R6/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
-
- for i in $incllist; do
- if test -f $i/pango/pango.h; then
- ac_cv_path_pango_incl="$i"
- break
- else
- if test -f $i/${topdir}/pango/pango.h; then
- ac_cv_path_pango_incl="$i/${topdir}"
- break
- fi
- fi
- done
- fi
- ])
- fi
+ AC_MSG_CHECKING([for libpango header])
+ incllist="/sw/include /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
- if test x"${ac_cv_path_pango_incl}" != x; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- dnl Look for the library
- 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
- ac_cv_path_pango_lib=`(cd ${with_pango_incl}; pwd)`
+ for i in $incllist; do
+ if test -f $i/pango/pango.h; then
+ ac_cv_path_pango_incl="$i"
+ break
else
- AC_MSG_ERROR([${with_pango_lib} directory doesn't contain
libpangopango.])
+ if test -f $i/${topdir}/pango/pango.h; then
+ ac_cv_path_pango_incl="$i/${topdir}"
+ break
+ fi
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
- 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_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 x"$i" != x"/usr/lib"; then
- ac_cv_path_pango_lib="-L$i -lpango-${version}"
- break
- else
- ac_cv_path_pango_lib="-lpango-${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}"
- break
- fi
- fi
- done
- ])
+ dnl Look for the library
+ 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
+ ac_cv_path_pango_lib=`(cd ${with_pango_incl}; pwd)`
else
- if test -f $i/libpango-${version}.a -o -f $i/libpango-${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}"
- else
- ac_cv_path_pango_lib="-lpango-${version}"
+ AC_MSG_ERROR([${with_pango_lib} directory doesn't contain
libpangopango.])
+ fi
+ fi
+ ])
+
+ 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_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 x"$i" != x"/usr/lib"; then
+ ac_cv_path_pango_lib="-L$i -lpango-${version}"
+ break
+ else
+ ac_cv_path_pango_lib="-lpango-${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}"
+ break
fi
fi
+ done
+ ])
+ else
+ if test -f $i/libpango-${version}.a -o -f $i/libpango-${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}"
+ else
+ ac_cv_path_pango_lib="-lpango-${version}"
fi
fi
+ fi
+
if test x"${ac_cv_path_pango_incl}" != x; then
PANGO_CFLAGS="-I${ac_cv_path_pango_incl}"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure.ac macros/atk.m4 ...,
Bastiaan Jacques <=