[Gnash-commit] /srv/bzr/gnash/trunk r11755: more improvements for Cygwin.

[Rob Savoye]

------------------------------------------------------------
revno: 11755
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-14 19:03:37 -0700
message:
  more improvements for Cygwin.
modified:
  macros/ffmpeg.m4
  macros/pango.m4

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2010-01-14 23:26:15 +0000
+++ b/macros/ffmpeg.m4  2010-01-15 02:03:37 +0000
@@ -345,13 +345,12 @@
         if test x${top_lib_dir} = x; then top_lib_dir=$i; fi
         AC_MSG_RESULT(${top_lib_dir}/libavcodec)
            if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
-          libavcodec="-L$i -lavcodec"
+          ac_cv_path_ffmpeg_lib="-L$i -lavcodec"
                  break
         else
-          libavcodec="-lavcodec"
+          ac_cv_path_ffmpeg_lib="-lavcodec"
              break
         fi
-           ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavcodec}"
       fi
     done
 
@@ -374,7 +373,7 @@
   dnl       from pkg-config, as it would likely bring all
   dnl       required libs in. 
   dnl
-  if test x"${libavcodec}" != x; then
+  if test x"${ac_cv_path_ffmpeg_lib}" != x; then
 
     dnl Look for the DTS library, which is required on some systems. {
     dnl

=== modified file 'macros/pango.m4'
--- a/macros/pango.m4   2010-01-14 23:40:51 +0000
+++ b/macros/pango.m4   2010-01-15 02:03:37 +0000
@@ -101,7 +101,7 @@
 
   if test x"${ac_cv_path_pango_lib}" = x; then
     for i in $libslist; do
-      if test -f $i/libpango-${gnash_pango_version}.a -o -f 
$i/libpango-${gnash_pango_version}.${shlibext}; then
+      if test -f $i/libpango-${gnash_pango_version}.a -o -f 
$i/libpango-${gnash_pango_version}.${shlibext} -o -f 
$i/libpango-${gnash_pango_version}.${shlibext}.a; then
         if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
          ac_cv_path_pango_lib="-L$i -lpango-${gnash_pango_version}"
          break