[Gnash-commit] gnash ChangeLog macros/atk.m4 macros/pango.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/30 16:31:13

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 pango.m4 

Log message:
        * macros/pango.m4: Fixed output.
        * macros/atk.m4: fixed issue due to typo (lack of '$')!!!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1444&r2=1.1445
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1444
retrieving revision 1.1445
diff -u -b -r1.1444 -r1.1445
--- ChangeLog   30 Oct 2006 16:11:48 -0000      1.1444
+++ ChangeLog   30 Oct 2006 16:31:13 -0000      1.1445
@@ -4,7 +4,8 @@
        * configure.ac: Removed 0.7.1 from the version info, let's stick with
          cvs+BUILDDATE.
        * macros/boost.m4: Applied patch from Bernhard Rosenkraenzer.
-       * macros/glib.m4: Fixed output.
+       * macros/glib.m4, macros/pango.m4: Fixed output.
+       * macros/atk.m4: fixed issue due to typo (lack of '$').
 
 2006-10-30 Hannes Mayr <address@hidden>
        * server/asobj/NetStream.cpp: added <unistd.h> include for sleep()

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/atk.m4       29 Oct 2006 18:34:10 -0000      1.22
+++ macros/atk.m4       30 Oct 2006 16:31:13 -0000      1.23
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: atk.m4,v 1.22 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: atk.m4,v 1.23 2006/10/30 16:31:13 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_ATK],
 [
@@ -74,7 +74,7 @@
 
       AC_MSG_CHECKING([for libatk header])
 
-      incllist="/sw/include /usr/local/include /opt/local/include 
/home/latest/include /usr/X11R6/include /opt/include /opt/local/include 
/usr/include /usr/pkg/include .. ../.."
+      incllist="${prefix}/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 #{
@@ -119,8 +119,8 @@
 
   dnl If the header doesn't exist, there is no point looking for
   dnl the library.
-  AC_MSG_CHECKING([for libatk library])
-  if test x"${ac_cv_path_atk_incl}" != x -a x"ac_cv_path_atk_lib" = x ; then #{
+
+  if test x"${ac_cv_path_atk_incl}" != x -a x"${ac_cv_path_atk_lib}" = x ; 
then #{
     AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init, 
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
       libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib 
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib 
/usr/pkg/lib .. ../.."
       for i in $libslist; do
@@ -134,7 +134,7 @@
         fi #}
       done])
   fi #}
-
+  AC_MSG_CHECKING([for libatk library])
   if test x"${ac_cv_path_atk_lib}" != x ; then
        AC_MSG_RESULT(yes)
   else

Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/pango.m4     29 Oct 2006 18:34:11 -0000      1.19
+++ macros/pango.m4     30 Oct 2006 16:31:13 -0000      1.20
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: pango.m4,v 1.19 2006/10/29 18:34:11 rsavoye Exp $
+dnl $Id: pango.m4,v 1.20 2006/10/30 16:31:13 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_PANGO],
 [
@@ -133,6 +133,7 @@
           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